diff --git a/include/palerain.h b/include/palerain.h
index b09824b..bef3919 100644
--- a/include/palerain.h
+++ b/include/palerain.h
@@ -228,7 +228,7 @@ void print_credits(void);
 
 #ifdef TUI
 #include <newt.h>
-newtComponent get_tui_log();
+newtComponent get_tui_log(void);
 newtComponent set_tui_log(newtComponent co);
 #endif
 #endif
diff --git a/include/tui.h b/include/tui.h
index 479382f..9be0d36 100644
--- a/include/tui.h
+++ b/include/tui.h
@@ -20,7 +20,7 @@
 #define PI_STEP_CURRENT NEWT_COLORSET_CUSTOM(1)
 #define PI_STEP_OTHER NEWT_COLORSET_CUSTOM(2)
 
-#define CHECKBOX_STATE(flags, opt) checkrain_options_enabled(flags, opt) ? '*' : ' '
+#define CHECKBOX_STATE(flags, opt) (flags & opt) != 0 ? '*' : ' '
 
 typedef enum tui_screens {
     ERROR_SCREEN = -1,
@@ -37,13 +37,13 @@ typedef struct bitfield_checkbox_info {
     uint64_t opt;
 } tui_bit_info_t;
 
-tui_screen_t tui_screen_main();
-tui_screen_t tui_screen_options();
-tui_screen_t tui_screen_enter_recovery();
-tui_screen_t tui_screen_enter_dfu();
-tui_screen_t tui_screen_jailbreak();
+tui_screen_t tui_screen_main(void);
+tui_screen_t tui_screen_options(void);
+tui_screen_t tui_screen_enter_recovery(void);
+tui_screen_t tui_screen_enter_dfu(void);
+tui_screen_t tui_screen_jailbreak(void);
 
-int redraw_screen();
+int redraw_screen(void);
 
 
 #endif
diff --git a/src/lock_vars.c b/src/lock_vars.c
index 59fe814..a5483b9 100644
--- a/src/lock_vars.c
+++ b/src/lock_vars.c
@@ -90,7 +90,7 @@ uint64_t set_ecid_wait_for_dfu(uint64_t ecid) {
 }
 
 #ifdef TUI
-newtComponent get_tui_log() {
+newtComponent get_tui_log(void) {
     pthread_mutex_lock(&tui_log_mutex);
     newtComponent ret = tui_log_output;
     pthread_mutex_unlock(&tui_log_mutex);
diff --git a/src/tui_main.c b/src/tui_main.c
index 754ad30..8086122 100644
--- a/src/tui_main.c
+++ b/src/tui_main.c
@@ -12,15 +12,15 @@
 #include <palerain.h>
 #include <tui.h>
 
-int redraw_screen() {
+int redraw_screen(void) {
     return 0;
 }
 
-int destroy_window() {
+int destroy_window(void) {
     return 0;
 }
 
-int init_window() {
+int init_window(void) {
     setlocale(LC_ALL, NULL);
     setenv(
         "NEWT_COLORS",
@@ -61,7 +61,7 @@ int init_window() {
     return 0;
 }
 
-int tui() {
+int tui(void) {
     int ret = 0;
     if ((ret = init_window())) return ret;
     ret = MAIN_SCREEN;
diff --git a/src/tui_screen_enter_dfu.c b/src/tui_screen_enter_dfu.c
index 5462a45..92d3db3 100644
--- a/src/tui_screen_enter_dfu.c
+++ b/src/tui_screen_enter_dfu.c
@@ -12,4 +12,4 @@
 #include <palerain.h>
 #include <tui.h>
 
-tui_screen_t tui_screen_enter_dfu() { return JAILBREAKING_SCREEN; }
+tui_screen_t tui_screen_enter_dfu(void) { return JAILBREAKING_SCREEN; }
diff --git a/src/tui_screen_enter_recovery.c b/src/tui_screen_enter_recovery.c
index 57531d4..db07ca8 100644
--- a/src/tui_screen_enter_recovery.c
+++ b/src/tui_screen_enter_recovery.c
@@ -12,4 +12,4 @@
 #include <palerain.h>
 #include <tui.h>
 
-tui_screen_t tui_screen_enter_recovery() { return ENTER_DFU_SCREEN; }
+tui_screen_t tui_screen_enter_recovery(void) { return ENTER_DFU_SCREEN; }
diff --git a/src/tui_screen_jailbreak.c b/src/tui_screen_jailbreak.c
index 35cd01d..6d6e453 100644
--- a/src/tui_screen_jailbreak.c
+++ b/src/tui_screen_jailbreak.c
@@ -12,4 +12,4 @@
 #include <palerain.h>
 #include <tui.h>
 
-tui_screen_t tui_screen_jailbreak() { return EXIT_SCREEN; }
+tui_screen_t tui_screen_jailbreak(void) { return EXIT_SCREEN; }
diff --git a/src/tui_screen_main.c b/src/tui_screen_main.c
index 262f9ac..d3e614a 100644
--- a/src/tui_screen_main.c
+++ b/src/tui_screen_main.c
@@ -12,7 +12,7 @@
 #include <palerain.h>
 #include <tui.h>
 
-tui_screen_t tui_screen_main() {
+tui_screen_t tui_screen_main(void) {
     int ret = MAIN_SCREEN;
     bool can_start = false;
     newtCenteredWindow(WIDTH, HEIGHT, NULL);
diff --git a/src/tui_screen_options.c b/src/tui_screen_options.c
index a6a0a7d..260852e 100644
--- a/src/tui_screen_options.c
+++ b/src/tui_screen_options.c
@@ -21,7 +21,7 @@ void bitfield_check_cb(newtComponent box, void* data) {
 }
 
 
-tui_screen_t tui_screen_options() {
+tui_screen_t tui_screen_options(void) {
     tui_bit_info_t verbose_info = { &palerain_flags, palerain_option_verbose_boot };
     tui_bit_info_t rootful_info = { &palerain_flags, palerain_option_rootful };
     tui_bit_info_t setup_rootful_info = { &palerain_flags, palerain_option_setup_rootful };
@@ -30,7 +30,7 @@ tui_screen_t tui_screen_options() {
 
     static uint64_t palerain_flags = 0;
     tui_bit_info_t flower_chain_info = { &palerain_flags, palerain_option_flower_chain };
-    
+
     const char* bootargs_entered = NULL;
     int ret = MAIN_SCREEN;