diff --git a/.clang-format b/.clang-format
new file mode 100644
index 000000000..6383880f5
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,51 @@
+---
+# NextUI clang-format configuration
+# Based on the existing code style in the project
+
+BasedOnStyle: LLVM
+
+# Indentation
+UseTab: Always
+TabWidth: 4
+IndentWidth: 4
+ContinuationIndentWidth: 4
+
+# Line length
+ColumnLimit: 120
+
+# Braces
+BreakBeforeBraces: Linux
+
+# Spaces
+SpaceAfterCStyleCast: false
+SpaceBeforeParens: ControlStatements
+SpaceBeforeAssignmentOperators: true
+SpaceInEmptyParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpacesInCStyleCastParentheses: false
+
+# Alignment
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands: true
+AlignTrailingComments: true
+
+# Line breaks
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+
+# Pointer alignment
+PointerAlignment: Right
+
+# Other
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 2
+SortIncludes: false
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..9cb6d150b
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,73 @@
+# Contributing to NextUI
+
+Thank you for your interest in contributing to NextUI!
+
+## Code Formatting
+
+NextUI uses [clang-format](https://clang.llvm.org/docs/ClangFormat.html) to maintain consistent code formatting across all C/C++ source files.
+
+### Setup
+
+Clang-format is likely already installed on most development systems. You can verify by running:
+
+```bash
+clang-format --version
+```
+
+If not installed, you can install it:
+
+- **Ubuntu/Debian**: `sudo apt-get install clang-format`
+- **macOS**: `brew install clang-format`
+- **Windows**: Download from [LLVM releases](https://releases.llvm.org/)
+
+### Formatting Your Code
+
+Before submitting a pull request, please format your code using clang-format:
+
+```bash
+# Format a single file
+clang-format -i path/to/your/file.c
+
+# Format all C/C++ files in the workspace (excluding _unmaintained)
+find workspace -type f \( -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" \) | grep -v "_unmaintained" | xargs clang-format -i
+```
+
+### Checking Formatting
+
+To check if your files are properly formatted without modifying them:
+
+```bash
+clang-format --dry-run --Werror path/to/your/file.c
+```
+
+### Configuration
+
+The clang-format configuration is defined in `.clang-format` at the root of the repository. Key style guidelines:
+
+- **Indentation**: Tabs (4 spaces wide)
+- **Brace Style**: Linux style (opening brace on next line for functions)
+- **Line Length**: 120 characters maximum
+- **Pointer Alignment**: Right-aligned (`char *ptr` not `char* ptr`)
+- **Space After Keywords**: `if (condition)` not `if(condition)`
+
+### Editor Integration
+
+Most modern editors and IDEs support clang-format integration:
+
+- **VS Code**: Install the "C/C++" extension
+- **Vim**: Use `vim-clang-format` plugin
+- **Emacs**: Use `clang-format.el`
+- **CLion/IntelliJ**: Built-in support
+
+This ensures your code is automatically formatted as you write it.
+
+## Pull Request Guidelines
+
+1. Format your code using clang-format before submitting
+2. Ensure your changes don't break existing functionality
+3. Write clear commit messages
+4. Update documentation if needed
+
+## Questions?
+
+If you have any questions about contributing, feel free to open an issue or join our [Discord](https://discord.gg/HKd7wqZk3h).
diff --git a/README.md b/README.md
index 012526ea8..25bf6a88d 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,16 @@ Our community has currated a [list of favorite Paks](https://nextui.loveretro.ga
 
 ---
 
+## Contributing
+
+We welcome contributions! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for guidelines on:
+
+- Code formatting with clang-format
+- Pull request guidelines
+- Development setup
+
+---
+
 ## Credits
 
 [@josegonzalez](https://github.com/josegonzalez) for [minui-keyboard](https://github.com/josegonzalez/minui-keyboard/t)
diff --git a/workspace/all/batmon/batmon.c b/workspace/all/batmon/batmon.c
index 25761af08..a6945fce3 100644
--- a/workspace/all/batmon/batmon.c
+++ b/workspace/all/batmon/batmon.c
@@ -27,324 +27,292 @@ int best_session_time = 0;
 char *device_model = NULL;
 
 void register_handler();
-void sigintHandler(int signum) {
-    switch (signum)
-    {
-    case SIGINT:
-    case SIGTERM:
-        quit = true;
-        break;
-    case SIGSTOP:
-        is_suspended = true;
-        break;
-    case SIGCONT:
-        is_suspended = false;
-        break;
-    default:
-        break;
-    }
-    // reregister
-    register_handler();
+void sigintHandler(int signum)
+{
+	switch (signum) {
+	case SIGINT:
+	case SIGTERM:
+		quit = true;
+		break;
+	case SIGSTOP:
+		is_suspended = true;
+		break;
+	case SIGCONT:
+		is_suspended = false;
+		break;
+	default:
+		break;
+	}
+	// reregister
+	register_handler();
 }
 
-void register_handler() {
-    struct sigaction sa;
-    sa.sa_handler = sigintHandler;
+void register_handler()
+{
+	struct sigaction sa;
+	sa.sa_handler = sigintHandler;
 
-    sigemptyset(&sa.sa_mask);
-    sigaddset(&sa.sa_mask, SIGINT);
-    sigaction(SIGINT, &sa, 0);
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGINT);
+	sigaction(SIGINT, &sa, 0);
 
-    sigemptyset(&sa.sa_mask);
-    sigaddset(&sa.sa_mask, SIGTERM);
-    sigaction(SIGTERM, &sa, 0);
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGTERM);
+	sigaction(SIGTERM, &sa, 0);
 
-    sigemptyset(&sa.sa_mask);
-    sigaddset(&sa.sa_mask, SIGSTOP);
-    sigaction(SIGSTOP, &sa, 0);
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGSTOP);
+	sigaction(SIGSTOP, &sa, 0);
 
-    sigemptyset(&sa.sa_mask);
-    sigaddset(&sa.sa_mask, SIGCONT);
-    sigaction(SIGCONT, &sa, 0);
+	sigemptyset(&sa.sa_mask);
+	sigaddset(&sa.sa_mask, SIGCONT);
+	sigaction(SIGCONT, &sa, 0);
 }
 
 void cleanup(void)
 {
-    remove("/tmp/percBat");
+	remove("/tmp/percBat");
 }
 
 void update_current_duration(void)
 {
-    sqlite3 *bat_log_db = open_battery_log_db();
-
-    if (bat_log_db != NULL)
-    {
-        const char *sql = "SELECT * FROM bat_activity WHERE device_serial = ? ORDER BY id DESC LIMIT 1;";
-        sqlite3_stmt *stmt;
-        int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
-
-        if (rc == SQLITE_OK)
-        {
-            sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
-            rc = sqlite3_step(stmt);
-            if (rc == SQLITE_ROW)
-            {
-                int current_duration = sqlite3_column_int(stmt, 3);
-                int new_duration = current_duration + battery_current_state_duration;
-
-                const char *update_sql = "UPDATE bat_activity SET duration = ? WHERE id = ?";
-
-                sqlite3_stmt *update_stmt;
-                rc = sqlite3_prepare_v2(bat_log_db, update_sql, -1, &update_stmt, 0);
-
-                if (rc == SQLITE_OK)
-                {
-                    sqlite3_bind_int(update_stmt, 1, new_duration);
-                    sqlite3_bind_int(update_stmt, 2, sqlite3_column_int(stmt, 0));
-
-                    // Exécuter la mise à jour
-                    rc = sqlite3_step(update_stmt);
-
-                    battery_current_state_duration = 0;
-                    sqlite3_finalize(stmt);
-                    sqlite3_finalize(update_stmt);
-                }
-            }
-        }
-        close_battery_log_db(bat_log_db);
-    }
+	sqlite3 *bat_log_db = open_battery_log_db();
+
+	if (bat_log_db != NULL) {
+		const char *sql = "SELECT * FROM bat_activity WHERE device_serial = ? ORDER BY id DESC LIMIT 1;";
+		sqlite3_stmt *stmt;
+		int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
+
+		if (rc == SQLITE_OK) {
+			sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
+			rc = sqlite3_step(stmt);
+			if (rc == SQLITE_ROW) {
+				int current_duration = sqlite3_column_int(stmt, 3);
+				int new_duration = current_duration + battery_current_state_duration;
+
+				const char *update_sql = "UPDATE bat_activity SET duration = ? WHERE id = ?";
+
+				sqlite3_stmt *update_stmt;
+				rc = sqlite3_prepare_v2(bat_log_db, update_sql, -1, &update_stmt, 0);
+
+				if (rc == SQLITE_OK) {
+					sqlite3_bind_int(update_stmt, 1, new_duration);
+					sqlite3_bind_int(update_stmt, 2, sqlite3_column_int(stmt, 0));
+
+					// Exécuter la mise à jour
+					rc = sqlite3_step(update_stmt);
+
+					battery_current_state_duration = 0;
+					sqlite3_finalize(stmt);
+					sqlite3_finalize(update_stmt);
+				}
+			}
+		}
+		close_battery_log_db(bat_log_db);
+	}
 }
 
 void log_new_percentage(int new_bat_value, int is_charging)
 {
-    sqlite3 *bat_log_db = open_battery_log_db();
-
-    if (bat_log_db != NULL)
-    {
-        char *sql = sqlite3_mprintf("INSERT INTO bat_activity(device_serial, bat_level, duration, is_charging) VALUES(%Q, %d, %d, %d);", device_model, new_bat_value, 0, is_charging);
-        sqlite3_exec(bat_log_db, sql, NULL, NULL, NULL);
-        sqlite3_free(sql);
-
-        // FILO logic
-        sqlite3_stmt *stmt;
-        const char *count_sql = "SELECT COUNT(id) FROM bat_activity";
-
-        int count = 0;
-
-        if (sqlite3_prepare_v2(bat_log_db, count_sql, -1, &stmt, NULL) == SQLITE_OK)
-        {
-            if (sqlite3_step(stmt) == SQLITE_ROW)
-            {
-                count = sqlite3_column_int(stmt, 0);
-            }
-            sqlite3_finalize(stmt);
-        }
-
-        if (count > FILO_MIN_SIZE)
-        {
-            // Deletion of the 1st entry
-            const char *delete_sql = "DELETE FROM bat_activity WHERE id = (SELECT MIN(id) FROM bat_activity);";
-            sqlite3_prepare_v2(bat_log_db, delete_sql, -1, &stmt, 0);
-            sqlite3_step(stmt);
-            sqlite3_finalize(stmt);
-        }
-    }
-    close_battery_log_db(bat_log_db);
+	sqlite3 *bat_log_db = open_battery_log_db();
+
+	if (bat_log_db != NULL) {
+		char *sql = sqlite3_mprintf(
+			"INSERT INTO bat_activity(device_serial, bat_level, duration, is_charging) VALUES(%Q, %d, %d, %d);",
+			device_model, new_bat_value, 0, is_charging);
+		sqlite3_exec(bat_log_db, sql, NULL, NULL, NULL);
+		sqlite3_free(sql);
+
+		// FILO logic
+		sqlite3_stmt *stmt;
+		const char *count_sql = "SELECT COUNT(id) FROM bat_activity";
+
+		int count = 0;
+
+		if (sqlite3_prepare_v2(bat_log_db, count_sql, -1, &stmt, NULL) == SQLITE_OK) {
+			if (sqlite3_step(stmt) == SQLITE_ROW) {
+				count = sqlite3_column_int(stmt, 0);
+			}
+			sqlite3_finalize(stmt);
+		}
+
+		if (count > FILO_MIN_SIZE) {
+			// Deletion of the 1st entry
+			const char *delete_sql = "DELETE FROM bat_activity WHERE id = (SELECT MIN(id) FROM bat_activity);";
+			sqlite3_prepare_v2(bat_log_db, delete_sql, -1, &stmt, 0);
+			sqlite3_step(stmt);
+			sqlite3_finalize(stmt);
+		}
+	}
+	close_battery_log_db(bat_log_db);
 }
 
 int get_current_session_time(void)
 {
-    int current_session_duration = 0;
-
-    sqlite3 *bat_log_db = open_battery_log_db();
-    
-    if (bat_log_db != NULL)
-    {
-        const char *sql = "SELECT * FROM bat_activity WHERE device_serial = ? AND is_charging = 1 ORDER BY id DESC LIMIT 1;";
-        sqlite3_stmt *stmt;
-        int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
-
-        if (rc == SQLITE_OK)
-        {
-
-            sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
-            rc = sqlite3_step(stmt);
-            if (rc == SQLITE_ROW)
-            {
-
-                sqlite3_stmt *stmt_sum;
-                const char *query_sum = "SELECT SUM(duration) FROM bat_activity WHERE device_serial = ? AND id > ?;";
-                rc = sqlite3_prepare_v2(bat_log_db, query_sum, -1, &stmt_sum, NULL);
-                if (rc == SQLITE_OK)
-                {
-                    sqlite3_bind_text(stmt_sum, 1, device_model, -1, SQLITE_STATIC);
-                    sqlite3_bind_int(stmt_sum, 2, sqlite3_column_int(stmt, 0));
-                    while ((rc = sqlite3_step(stmt_sum)) == SQLITE_ROW)
-                    {
-                        current_session_duration = sqlite3_column_int(stmt_sum, 0);
-                    }
-                }
-                sqlite3_finalize(stmt_sum);
-            }
-        }
-        sqlite3_finalize(stmt);
-    }
-    close_battery_log_db(bat_log_db);
-    
-    return current_session_duration;
+	int current_session_duration = 0;
+
+	sqlite3 *bat_log_db = open_battery_log_db();
+
+	if (bat_log_db != NULL) {
+		const char *sql =
+			"SELECT * FROM bat_activity WHERE device_serial = ? AND is_charging = 1 ORDER BY id DESC LIMIT 1;";
+		sqlite3_stmt *stmt;
+		int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
+
+		if (rc == SQLITE_OK) {
+			sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
+			rc = sqlite3_step(stmt);
+			if (rc == SQLITE_ROW) {
+				sqlite3_stmt *stmt_sum;
+				const char *query_sum = "SELECT SUM(duration) FROM bat_activity WHERE device_serial = ? AND id > ?;";
+				rc = sqlite3_prepare_v2(bat_log_db, query_sum, -1, &stmt_sum, NULL);
+				if (rc == SQLITE_OK) {
+					sqlite3_bind_text(stmt_sum, 1, device_model, -1, SQLITE_STATIC);
+					sqlite3_bind_int(stmt_sum, 2, sqlite3_column_int(stmt, 0));
+					while ((rc = sqlite3_step(stmt_sum)) == SQLITE_ROW) {
+						current_session_duration = sqlite3_column_int(stmt_sum, 0);
+					}
+				}
+				sqlite3_finalize(stmt_sum);
+			}
+		}
+		sqlite3_finalize(stmt);
+	}
+	close_battery_log_db(bat_log_db);
+
+	return current_session_duration;
 }
 
 int set_best_session_time(int best_session)
 {
-    int is_success = 0;
-
-    sqlite3* bat_log_db = open_battery_log_db();
-
-    if (bat_log_db != NULL)
-    {
-        const char *sql = "SELECT * FROM device_specifics WHERE device_serial = ? ORDER BY id LIMIT 1;";
-        sqlite3_stmt *stmt;
-        int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
-
-        if (rc == SQLITE_OK)
-        {
-            sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
-            rc = sqlite3_step(stmt);
-            if (rc == SQLITE_ROW)
-            {
-                const char *update_sql = "UPDATE device_specifics SET best_session = ? WHERE id = ?";
-
-                sqlite3_stmt *update_stmt;
-                rc = sqlite3_prepare_v2(bat_log_db, update_sql, -1, &update_stmt, 0);
-
-                if (rc == SQLITE_OK)
-                {
-                    sqlite3_bind_int(update_stmt, 1, best_session);
-                    sqlite3_bind_int(update_stmt, 2, sqlite3_column_int(stmt, 0));
-
-                    // Exécuter la mise à jour
-                    rc = sqlite3_step(update_stmt);
-
-                    sqlite3_finalize(stmt);
-                    sqlite3_finalize(update_stmt);
-                    is_success = 1;
-                }
-            }
-        }
-        close_battery_log_db(bat_log_db);
-    }
-
-    return is_success;
+	int is_success = 0;
+
+	sqlite3 *bat_log_db = open_battery_log_db();
+
+	if (bat_log_db != NULL) {
+		const char *sql = "SELECT * FROM device_specifics WHERE device_serial = ? ORDER BY id LIMIT 1;";
+		sqlite3_stmt *stmt;
+		int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
+
+		if (rc == SQLITE_OK) {
+			sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
+			rc = sqlite3_step(stmt);
+			if (rc == SQLITE_ROW) {
+				const char *update_sql = "UPDATE device_specifics SET best_session = ? WHERE id = ?";
+
+				sqlite3_stmt *update_stmt;
+				rc = sqlite3_prepare_v2(bat_log_db, update_sql, -1, &update_stmt, 0);
+
+				if (rc == SQLITE_OK) {
+					sqlite3_bind_int(update_stmt, 1, best_session);
+					sqlite3_bind_int(update_stmt, 2, sqlite3_column_int(stmt, 0));
+
+					// Exécuter la mise à jour
+					rc = sqlite3_step(update_stmt);
+
+					sqlite3_finalize(stmt);
+					sqlite3_finalize(update_stmt);
+					is_success = 1;
+				}
+			}
+		}
+		close_battery_log_db(bat_log_db);
+	}
+
+	return is_success;
 }
 
 int main(int argc, char *argv[])
 {
-    device_model = PLAT_getModel();
-    sqlite3 *bat_log_db = open_battery_log_db();
-    if(bat_log_db != NULL) {
-        best_session_time = get_best_session_time(bat_log_db, device_model);
-        close_battery_log_db(bat_log_db);
-    }
-
-    FILE *fp;
-    int old_percentage = -1;
-    int lowest_percentage_after_charge = 500;
-    atexit(cleanup);
-    register_handler();
-    int ticks = CHECK_BATTERY_TIMEOUT_S;
-
-    struct {
-        int is_charging;
-        int charge;
-    } pwr = {0};
-    bool was_charging = false;
-
-    while (!quit)
-    {
-        PLAT_getBatteryStatusFine(&pwr.is_charging, &pwr.charge);
-        if (pwr.is_charging)
-        {
-            if (!was_charging)
-            {
-                // Charging just started
-                lowest_percentage_after_charge = 500; // Reset lowest percentage before charge
-                was_charging = true;
-                update_current_duration();
-
-                int session_time = get_current_session_time();
-                LOG_debug("Charging detected - Previous session duration = %d\n", session_time);
-
-                if (session_time > best_session_time)
-                {
-                    LOG_debug("Best session duration\n", 1);
-                    set_best_session_time(session_time);
-                    best_session_time = session_time;
-                }
-                log_new_percentage(pwr.charge, was_charging);
-            }
-        }
-        else if (was_charging)
-        {
-            // Charging just stopped
-            was_charging = false;
-            lowest_percentage_after_charge = 500; // Reset lowest percentage after charge
-
-            LOG_debug(
-                "Charging stopped: suspended = %d, perc = %d\n",
-                is_suspended, pwr.charge);
-
-            update_current_duration();
-            log_new_percentage(pwr.charge, was_charging);
-        }
-
-        if (!is_suspended)
-        {
-            if (ticks >= CHECK_BATTERY_TIMEOUT_S)
-            {
-                LOG_debug(
-                    "battery check: suspended = %d, perc = %d\n",
-                    is_suspended, pwr.charge);
-
-                ticks = -1;
-            }
-
-            if (pwr.charge != old_percentage)
-            {
-                // This statement is not englobed in the previous one
-                // in order to be launched once when batmon starts
-                LOG_debug(
-                    "saving percBat: suspended = %d, perc = %d\n",
-                    is_suspended, pwr.charge);
-                old_percentage = pwr.charge;
-                // Save battery percentage to file
-                if ((fp = fopen("/tmp/percBat", "w+"))) {
-                    fprintf(fp, "%d", pwr.charge);
-                    fflush(fp);
-                    fsync(fileno(fp));
-                    fclose(fp);
-                }
-                // Current battery state duration addition
-                update_current_duration();
-                // New battery percentage entry
-                log_new_percentage(pwr.charge, was_charging);
-            }
-        }
-        else
-        {
-            ticks = -1;
-        }
-
-        if (battery_current_state_duration > MAX_DURATION_BEFORE_UPDATE)
-            update_current_duration();
-
-        sleep(1);
-        battery_current_state_duration++;
-        ticks++;
-    }
-
-    LOG_debug("caught SIGTERM/SIGINT, quitting\n");
-
-    // Current battery state duration addition
-    update_current_duration();
-    return EXIT_SUCCESS;
+	device_model = PLAT_getModel();
+	sqlite3 *bat_log_db = open_battery_log_db();
+	if (bat_log_db != NULL) {
+		best_session_time = get_best_session_time(bat_log_db, device_model);
+		close_battery_log_db(bat_log_db);
+	}
+
+	FILE *fp;
+	int old_percentage = -1;
+	int lowest_percentage_after_charge = 500;
+	atexit(cleanup);
+	register_handler();
+	int ticks = CHECK_BATTERY_TIMEOUT_S;
+
+	struct {
+		int is_charging;
+		int charge;
+	} pwr = {0};
+	bool was_charging = false;
+
+	while (!quit) {
+		PLAT_getBatteryStatusFine(&pwr.is_charging, &pwr.charge);
+		if (pwr.is_charging) {
+			if (!was_charging) {
+				// Charging just started
+				lowest_percentage_after_charge = 500; // Reset lowest percentage before charge
+				was_charging = true;
+				update_current_duration();
+
+				int session_time = get_current_session_time();
+				LOG_debug("Charging detected - Previous session duration = %d\n", session_time);
+
+				if (session_time > best_session_time) {
+					LOG_debug("Best session duration\n", 1);
+					set_best_session_time(session_time);
+					best_session_time = session_time;
+				}
+				log_new_percentage(pwr.charge, was_charging);
+			}
+		} else if (was_charging) {
+			// Charging just stopped
+			was_charging = false;
+			lowest_percentage_after_charge = 500; // Reset lowest percentage after charge
+
+			LOG_debug("Charging stopped: suspended = %d, perc = %d\n", is_suspended, pwr.charge);
+
+			update_current_duration();
+			log_new_percentage(pwr.charge, was_charging);
+		}
+
+		if (!is_suspended) {
+			if (ticks >= CHECK_BATTERY_TIMEOUT_S) {
+				LOG_debug("battery check: suspended = %d, perc = %d\n", is_suspended, pwr.charge);
+
+				ticks = -1;
+			}
+
+			if (pwr.charge != old_percentage) {
+				// This statement is not englobed in the previous one
+				// in order to be launched once when batmon starts
+				LOG_debug("saving percBat: suspended = %d, perc = %d\n", is_suspended, pwr.charge);
+				old_percentage = pwr.charge;
+				// Save battery percentage to file
+				if ((fp = fopen("/tmp/percBat", "w+"))) {
+					fprintf(fp, "%d", pwr.charge);
+					fflush(fp);
+					fsync(fileno(fp));
+					fclose(fp);
+				}
+				// Current battery state duration addition
+				update_current_duration();
+				// New battery percentage entry
+				log_new_percentage(pwr.charge, was_charging);
+			}
+		} else {
+			ticks = -1;
+		}
+
+		if (battery_current_state_duration > MAX_DURATION_BEFORE_UPDATE)
+			update_current_duration();
+
+		sleep(1);
+		battery_current_state_duration++;
+		ticks++;
+	}
+
+	LOG_debug("caught SIGTERM/SIGINT, quitting\n");
+
+	// Current battery state duration addition
+	update_current_duration();
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/battery/battery.c b/workspace/all/battery/battery.c
index 34bb20a9e..be92d807b 100644
--- a/workspace/all/battery/battery.c
+++ b/workspace/all/battery/battery.c
@@ -29,57 +29,54 @@
 // 1:1
 #define GRAPH_SEGMENT_HIGH 1800
 
-struct GraphLayout
-{
-    int graph_display_size_x;
-    int graph_display_size_y;
-    int graph_display_start_x;
-    int graph_display_start_y;
+struct GraphLayout {
+	int graph_display_size_x;
+	int graph_display_size_y;
+	int graph_display_start_x;
+	int graph_display_start_y;
 
-    int label_y;
-    int label1_x;
-    int label2_x;
-    int label3_x;
-    int label4_x;
+	int label_y;
+	int label1_x;
+	int label2_x;
+	int label3_x;
+	int label4_x;
 
-    int sub_title_x;
-    int sub_title_y;
+	int sub_title_x;
+	int sub_title_y;
 
-    int label_session_x;
-    int label_session_y;
+	int label_session_x;
+	int label_session_y;
 
-    int label_current_x;
-    int label_current_y;
+	int label_current_x;
+	int label_current_y;
 
-    int label_left_x;
-    int label_left_y;
+	int label_left_x;
+	int label_left_y;
 
-    int label_best_x;
-    int label_best_y;
+	int label_best_x;
+	int label_best_y;
 
-    int label_size_x;
-    int label_size_y;
+	int label_size_x;
+	int label_size_y;
 
-    int icon_x;
-    int icon1_y;
-    int icon2_y;
-    int icon3_y;
-    int icon4_y;
+	int icon_x;
+	int icon1_y;
+	int icon2_y;
+	int icon3_y;
+	int icon4_y;
 
-    int graph_max_size;
+	int graph_max_size;
 };
 
-typedef struct
-{
-    int pixel_height;
-    bool is_charging;
-    bool is_estimated;
+typedef struct {
+	int pixel_height;
+	bool is_charging;
+	bool is_estimated;
 } GraphSpot;
 
-struct Graph
-{
-    struct GraphLayout layout;
-    GraphSpot *graphic; // needs to be >= GRAPH_MAX_FULL_PAGES * screen_width
+struct Graph {
+	struct GraphLayout layout;
+	GraphSpot *graphic; // needs to be >= GRAPH_MAX_FULL_PAGES * screen_width
 } graph = {0};
 
 // One page in seconds
@@ -113,15 +110,14 @@ static char session_best[10];
 
 static void sigHandler(int sig)
 {
-    switch (sig)
-    {
-    case SIGINT:
-    case SIGTERM:
-        quit = true;
-        break;
-    default:
-        break;
-    }
+	switch (sig) {
+	case SIGINT:
+	case SIGTERM:
+		quit = true;
+		break;
+	default:
+		break;
+	}
 }
 
 static SDL_Surface *screen;
@@ -131,445 +127,424 @@ sqlite3 *bat_log_db = NULL;
 
 void secondsToHoursMinutes(int seconds, char *output)
 {
-    int hours = seconds / 3600;
-    int minutes = (seconds % 3600) / 60;
-    sprintf(output, "%dh%02d", hours, minutes);
+	int hours = seconds / 3600;
+	int minutes = (seconds % 3600) / 60;
+	sprintf(output, "%dh%02d", hours, minutes);
 }
 
 void drawLine(int x1, int y1, int x2, int y2, Uint32 color)
 {
-    int dx, dy, sx, sy, err, e2;
-
-    dx = abs(x2 - x1);
-    dy = abs(y2 - y1);
-
-    if (x1 < x2)
-    {
-        sx = 1;
-    }
-    else
-    {
-        sx = -1;
-    }
-
-    if (y1 < y2)
-    {
-        sy = 1;
-    }
-    else
-    {
-        sy = -1;
-    }
-
-    err = dx - dy;
-
-    while (1)
-    {
-        SDL_Rect pixel = {x1, y1, SCALE1(1), SCALE1(1)};
-        SDL_FillRect(screen, &pixel, color);
-
-        if (x1 == x2 && y1 == y2)
-        {
-            break;
-        }
-
-        e2 = 2 * err;
-
-        if (e2 > -dy)
-        {
-            err -= dy;
-            x1 += sx;
-        }
-
-        if (e2 < dx)
-        {
-            err += dx;
-            y1 += sy;
-        }
-    }
+	int dx, dy, sx, sy, err, e2;
+
+	dx = abs(x2 - x1);
+	dy = abs(y2 - y1);
+
+	if (x1 < x2) {
+		sx = 1;
+	} else {
+		sx = -1;
+	}
+
+	if (y1 < y2) {
+		sy = 1;
+	} else {
+		sy = -1;
+	}
+
+	err = dx - dy;
+
+	while (1) {
+		SDL_Rect pixel = {x1, y1, SCALE1(1), SCALE1(1)};
+		SDL_FillRect(screen, &pixel, color);
+
+		if (x1 == x2 && y1 == y2) {
+			break;
+		}
+
+		e2 = 2 * err;
+
+		if (e2 > -dy) {
+			err -= dy;
+			x1 += sx;
+		}
+
+		if (e2 < dx) {
+			err += dx;
+			y1 += sy;
+		}
+	}
 }
 
 int _renderText(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect, bool right_align)
 {
-    int text_width = 0;
-    SDL_Surface *textSurface = TTF_RenderUTF8_Blended(font, text, color);
-    if (textSurface != NULL)
-    {
-        text_width = textSurface->w;
-        if (right_align)
-            SDL_BlitSurface(textSurface, NULL, screen, &(SDL_Rect){rect->x - textSurface->w, rect->y, rect->w, rect->h});
-        else
-            SDL_BlitSurface(textSurface, NULL, screen, rect);
-        SDL_FreeSurface(textSurface);
-    }
-    return text_width;
+	int text_width = 0;
+	SDL_Surface *textSurface = TTF_RenderUTF8_Blended(font, text, color);
+	if (textSurface != NULL) {
+		text_width = textSurface->w;
+		if (right_align)
+			SDL_BlitSurface(textSurface, NULL, screen,
+							&(SDL_Rect){rect->x - textSurface->w, rect->y, rect->w, rect->h});
+		else
+			SDL_BlitSurface(textSurface, NULL, screen, rect);
+		SDL_FreeSurface(textSurface);
+	}
+	return text_width;
 }
 
 int renderText(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect)
 {
-    return _renderText(text, font, color, rect, false);
+	return _renderText(text, font, color, rect, false);
 }
 
 int renderTextAlignRight(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect)
 {
-    return _renderText(text, font, color, rect, true);
+	return _renderText(text, font, color, rect, true);
 }
 
 void switch_zoom_profile(int segment_duration)
 {
-    // TODO: no reason this cant be dynamic
-    switch (segment_duration)
-    {
-    case GRAPH_SEGMENT_LOW:
-        // A segment is 120 minutes
-        sprintf(label[0], "%s", "4h");
-        sprintf(label[1], "%s", "8h");
-        sprintf(label[2], "%s", "12h");
-        sprintf(label[3], "%s", "16h");
-        break;
-    case GRAPH_SEGMENT_MED:
-        // A segment is 60 minutes
-        sprintf(label[0], "%s", "2h");
-        sprintf(label[1], "%s", "4h");
-        sprintf(label[2], "%s", "6h");
-        sprintf(label[3], "%s", "8h");
-        break;
-    case GRAPH_SEGMENT_HIGH:
-        // A segment is 30 minutes
-        sprintf(label[0], "%s", "1h");
-        sprintf(label[1], "%s", "2h");
-        sprintf(label[2], "%s", "3h");
-        sprintf(label[3], "%s", "4h");
-        break;
-    default:
-        sprintf(label[0], "%s", "");
-        sprintf(label[1], "%s", "");
-        sprintf(label[2], "%s", "");
-        sprintf(label[3], "%s", "");
-        break;
-    }
+	// TODO: no reason this cant be dynamic
+	switch (segment_duration) {
+	case GRAPH_SEGMENT_LOW:
+		// A segment is 120 minutes
+		sprintf(label[0], "%s", "4h");
+		sprintf(label[1], "%s", "8h");
+		sprintf(label[2], "%s", "12h");
+		sprintf(label[3], "%s", "16h");
+		break;
+	case GRAPH_SEGMENT_MED:
+		// A segment is 60 minutes
+		sprintf(label[0], "%s", "2h");
+		sprintf(label[1], "%s", "4h");
+		sprintf(label[2], "%s", "6h");
+		sprintf(label[3], "%s", "8h");
+		break;
+	case GRAPH_SEGMENT_HIGH:
+		// A segment is 30 minutes
+		sprintf(label[0], "%s", "1h");
+		sprintf(label[1], "%s", "2h");
+		sprintf(label[2], "%s", "3h");
+		sprintf(label[3], "%s", "4h");
+		break;
+	default:
+		sprintf(label[0], "%s", "");
+		sprintf(label[1], "%s", "");
+		sprintf(label[2], "%s", "");
+		sprintf(label[3], "%s", "");
+		break;
+	}
 }
 
 int battery_to_pixel(int battery_perc)
 {
-    // Converts a battery percentage to a pixel coordinate
-    int y = (int)((graph.layout.graph_display_size_y * battery_perc) / 100);
-
-    if ((y < 0) || (y > graph.layout.graph_display_size_y))
-    {
-        return -1;
-    }
-    else
-    {
-        return y;
-    }
+	// Converts a battery percentage to a pixel coordinate
+	int y = (int)((graph.layout.graph_display_size_y * battery_perc) / 100);
+
+	if ((y < 0) || (y > graph.layout.graph_display_size_y)) {
+		return -1;
+	} else {
+		return y;
+	}
 }
 
 int duration_to_pixel(int duration)
 {
-    // Convert a duration to a number of pixel
-    return (int)((graph.layout.graph_display_size_x * duration) / GRAPH_DISPLAY_DURATION);
+	// Convert a duration to a number of pixel
+	return (int)((graph.layout.graph_display_size_x * duration) / GRAPH_DISPLAY_DURATION);
 }
 
 void compute_graph(void)
 {
-    int total_duration = 0;
-    int previous_index = graph.layout.graph_max_size - 1;
-    bool is_estimation_computed = false;
-    
-    bat_log_db = open_battery_log_db();
-    secondsToHoursMinutes(get_best_session_time(bat_log_db, device_model), session_best);
-
-    if (bat_log_db != NULL)
-    {
-        const char *sql = "SELECT * FROM bat_activity WHERE device_serial = ? ORDER BY id DESC;";
-        sqlite3_stmt *stmt;
-        int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
-
-        if (rc == SQLITE_OK)
-        {
-            sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
-            bool b_quit = false;
-
-            while ((sqlite3_step(stmt) == SQLITE_ROW) && (!b_quit))
-            {
-
-                int bat_perc = sqlite3_column_int(stmt, 2);
-                int duration = sqlite3_column_int(stmt, 3);
-                bool is_charging = sqlite3_column_int(stmt, 4);
-
-                if (total_duration == 0)
-                {
-                    sprintf(current_percentage, "%d%%", bat_perc);
-                }
-
-                current_index = (graph.layout.graph_max_size - 1) - duration_to_pixel(total_duration);
-                graph.graphic[current_index].is_charging = is_charging;
-
-                if (bat_perc > 100)
-                    bat_perc = 100;
-
-                graph.graphic[current_index].pixel_height = battery_to_pixel(bat_perc);
-
-                int segment = previous_index - current_index;
-                if (segment > 1)
-                {
-                    for (int i = 1; i < segment; i++)
-                    {
-                        graph.graphic[current_index + i].pixel_height = graph.graphic[previous_index].pixel_height;
-                        graph.graphic[current_index + i].is_charging = graph.graphic[previous_index].is_charging;
-                    }
-                }
-
-                if ((is_charging) && (!is_estimation_computed))
-                {
-                    secondsToHoursMinutes(total_duration, session_duration);
-                    if (previous_index < (graph.layout.graph_max_size - duration_to_pixel(GRAPH_MIN_SESSION_FOR_ESTIMATION)))
-                    {
-                        float slope = (float)(graph.graphic[graph.layout.graph_max_size - 1].pixel_height - graph.graphic[previous_index].pixel_height) / (float)(graph.layout.graph_max_size - 1 - previous_index);
-
-                        if (slope < 0)
-                        {
-
-                            estimation_line_size = (int)-(graph.graphic[graph.layout.graph_max_size - 1].pixel_height) / slope;
-
-                            int estimated_playtime = (int)(estimation_line_size)*GRAPH_DISPLAY_DURATION / graph.layout.graph_display_size_x;
-
-                            if (estimated_playtime < GRAPH_MAX_PLAUSIBLE_ESTIMATION)
-                            {
-                                secondsToHoursMinutes(estimated_playtime, session_left);
-                                // shift of the existing logs to make room for the estimation line
-                                int room_to_make = estimation_line_size + GRAPH_ESTIMATED_LINE_GAP;
-                                if (current_index - room_to_make >= 0)
-                                {
-                                    for (int i = current_index; i < graph.layout.graph_max_size; i++)
-                                    {
-                                        graph.graphic[i - room_to_make].pixel_height = graph.graphic[i].pixel_height;
-                                        graph.graphic[i - room_to_make].is_charging = graph.graphic[i].is_charging;
-                                        graph.graphic[i].pixel_height = 0;
-                                        graph.graphic[i].is_charging = false;
-                                    }
-                                }
-                                total_duration += estimated_playtime + (int)(GRAPH_ESTIMATED_LINE_GAP)*GRAPH_DISPLAY_DURATION / graph.layout.graph_display_size_x;
-                                current_index -= room_to_make;
-                                previous_index -= room_to_make;
-                                begining_session_index = previous_index;
-                                for (int x = (graph.layout.graph_max_size - room_to_make); x < graph.layout.graph_max_size; x++)
-                                {
-                                    int y = graph.graphic[previous_index].pixel_height + (int)(slope * (x - previous_index));
-                                    if (y > 0)
-                                    {
-                                        graph.graphic[x].pixel_height = y;
-                                        graph.graphic[x].is_estimated = true;
-                                    }
-                                    else
-                                        break;
-                                }
-                            }
-                            else
-                            {
-                                estimation_line_size = 0;
-                                estimated_playtime = 0;
-                            }
-                        }
-                    }
-
-                    is_estimation_computed = true;
-                }
-
-                total_duration += duration;
-                if (duration_to_pixel(total_duration) > graph.layout.graph_max_size)
-                    b_quit = true;
-
-                previous_index = current_index;
-            }
-        }
-        sqlite3_finalize(stmt);
-        close_battery_log_db(bat_log_db);
-    }
+	int total_duration = 0;
+	int previous_index = graph.layout.graph_max_size - 1;
+	bool is_estimation_computed = false;
+
+	bat_log_db = open_battery_log_db();
+	secondsToHoursMinutes(get_best_session_time(bat_log_db, device_model), session_best);
+
+	if (bat_log_db != NULL) {
+		const char *sql = "SELECT * FROM bat_activity WHERE device_serial = ? ORDER BY id DESC;";
+		sqlite3_stmt *stmt;
+		int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
+
+		if (rc == SQLITE_OK) {
+			sqlite3_bind_text(stmt, 1, device_model, -1, SQLITE_STATIC);
+			bool b_quit = false;
+
+			while ((sqlite3_step(stmt) == SQLITE_ROW) && (!b_quit)) {
+				int bat_perc = sqlite3_column_int(stmt, 2);
+				int duration = sqlite3_column_int(stmt, 3);
+				bool is_charging = sqlite3_column_int(stmt, 4);
+
+				if (total_duration == 0) {
+					sprintf(current_percentage, "%d%%", bat_perc);
+				}
+
+				current_index = (graph.layout.graph_max_size - 1) - duration_to_pixel(total_duration);
+				graph.graphic[current_index].is_charging = is_charging;
+
+				if (bat_perc > 100)
+					bat_perc = 100;
+
+				graph.graphic[current_index].pixel_height = battery_to_pixel(bat_perc);
+
+				int segment = previous_index - current_index;
+				if (segment > 1) {
+					for (int i = 1; i < segment; i++) {
+						graph.graphic[current_index + i].pixel_height = graph.graphic[previous_index].pixel_height;
+						graph.graphic[current_index + i].is_charging = graph.graphic[previous_index].is_charging;
+					}
+				}
+
+				if ((is_charging) && (!is_estimation_computed)) {
+					secondsToHoursMinutes(total_duration, session_duration);
+					if (previous_index <
+						(graph.layout.graph_max_size - duration_to_pixel(GRAPH_MIN_SESSION_FOR_ESTIMATION))) {
+						float slope = (float)(graph.graphic[graph.layout.graph_max_size - 1].pixel_height -
+											  graph.graphic[previous_index].pixel_height) /
+									  (float)(graph.layout.graph_max_size - 1 - previous_index);
+
+						if (slope < 0) {
+							estimation_line_size =
+								(int)-(graph.graphic[graph.layout.graph_max_size - 1].pixel_height) / slope;
+
+							int estimated_playtime =
+								(int)(estimation_line_size)*GRAPH_DISPLAY_DURATION / graph.layout.graph_display_size_x;
+
+							if (estimated_playtime < GRAPH_MAX_PLAUSIBLE_ESTIMATION) {
+								secondsToHoursMinutes(estimated_playtime, session_left);
+								// shift of the existing logs to make room for the estimation line
+								int room_to_make = estimation_line_size + GRAPH_ESTIMATED_LINE_GAP;
+								if (current_index - room_to_make >= 0) {
+									for (int i = current_index; i < graph.layout.graph_max_size; i++) {
+										graph.graphic[i - room_to_make].pixel_height = graph.graphic[i].pixel_height;
+										graph.graphic[i - room_to_make].is_charging = graph.graphic[i].is_charging;
+										graph.graphic[i].pixel_height = 0;
+										graph.graphic[i].is_charging = false;
+									}
+								}
+								total_duration +=
+									estimated_playtime + (int)(GRAPH_ESTIMATED_LINE_GAP)*GRAPH_DISPLAY_DURATION /
+															 graph.layout.graph_display_size_x;
+								current_index -= room_to_make;
+								previous_index -= room_to_make;
+								begining_session_index = previous_index;
+								for (int x = (graph.layout.graph_max_size - room_to_make);
+									 x < graph.layout.graph_max_size; x++) {
+									int y = graph.graphic[previous_index].pixel_height +
+											(int)(slope * (x - previous_index));
+									if (y > 0) {
+										graph.graphic[x].pixel_height = y;
+										graph.graphic[x].is_estimated = true;
+									} else
+										break;
+								}
+							} else {
+								estimation_line_size = 0;
+								estimated_playtime = 0;
+							}
+						}
+					}
+
+					is_estimation_computed = true;
+				}
+
+				total_duration += duration;
+				if (duration_to_pixel(total_duration) > graph.layout.graph_max_size)
+					b_quit = true;
+
+				previous_index = current_index;
+			}
+		}
+		sqlite3_finalize(stmt);
+		close_battery_log_db(bat_log_db);
+	}
 }
 
-void drawBatteryIcon(int percent, SDL_Rect dst) {
-    // taken from GFX_blitBattery
-
-    int x = dst.x;
-    int y = dst.y;
-    //SDL_Rect rect = asset_rects[ASSET_BATTERY];
-    SDL_Rect rect = (SDL_Rect){SCALE4(47,51,17,10)};
-    GFX_blitAsset(ASSET_BATTERY, NULL, screen, &(SDL_Rect){x,y});
-    //rect = asset_rects[ASSET_BATTERY_FILL];
-    rect = (SDL_Rect){SCALE4(81,33,12,6)};
-    SDL_Rect clip = rect;
-    clip.w *= percent;
-    clip.w /= 100;
-    if (clip.w<=0) return;
-    clip.x = rect.w - clip.w;
-    clip.y = 0;
-    
-    GFX_blitAsset(ASSET_BATTERY_FILL, &clip, screen, &(SDL_Rect){x+SCALE1(3)+clip.x,y+SCALE1(2)});
+void drawBatteryIcon(int percent, SDL_Rect dst)
+{
+	// taken from GFX_blitBattery
+
+	int x = dst.x;
+	int y = dst.y;
+	// SDL_Rect rect = asset_rects[ASSET_BATTERY];
+	SDL_Rect rect = (SDL_Rect){SCALE4(47, 51, 17, 10)};
+	GFX_blitAsset(ASSET_BATTERY, NULL, screen, &(SDL_Rect){x, y});
+	// rect = asset_rects[ASSET_BATTERY_FILL];
+	rect = (SDL_Rect){SCALE4(81, 33, 12, 6)};
+	SDL_Rect clip = rect;
+	clip.w *= percent;
+	clip.w /= 100;
+	if (clip.w <= 0)
+		return;
+	clip.x = rect.w - clip.w;
+	clip.y = 0;
+
+	GFX_blitAsset(ASSET_BATTERY_FILL, &clip, screen, &(SDL_Rect){x + SCALE1(3) + clip.x, y + SCALE1(2)});
 }
 
 void renderPage()
 {
-    const struct SDL_Point tl = {graph.layout.graph_display_start_x, graph.layout.graph_display_start_y};
-    const struct SDL_Point br = {graph.layout.graph_display_start_x + graph.layout.graph_display_size_x, graph.layout.graph_display_start_y + graph.layout.graph_display_size_y};
-    const int grid_step_x = 2 * (int)(graph.layout.graph_display_size_x / GRAPH_SEGMENTS); // every second "segment"
-    const int grid_step_y = graph.layout.graph_display_size_y / 4;
-
-    // grid verticals
-    for (int x = tl.x; x <= br.x; x+= grid_step_x)
-        drawLine(x, tl.y, x, br.y, RGB_DARK_GRAY);
-    drawLine(br.x, tl.y, br.x, br.y, RGB_DARK_GRAY); // close the last segment early
-    // grid horizontals
-    for (int y = tl.y; y <= br.y; y += grid_step_y)
-        drawLine(tl.x, y, br.x, y, RGB_DARK_GRAY);
-
-    switch (current_zoom)
-    {
-    case 0:
-        segment_duration = GRAPH_SEGMENT_LOW;
-        break;
-    case 1:
-        segment_duration = GRAPH_SEGMENT_MED;
-        break;
-    case 2:
-        segment_duration = GRAPH_SEGMENT_HIGH;
-        break;
-    default:
-        segment_duration = GRAPH_SEGMENT_MED;
-        break;
-    }
-
-    if (estimation_line_size == 0)
-        current_index = graph.layout.graph_max_size - (graph.layout.graph_display_size_x * (int)(segment_duration / GRAPH_SEGMENT_HIGH));
-    else
-        current_index = begining_session_index;
-
-    current_index -= (int)(current_page * (graph.layout.graph_display_size_x * (int)(segment_duration / GRAPH_SEGMENT_HIGH)) / GRAPH_PAGE_SCROLL_SMOOTHNESS);
-
-    if (current_index < 0)
-        current_index = 0;
-
-    switch_zoom_profile(segment_duration);
-
-    // x axis labels
-    renderText(label[0], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label1_x, graph.layout.label_y, 32, 32});
-    renderText(label[1], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label2_x, graph.layout.label_y, 32, 32});
-    renderText(label[2], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label3_x, graph.layout.label_y, 32, 32});
-    renderText(label[3], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label4_x, graph.layout.label_y, 32, 32});
-
-    // y axis "labels"
-    drawBatteryIcon(100, (SDL_Rect){graph.layout.icon_x, graph.layout.icon1_y});
-    drawBatteryIcon(66, (SDL_Rect){graph.layout.icon_x, graph.layout.icon2_y});
-    drawBatteryIcon(33, (SDL_Rect){graph.layout.icon_x, graph.layout.icon3_y});
-    drawBatteryIcon(0, (SDL_Rect){graph.layout.icon_x, graph.layout.icon4_y});
-
-    char text_line[255];
-    sprintf(text_line, "Since Charge: %s", session_duration);
-    renderText(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_session_x, graph.layout.label_session_y, graph.layout.label_size_x, graph.layout.label_size_y});
-
-    sprintf(text_line, "Current: %s", current_percentage);
-    renderText(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_current_x, graph.layout.label_current_y, graph.layout.label_size_x, graph.layout.label_size_y});
-
-    sprintf(text_line, "Remaining: %s", session_left);
-    renderTextAlignRight(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_left_x, graph.layout.label_left_y, graph.layout.label_size_x, graph.layout.label_size_y});
-
-    sprintf(text_line, "Longest: %s", session_best);
-    renderTextAlignRight(text_line, font.medium, COLOR_WHITE, &(SDL_Rect){graph.layout.label_best_x, graph.layout.label_best_y, graph.layout.label_size_x, graph.layout.label_size_y});
-
-    int half_line_width = (int)(GRAPH_LINE_WIDTH) / 2;
-
-    Uint32 white_pixel_color = RGB_GRAY;
-    Uint32 red_pixel_color = RGB_WHITE;
-    Uint32 blue_pixel_color = RGB_LIGHT_GRAY;
-    Uint32 pixel_color = white_pixel_color;
-
-    // monochrome is more MinUI, but some colours are nice
-    const bool ilikeitcolourful = true;
-    if(ilikeitcolourful) {
-        white_pixel_color = SDL_MapRGB(screen->format, 255, 255, 255);
-        red_pixel_color = SDL_MapRGB(screen->format, 255, 170, 170);
-        blue_pixel_color = SDL_MapRGB(screen->format, 89, 167, 255);
-        pixel_color = white_pixel_color;
-    }
-
-    int x;
-    int y;
-    int x_end = 0;
-    int y_end = 0;
-
-    int zoom_level = (int)segment_duration / GRAPH_SEGMENT_HIGH;
-
-    if (SDL_LockSurface(screen) == 0)
-    {
-        // some constants to make it more readable
-        const int graph_display_right = graph.layout.graph_display_size_x + graph.layout.graph_display_start_x;
-        const int graph_display_bottom = graph.layout.graph_display_size_y + graph.layout.graph_display_start_y;
-
-        for (int i = 0; i < graph.layout.graph_max_size - current_index; i += zoom_level)
-        {
-            x = graph.layout.graph_display_start_x + (int)(i / zoom_level);
-            y = graph.graphic[i + current_index].pixel_height;
-
-            bool is_charging = graph.graphic[i + current_index].is_charging;
-            bool is_estimated = graph.graphic[i + current_index].is_estimated;
-            // if ((!is_charging)
-            if ((!is_charging) && (!is_estimated))
-                pixel_color = white_pixel_color;
-            else if (is_charging)
-                pixel_color = red_pixel_color;
-            else if (is_estimated)
-            {
-                pixel_color = blue_pixel_color;
-                // magic numbers everywhere...
-                if (y < 5 && x < graph_display_right)
-                {
-                    x_end = x - 12;
-                    y_end = graph_display_bottom - 45;
-                }
-            }
-
-            if (x < graph_display_right && y > 0)
-            {
-                // Actual graph line
-                if (half_line_width >= 0)
-                {
-                    for (int k = -half_line_width; k <= half_line_width; k++)
-                    {
-                        int index = (graph_display_bottom - y + k) * screen->pitch + x * screen->format->BytesPerPixel;
-                        *((Uint32 *)((Uint8 *)screen->pixels + index)) = pixel_color;
-                    }
-                }
-
-                // Area under the graph
-                if ((x % GRAPH_BACKGROUND_OPACITY) == 0)
-                {
-                    for (int k = y; k > 0; k--)
-                    {
-                        if ((k % GRAPH_BACKGROUND_OPACITY) == 0)
-                        {
-                            int index = (graph_display_bottom - k) * screen->pitch + x * screen->format->BytesPerPixel;
-                            *((Uint32 *)((Uint8 *)screen->pixels + index)) = pixel_color;
-                        }
-                    }
-                }
-            }
-        }
-        SDL_UnlockSurface(screen);
-        if (x_end != 0)
-            GFX_blitAsset(ASSET_BATTERY_LOW, NULL, screen, &(SDL_Rect){x_end, y_end});
-    }
+	const struct SDL_Point tl = {graph.layout.graph_display_start_x, graph.layout.graph_display_start_y};
+	const struct SDL_Point br = {graph.layout.graph_display_start_x + graph.layout.graph_display_size_x,
+								 graph.layout.graph_display_start_y + graph.layout.graph_display_size_y};
+	const int grid_step_x = 2 * (int)(graph.layout.graph_display_size_x / GRAPH_SEGMENTS); // every second "segment"
+	const int grid_step_y = graph.layout.graph_display_size_y / 4;
+
+	// grid verticals
+	for (int x = tl.x; x <= br.x; x += grid_step_x)
+		drawLine(x, tl.y, x, br.y, RGB_DARK_GRAY);
+	drawLine(br.x, tl.y, br.x, br.y, RGB_DARK_GRAY); // close the last segment early
+	// grid horizontals
+	for (int y = tl.y; y <= br.y; y += grid_step_y)
+		drawLine(tl.x, y, br.x, y, RGB_DARK_GRAY);
+
+	switch (current_zoom) {
+	case 0:
+		segment_duration = GRAPH_SEGMENT_LOW;
+		break;
+	case 1:
+		segment_duration = GRAPH_SEGMENT_MED;
+		break;
+	case 2:
+		segment_duration = GRAPH_SEGMENT_HIGH;
+		break;
+	default:
+		segment_duration = GRAPH_SEGMENT_MED;
+		break;
+	}
+
+	if (estimation_line_size == 0)
+		current_index = graph.layout.graph_max_size -
+						(graph.layout.graph_display_size_x * (int)(segment_duration / GRAPH_SEGMENT_HIGH));
+	else
+		current_index = begining_session_index;
+
+	current_index -=
+		(int)(current_page * (graph.layout.graph_display_size_x * (int)(segment_duration / GRAPH_SEGMENT_HIGH)) /
+			  GRAPH_PAGE_SCROLL_SMOOTHNESS);
+
+	if (current_index < 0)
+		current_index = 0;
+
+	switch_zoom_profile(segment_duration);
+
+	// x axis labels
+	renderText(label[0], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label1_x, graph.layout.label_y, 32, 32});
+	renderText(label[1], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label2_x, graph.layout.label_y, 32, 32});
+	renderText(label[2], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label3_x, graph.layout.label_y, 32, 32});
+	renderText(label[3], font.small, COLOR_WHITE, &(SDL_Rect){graph.layout.label4_x, graph.layout.label_y, 32, 32});
+
+	// y axis "labels"
+	drawBatteryIcon(100, (SDL_Rect){graph.layout.icon_x, graph.layout.icon1_y});
+	drawBatteryIcon(66, (SDL_Rect){graph.layout.icon_x, graph.layout.icon2_y});
+	drawBatteryIcon(33, (SDL_Rect){graph.layout.icon_x, graph.layout.icon3_y});
+	drawBatteryIcon(0, (SDL_Rect){graph.layout.icon_x, graph.layout.icon4_y});
+
+	char text_line[255];
+	sprintf(text_line, "Since Charge: %s", session_duration);
+	renderText(text_line, font.medium, COLOR_WHITE,
+			   &(SDL_Rect){graph.layout.label_session_x, graph.layout.label_session_y, graph.layout.label_size_x,
+						   graph.layout.label_size_y});
+
+	sprintf(text_line, "Current: %s", current_percentage);
+	renderText(text_line, font.medium, COLOR_WHITE,
+			   &(SDL_Rect){graph.layout.label_current_x, graph.layout.label_current_y, graph.layout.label_size_x,
+						   graph.layout.label_size_y});
+
+	sprintf(text_line, "Remaining: %s", session_left);
+	renderTextAlignRight(text_line, font.medium, COLOR_WHITE,
+						 &(SDL_Rect){graph.layout.label_left_x, graph.layout.label_left_y, graph.layout.label_size_x,
+									 graph.layout.label_size_y});
+
+	sprintf(text_line, "Longest: %s", session_best);
+	renderTextAlignRight(text_line, font.medium, COLOR_WHITE,
+						 &(SDL_Rect){graph.layout.label_best_x, graph.layout.label_best_y, graph.layout.label_size_x,
+									 graph.layout.label_size_y});
+
+	int half_line_width = (int)(GRAPH_LINE_WIDTH) / 2;
+
+	Uint32 white_pixel_color = RGB_GRAY;
+	Uint32 red_pixel_color = RGB_WHITE;
+	Uint32 blue_pixel_color = RGB_LIGHT_GRAY;
+	Uint32 pixel_color = white_pixel_color;
+
+	// monochrome is more MinUI, but some colours are nice
+	const bool ilikeitcolourful = true;
+	if (ilikeitcolourful) {
+		white_pixel_color = SDL_MapRGB(screen->format, 255, 255, 255);
+		red_pixel_color = SDL_MapRGB(screen->format, 255, 170, 170);
+		blue_pixel_color = SDL_MapRGB(screen->format, 89, 167, 255);
+		pixel_color = white_pixel_color;
+	}
+
+	int x;
+	int y;
+	int x_end = 0;
+	int y_end = 0;
+
+	int zoom_level = (int)segment_duration / GRAPH_SEGMENT_HIGH;
+
+	if (SDL_LockSurface(screen) == 0) {
+		// some constants to make it more readable
+		const int graph_display_right = graph.layout.graph_display_size_x + graph.layout.graph_display_start_x;
+		const int graph_display_bottom = graph.layout.graph_display_size_y + graph.layout.graph_display_start_y;
+
+		for (int i = 0; i < graph.layout.graph_max_size - current_index; i += zoom_level) {
+			x = graph.layout.graph_display_start_x + (int)(i / zoom_level);
+			y = graph.graphic[i + current_index].pixel_height;
+
+			bool is_charging = graph.graphic[i + current_index].is_charging;
+			bool is_estimated = graph.graphic[i + current_index].is_estimated;
+			// if ((!is_charging)
+			if ((!is_charging) && (!is_estimated))
+				pixel_color = white_pixel_color;
+			else if (is_charging)
+				pixel_color = red_pixel_color;
+			else if (is_estimated) {
+				pixel_color = blue_pixel_color;
+				// magic numbers everywhere...
+				if (y < 5 && x < graph_display_right) {
+					x_end = x - 12;
+					y_end = graph_display_bottom - 45;
+				}
+			}
+
+			if (x < graph_display_right && y > 0) {
+				// Actual graph line
+				if (half_line_width >= 0) {
+					for (int k = -half_line_width; k <= half_line_width; k++) {
+						int index = (graph_display_bottom - y + k) * screen->pitch + x * screen->format->BytesPerPixel;
+						*((Uint32 *)((Uint8 *)screen->pixels + index)) = pixel_color;
+					}
+				}
+
+				// Area under the graph
+				if ((x % GRAPH_BACKGROUND_OPACITY) == 0) {
+					for (int k = y; k > 0; k--) {
+						if ((k % GRAPH_BACKGROUND_OPACITY) == 0) {
+							int index = (graph_display_bottom - k) * screen->pitch + x * screen->format->BytesPerPixel;
+							*((Uint32 *)((Uint8 *)screen->pixels + index)) = pixel_color;
+						}
+					}
+				}
+			}
+		}
+		SDL_UnlockSurface(screen);
+		if (x_end != 0)
+			GFX_blitAsset(ASSET_BATTERY_LOW, NULL, screen, &(SDL_Rect){x_end, y_end});
+	}
 }
 
 void initLayout()
 {
-    // unscaled
-    int hw = screen->w;
-    int hh = screen->h;
+	// unscaled
+	int hw = screen->w;
+	int hh = screen->h;
 
-    // the title. just leave the default padding all around
-    graph.layout.sub_title_x = SCALE1(PADDING);
-    graph.layout.sub_title_y = SCALE1(PADDING);
+	// the title. just leave the default padding all around
+	graph.layout.sub_title_x = SCALE1(PADDING);
+	graph.layout.sub_title_y = SCALE1(PADDING);
 
 #define GRAPH_MARGIN 12
 #define STATS_MARGIN 12
@@ -577,207 +552,197 @@ void initLayout()
 #define AXIS_WIDTH 16
 #define STATS_HEIGHT 31
 
-    // the diagram.
-    // x: start inside the default padding, and align with the text inside the pill above and below (BUTTON_MARGIN).
-    // y: default padding, below the title pill and some additional padding to leave some breathing room (BUTTON_MARGIN + GRAPH_MARGIN).
-    graph.layout.graph_display_start_x = SCALE1(PADDING + BUTTON_MARGIN);
-    graph.layout.graph_display_start_y = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + GRAPH_MARGIN);
-
-    // x: stretch whole width inside default padding + extra margin (see above), leaving space top the right for icons.
-    // y: stretch whole height below graph_display_start_y, leaving room at the bottom for padding, button hints, stats, axis labels
-    graph.layout.graph_display_size_x = hw - SCALE1(PADDING * 2 + BUTTON_MARGIN * 2 + AXIS_MARGIN + AXIS_WIDTH);
-    graph.layout.graph_display_size_y = hh - SCALE1(PADDING * 2 + PILL_SIZE * 2 + BUTTON_MARGIN * 2 + GRAPH_MARGIN * 2 + STATS_MARGIN * 2 + STATS_HEIGHT);
-
-    // y coord of x axis labels
-    graph.layout.label_y = graph.layout.graph_display_start_y + graph.layout.graph_display_size_y;
-
-    // x axis: time
-    const int seglen = graph.layout.graph_display_size_x / GRAPH_SEGMENTS;
-    graph.layout.label1_x = graph.layout.graph_display_start_x + 2 * seglen - SCALE1(FONT_SMALL / 2);
-    graph.layout.label2_x = graph.layout.graph_display_start_x + 4 * seglen - SCALE1(FONT_SMALL / 2);
-    graph.layout.label3_x = graph.layout.graph_display_start_x + 6 * seglen - SCALE1(FONT_SMALL / 2);
-    graph.layout.label4_x = graph.layout.graph_display_start_x + 8 * seglen - SCALE1(FONT_SMALL / 2);
-
-    // y axis: charge
-    graph.layout.icon_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH);
-    const int inc = graph.layout.graph_display_size_y / 4;
-    const int assetH = 10;
-    graph.layout.icon1_y = graph.layout.graph_display_start_y + inc / 2 - assetH / 2;
-    graph.layout.icon2_y = graph.layout.icon1_y + inc;
-    graph.layout.icon3_y = graph.layout.icon2_y + inc;
-    graph.layout.icon4_y = graph.layout.icon3_y + inc;
-
-    graph.layout.label_current_x = SCALE1(PADDING + BUTTON_MARGIN);
-    graph.layout.label_current_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN);
-
-    graph.layout.label_session_x = SCALE1(PADDING + BUTTON_MARGIN);
-    graph.layout.label_session_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN + BUTTON_MARGIN + FONT_MEDIUM);
-
-    graph.layout.label_left_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH + AXIS_MARGIN); // right-aligned!
-    graph.layout.label_left_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN);
-
-    graph.layout.label_best_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH + AXIS_MARGIN); // right-aligned!
-    graph.layout.label_best_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN + BUTTON_MARGIN + FONT_MEDIUM);
-
-    graph.layout.label_size_x = graph.layout.graph_display_size_x / 2;
-    graph.layout.label_size_y = FONT_MEDIUM; // true for all? better make sure!
-
-    graph.layout.graph_max_size = GRAPH_MAX_FULL_PAGES * graph.layout.graph_display_size_x;
-
-    graph.graphic = (GraphSpot *)malloc(graph.layout.graph_max_size * sizeof(GraphSpot));
-    for (int i = 0; i < graph.layout.graph_max_size; i++)
-    {
-        graph.graphic[i].pixel_height = 0;
-        graph.graphic[i].is_charging = false;
-        graph.graphic[i].is_estimated = false;
-    }
+	// the diagram.
+	// x: start inside the default padding, and align with the text inside the pill above and below (BUTTON_MARGIN).
+	// y: default padding, below the title pill and some additional padding to leave some breathing room (BUTTON_MARGIN
+	// + GRAPH_MARGIN).
+	graph.layout.graph_display_start_x = SCALE1(PADDING + BUTTON_MARGIN);
+	graph.layout.graph_display_start_y = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + GRAPH_MARGIN);
+
+	// x: stretch whole width inside default padding + extra margin (see above), leaving space top the right for icons.
+	// y: stretch whole height below graph_display_start_y, leaving room at the bottom for padding, button hints, stats,
+	// axis labels
+	graph.layout.graph_display_size_x = hw - SCALE1(PADDING * 2 + BUTTON_MARGIN * 2 + AXIS_MARGIN + AXIS_WIDTH);
+	graph.layout.graph_display_size_y = hh - SCALE1(PADDING * 2 + PILL_SIZE * 2 + BUTTON_MARGIN * 2 + GRAPH_MARGIN * 2 +
+													STATS_MARGIN * 2 + STATS_HEIGHT);
+
+	// y coord of x axis labels
+	graph.layout.label_y = graph.layout.graph_display_start_y + graph.layout.graph_display_size_y;
+
+	// x axis: time
+	const int seglen = graph.layout.graph_display_size_x / GRAPH_SEGMENTS;
+	graph.layout.label1_x = graph.layout.graph_display_start_x + 2 * seglen - SCALE1(FONT_SMALL / 2);
+	graph.layout.label2_x = graph.layout.graph_display_start_x + 4 * seglen - SCALE1(FONT_SMALL / 2);
+	graph.layout.label3_x = graph.layout.graph_display_start_x + 6 * seglen - SCALE1(FONT_SMALL / 2);
+	graph.layout.label4_x = graph.layout.graph_display_start_x + 8 * seglen - SCALE1(FONT_SMALL / 2);
+
+	// y axis: charge
+	graph.layout.icon_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH);
+	const int inc = graph.layout.graph_display_size_y / 4;
+	const int assetH = 10;
+	graph.layout.icon1_y = graph.layout.graph_display_start_y + inc / 2 - assetH / 2;
+	graph.layout.icon2_y = graph.layout.icon1_y + inc;
+	graph.layout.icon3_y = graph.layout.icon2_y + inc;
+	graph.layout.icon4_y = graph.layout.icon3_y + inc;
+
+	graph.layout.label_current_x = SCALE1(PADDING + BUTTON_MARGIN);
+	graph.layout.label_current_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN);
+
+	graph.layout.label_session_x = SCALE1(PADDING + BUTTON_MARGIN);
+	graph.layout.label_session_y =
+		graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN + BUTTON_MARGIN + FONT_MEDIUM);
+
+	graph.layout.label_left_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH + AXIS_MARGIN); // right-aligned!
+	graph.layout.label_left_y = graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN);
+
+	graph.layout.label_best_x = hw - SCALE1(PADDING + BUTTON_MARGIN + AXIS_WIDTH + AXIS_MARGIN); // right-aligned!
+	graph.layout.label_best_y =
+		graph.layout.label_y + SCALE1(GRAPH_MARGIN + STATS_MARGIN + BUTTON_MARGIN + FONT_MEDIUM);
+
+	graph.layout.label_size_x = graph.layout.graph_display_size_x / 2;
+	graph.layout.label_size_y = FONT_MEDIUM; // true for all? better make sure!
+
+	graph.layout.graph_max_size = GRAPH_MAX_FULL_PAGES * graph.layout.graph_display_size_x;
+
+	graph.graphic = (GraphSpot *)malloc(graph.layout.graph_max_size * sizeof(GraphSpot));
+	for (int i = 0; i < graph.layout.graph_max_size; i++) {
+		graph.graphic[i].pixel_height = 0;
+		graph.graphic[i].is_charging = false;
+		graph.graphic[i].is_estimated = false;
+	}
 }
 
 int main(int argc, char *argv[])
 {
-    InitSettings();
-
-    PWR_setCPUSpeed(CPU_SPEED_MENU);
-    device_model = PLAT_getModel();
-
-    screen = GFX_init(MODE_MAIN);
-    PAD_init();
-    PWR_init();
-
-    signal(SIGINT, sigHandler);
-    signal(SIGTERM, sigHandler);
-
-    initLayout();
-    compute_graph();
-    renderPage();
-
-    int dirty = 1;
-    int show_setting = 0;
-    int was_online = PLAT_isOnline();
-    int had_bt = PLAT_btIsConnected();
-    while (!quit)
-    {
-        uint32_t frame_start = SDL_GetTicks();
-
-        PAD_poll();
-
-        // This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
-        if (PAD_justPressed(BTN_MENU))
-        {
-            // ?
-        }
-        else
-        {
-            if (PAD_justRepeated(BTN_LEFT))
-            {
-                dirty = 1;
-                int page_max = (int)(((GRAPH_MAX_FULL_PAGES) * (GRAPH_PAGE_SCROLL_SMOOTHNESS)) / (segment_duration / GRAPH_SEGMENT_HIGH));
-                page_max -= GRAPH_PAGE_SCROLL_SMOOTHNESS;
-
-                if (page_max > current_page)
-                    current_page++;
-            }
-            else if (PAD_justRepeated(BTN_RIGHT))
-            {
-                dirty = 1;
-                if (current_page > 0)
-                    current_page--;
-            }
-            else if (PAD_justPressed(BTN_B))
-            {
-                quit = 1;
-            }
-            else if (PAD_justPressed(BTN_L1) || PAD_justPressed(BTN_L2))
-            {
-                if (current_zoom > 0)
-                {
-                    current_page = 0;
-                    current_zoom--;
-                    dirty = 1;
-                }
-            }
-            else if (PAD_justPressed(BTN_R1) || PAD_justPressed(BTN_R2))
-            {
-                if (current_zoom < 2)
-                {
-                    current_page = 0;
-                    current_zoom++;
-                    dirty = 1;
-                }
-            }
-        }
-
-        PWR_update(&dirty, &show_setting, NULL, NULL);
-
-        int is_online = PLAT_isOnline();
-        if (was_online != is_online)
-            dirty = 1;
-        was_online = is_online;
-
-        int has_bt = PLAT_btIsConnected();
-        if (had_bt != has_bt)
-            dirty = 1;
-        had_bt = has_bt;
-
-        if (dirty)
-        {
-            GFX_clear(screen);
-
-            // title pill
-            {
-                int ow = GFX_blitHardwareGroup(screen, show_setting);
-                int max_width = screen->w - SCALE1(PADDING * 2) - ow;
-
-                char display_name[256];
-
-                switch (current_zoom)
-                {
-                case 0:
-                    sprintf(display_name, "Battery usage: Last %s", "16 hours");
-                    break;
-                case 1:
-                    sprintf(display_name, "Battery usage: Last %s", "8 hours");
-                    break;
-                case 2:
-                    sprintf(display_name, "Battery usage: Last %s", "4 hours");
-                    break;
-                default:
-                    sprintf(display_name, "Battery usage: Last %s", "8 hours");
-                    break;
-                }
-
-                char title[256];
-                int text_width = GFX_truncateText(font.large, display_name, title, max_width, SCALE1(BUTTON_PADDING * 2));
-                max_width = MIN(max_width, text_width);
-
-                SDL_Surface *text;
-                text = TTF_RenderUTF8_Blended(font.large, title, COLOR_WHITE);
-                
-                GFX_blitPill(ASSET_BLACK_PILL, screen, &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
-                SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen, &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
-                SDL_FreeSurface(text);
-            }
-
-            renderPage();
-
-            if (show_setting)
-                GFX_blitHardwareHints(screen, show_setting);
-            else
-                GFX_blitButtonGroup((char *[]){"L/R", "SCROLL", "L1/R1", "ZOOM", NULL}, 0, screen, 0);
-
-            GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
-
-            GFX_flip(screen);
-            dirty = 0;
-        }
-        else
-            GFX_sync();
-    }
-
-    QuitSettings();
-    PWR_quit();
-    PAD_quit();
-    GFX_quit();
-
-    return EXIT_SUCCESS;
+	InitSettings();
+
+	PWR_setCPUSpeed(CPU_SPEED_MENU);
+	device_model = PLAT_getModel();
+
+	screen = GFX_init(MODE_MAIN);
+	PAD_init();
+	PWR_init();
+
+	signal(SIGINT, sigHandler);
+	signal(SIGTERM, sigHandler);
+
+	initLayout();
+	compute_graph();
+	renderPage();
+
+	int dirty = 1;
+	int show_setting = 0;
+	int was_online = PLAT_isOnline();
+	int had_bt = PLAT_btIsConnected();
+	while (!quit) {
+		uint32_t frame_start = SDL_GetTicks();
+
+		PAD_poll();
+
+		// This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
+		if (PAD_justPressed(BTN_MENU)) {
+			// ?
+		} else {
+			if (PAD_justRepeated(BTN_LEFT)) {
+				dirty = 1;
+				int page_max = (int)(((GRAPH_MAX_FULL_PAGES) * (GRAPH_PAGE_SCROLL_SMOOTHNESS)) /
+									 (segment_duration / GRAPH_SEGMENT_HIGH));
+				page_max -= GRAPH_PAGE_SCROLL_SMOOTHNESS;
+
+				if (page_max > current_page)
+					current_page++;
+			} else if (PAD_justRepeated(BTN_RIGHT)) {
+				dirty = 1;
+				if (current_page > 0)
+					current_page--;
+			} else if (PAD_justPressed(BTN_B)) {
+				quit = 1;
+			} else if (PAD_justPressed(BTN_L1) || PAD_justPressed(BTN_L2)) {
+				if (current_zoom > 0) {
+					current_page = 0;
+					current_zoom--;
+					dirty = 1;
+				}
+			} else if (PAD_justPressed(BTN_R1) || PAD_justPressed(BTN_R2)) {
+				if (current_zoom < 2) {
+					current_page = 0;
+					current_zoom++;
+					dirty = 1;
+				}
+			}
+		}
+
+		PWR_update(&dirty, &show_setting, NULL, NULL);
+
+		int is_online = PLAT_isOnline();
+		if (was_online != is_online)
+			dirty = 1;
+		was_online = is_online;
+
+		int has_bt = PLAT_btIsConnected();
+		if (had_bt != has_bt)
+			dirty = 1;
+		had_bt = has_bt;
+
+		if (dirty) {
+			GFX_clear(screen);
+
+			// title pill
+			{
+				int ow = GFX_blitHardwareGroup(screen, show_setting);
+				int max_width = screen->w - SCALE1(PADDING * 2) - ow;
+
+				char display_name[256];
+
+				switch (current_zoom) {
+				case 0:
+					sprintf(display_name, "Battery usage: Last %s", "16 hours");
+					break;
+				case 1:
+					sprintf(display_name, "Battery usage: Last %s", "8 hours");
+					break;
+				case 2:
+					sprintf(display_name, "Battery usage: Last %s", "4 hours");
+					break;
+				default:
+					sprintf(display_name, "Battery usage: Last %s", "8 hours");
+					break;
+				}
+
+				char title[256];
+				int text_width =
+					GFX_truncateText(font.large, display_name, title, max_width, SCALE1(BUTTON_PADDING * 2));
+				max_width = MIN(max_width, text_width);
+
+				SDL_Surface *text;
+				text = TTF_RenderUTF8_Blended(font.large, title, COLOR_WHITE);
+
+				GFX_blitPill(ASSET_BLACK_PILL, screen,
+							 &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
+				SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen,
+								&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
+				SDL_FreeSurface(text);
+			}
+
+			renderPage();
+
+			if (show_setting)
+				GFX_blitHardwareHints(screen, show_setting);
+			else
+				GFX_blitButtonGroup((char *[]){"L/R", "SCROLL", "L1/R1", "ZOOM", NULL}, 0, screen, 0);
+
+			GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
+
+			GFX_flip(screen);
+			dirty = 0;
+		} else
+			GFX_sync();
+	}
+
+	QuitSettings();
+	PWR_quit();
+	PAD_quit();
+	GFX_quit();
+
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/bootlogo/bootlogo.c b/workspace/all/bootlogo/bootlogo.c
index c4cf58c2f..569b8d458 100644
--- a/workspace/all/bootlogo/bootlogo.c
+++ b/workspace/all/bootlogo/bootlogo.c
@@ -14,188 +14,171 @@ static bool quit = false;
 
 static void sigHandler(int sig)
 {
-    switch (sig)
-    {
-    case SIGINT:
-    case SIGTERM:
-        quit = true;
-        break;
-    default:
-        break;
-    }
+	switch (sig) {
+	case SIGINT:
+	case SIGTERM:
+		quit = true;
+		break;
+	default:
+		break;
+	}
 }
 
 static SDL_Surface *screen;
 
-SDL_Surface** images;
+SDL_Surface **images;
 char **image_paths;
 static int selected = 0;
 static int count = 0;
 
 int loadImages()
 {
-    char* device = getenv("DEVICE");
-    // This needs to get a bit more flexible down the line, but for now we either expect the files
-    // in the pak root directory or in the "brick" subfolder.
-    char basepath[MAX_PATH];
-    if(exactMatch("brick", device)) {
-        snprintf(basepath, sizeof(basepath), "%s/Bootlogo.pak/brick/", TOOLS_PATH);
-    }
-    else {
-        snprintf(basepath, sizeof(basepath), "%s/Bootlogo.pak/smartpro/", TOOLS_PATH);
-    }
-
-    // grab all bmp files in the directory and load them with IMG_Load, 
-    // keep them in an array of SDL_Surface pointers
-    DIR *dir;
-    struct dirent *ent;
-    if ((dir = opendir(basepath)) != NULL) {
-        while ((ent = readdir(dir)) != NULL) {
-            if (strstr(ent->d_name, ".bmp") != NULL) {
-                char path[MAX_PATH];
-                snprintf(path, sizeof(path), "%s%s", basepath, ent->d_name);
-                SDL_Surface *bmp = IMG_Load(path);
-                if (bmp) {
-                    count++;
-                    images = realloc(images, sizeof(SDL_Surface*) * count);
-                    images[count-1] = bmp;
-                    image_paths = realloc(image_paths, sizeof(char*) * count);
-                    image_paths[count-1] = strdup(path);
-                }
-            }
-        }
-        closedir(dir);
-    } else {
-        // could not open directory
-        LOG_error("could not open directory");
-        if (CFG_getHaptics()) {
-            VIB_triplePulse(5, 150, 200);
-        }
-        return 0;
-    }
-    return count;
+	char *device = getenv("DEVICE");
+	// This needs to get a bit more flexible down the line, but for now we either expect the files
+	// in the pak root directory or in the "brick" subfolder.
+	char basepath[MAX_PATH];
+	if (exactMatch("brick", device)) {
+		snprintf(basepath, sizeof(basepath), "%s/Bootlogo.pak/brick/", TOOLS_PATH);
+	} else {
+		snprintf(basepath, sizeof(basepath), "%s/Bootlogo.pak/smartpro/", TOOLS_PATH);
+	}
+
+	// grab all bmp files in the directory and load them with IMG_Load,
+	// keep them in an array of SDL_Surface pointers
+	DIR *dir;
+	struct dirent *ent;
+	if ((dir = opendir(basepath)) != NULL) {
+		while ((ent = readdir(dir)) != NULL) {
+			if (strstr(ent->d_name, ".bmp") != NULL) {
+				char path[MAX_PATH];
+				snprintf(path, sizeof(path), "%s%s", basepath, ent->d_name);
+				SDL_Surface *bmp = IMG_Load(path);
+				if (bmp) {
+					count++;
+					images = realloc(images, sizeof(SDL_Surface *) * count);
+					images[count - 1] = bmp;
+					image_paths = realloc(image_paths, sizeof(char *) * count);
+					image_paths[count - 1] = strdup(path);
+				}
+			}
+		}
+		closedir(dir);
+	} else {
+		// could not open directory
+		LOG_error("could not open directory");
+		if (CFG_getHaptics()) {
+			VIB_triplePulse(5, 150, 200);
+		}
+		return 0;
+	}
+	return count;
 }
 
 void unloadImages()
 {
-    for (int i = 0; i < count; i++)
-    {
-        SDL_FreeSurface(images[i]);
-    }
-    free(images);
+	for (int i = 0; i < count; i++) {
+		SDL_FreeSurface(images[i]);
+	}
+	free(images);
 }
 
 int main(int argc, char *argv[])
 {
-    InitSettings();
-
-    PWR_setCPUSpeed(CPU_SPEED_MENU);
-
-    screen = GFX_init(MODE_MAIN);
-    PAD_init();
-    PWR_init();
-
-    signal(SIGINT, sigHandler);
-    signal(SIGTERM, sigHandler);
-
-    loadImages();
-
-    int dirty = 1;
-    int show_setting = 0;
-    int was_online = PLAT_isOnline();
-    int had_bt = PLAT_btIsConnected();
-    while (!quit)
-    {
-        uint32_t frame_start = SDL_GetTicks();
-
-        PAD_poll();
-
-        // This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
-        if (PAD_justPressed(BTN_MENU))
-        {
-            // ?
-        }
-        else
-        {
-            if (PAD_justRepeated(BTN_LEFT))
-            {
-                selected -= 1;
-                if (selected<0)
-                    selected = count - 1;
-                dirty = 1;
-            }
-            else if (PAD_justRepeated(BTN_RIGHT))
-            {
-                selected += 1;
-                if (selected>=count)
-                    selected = 0;
-                dirty = 1;
-            }
-            else if (PAD_justPressed(BTN_A))
-            {
-                // apply with system calls
-                // BOOT_PATH=/mnt/boot/
-                // mkdir -p $BOOT_PATH
-                // mount -t vfat /dev/mmcblk0p1 $BOOT_PATH
-                // cp $LOGO_PATH $BOOT_PATH
-                // sync
-                // umount $BOOT_PATH
-                // reboot
-                char* boot_path = "/mnt/boot/";
-                char* logo_path = image_paths[selected];
-                char cmd[256]; 
-                snprintf(cmd, sizeof(cmd), "mkdir -p %s && mount -t vfat /dev/mmcblk0p1 %s && cp \"%s\" %s/bootlogo.bmp && sync && umount %s && reboot", boot_path, boot_path, logo_path, boot_path, boot_path);
-                system(cmd);
-            }
-            else if (PAD_justPressed(BTN_B))
-            {
-                quit = 1;
-            }
-        }
-
-        PWR_update(&dirty, NULL, NULL, NULL);
-
-        int is_online = PLAT_isOnline();
-        if (was_online != is_online)
-            dirty = 1;
-        was_online = is_online;
-
-        int has_bt = PLAT_btIsConnected();
-        if (had_bt != has_bt)
-            dirty = 1;
-        had_bt = has_bt;
-
-        if (dirty)
-        {
-            GFX_clear(screen);
-
-            if(count > 0) {
-                // render the selected image, centered on screen
-                SDL_Surface *image = images[selected];
-                SDL_Rect image_rect = {
-                    screen->w /2 - image->w /2,
-                    screen->h /2 - image->h / 2,
-                    image->w,
-                    image->h};
-                SDL_BlitSurface(image, NULL, screen, &image_rect);
-            }
-
-            GFX_blitButtonGroup((char *[]){"L/R", "SCROLL", NULL}, 0, screen, 0);
-            GFX_blitButtonGroup((char *[]){"A", "SET", "B", "BACK", NULL}, 1, screen, 1);
-
-            GFX_flip(screen);
-            dirty = 0;
-        }
-        else
-            GFX_sync();
-    }
-
-    unloadImages();
-
-    QuitSettings();
-    PWR_quit();
-    PAD_quit();
-    GFX_quit();
-
-    return EXIT_SUCCESS;
+	InitSettings();
+
+	PWR_setCPUSpeed(CPU_SPEED_MENU);
+
+	screen = GFX_init(MODE_MAIN);
+	PAD_init();
+	PWR_init();
+
+	signal(SIGINT, sigHandler);
+	signal(SIGTERM, sigHandler);
+
+	loadImages();
+
+	int dirty = 1;
+	int show_setting = 0;
+	int was_online = PLAT_isOnline();
+	int had_bt = PLAT_btIsConnected();
+	while (!quit) {
+		uint32_t frame_start = SDL_GetTicks();
+
+		PAD_poll();
+
+		// This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
+		if (PAD_justPressed(BTN_MENU)) {
+			// ?
+		} else {
+			if (PAD_justRepeated(BTN_LEFT)) {
+				selected -= 1;
+				if (selected < 0)
+					selected = count - 1;
+				dirty = 1;
+			} else if (PAD_justRepeated(BTN_RIGHT)) {
+				selected += 1;
+				if (selected >= count)
+					selected = 0;
+				dirty = 1;
+			} else if (PAD_justPressed(BTN_A)) {
+				// apply with system calls
+				// BOOT_PATH=/mnt/boot/
+				// mkdir -p $BOOT_PATH
+				// mount -t vfat /dev/mmcblk0p1 $BOOT_PATH
+				// cp $LOGO_PATH $BOOT_PATH
+				// sync
+				// umount $BOOT_PATH
+				// reboot
+				char *boot_path = "/mnt/boot/";
+				char *logo_path = image_paths[selected];
+				char cmd[256];
+				snprintf(cmd, sizeof(cmd),
+						 "mkdir -p %s && mount -t vfat /dev/mmcblk0p1 %s && cp \"%s\" %s/bootlogo.bmp && sync && "
+						 "umount %s && reboot",
+						 boot_path, boot_path, logo_path, boot_path, boot_path);
+				system(cmd);
+			} else if (PAD_justPressed(BTN_B)) {
+				quit = 1;
+			}
+		}
+
+		PWR_update(&dirty, NULL, NULL, NULL);
+
+		int is_online = PLAT_isOnline();
+		if (was_online != is_online)
+			dirty = 1;
+		was_online = is_online;
+
+		int has_bt = PLAT_btIsConnected();
+		if (had_bt != has_bt)
+			dirty = 1;
+		had_bt = has_bt;
+
+		if (dirty) {
+			GFX_clear(screen);
+
+			if (count > 0) {
+				// render the selected image, centered on screen
+				SDL_Surface *image = images[selected];
+				SDL_Rect image_rect = {screen->w / 2 - image->w / 2, screen->h / 2 - image->h / 2, image->w, image->h};
+				SDL_BlitSurface(image, NULL, screen, &image_rect);
+			}
+
+			GFX_blitButtonGroup((char *[]){"L/R", "SCROLL", NULL}, 0, screen, 0);
+			GFX_blitButtonGroup((char *[]){"A", "SET", "B", "BACK", NULL}, 1, screen, 1);
+
+			GFX_flip(screen);
+			dirty = 0;
+		} else
+			GFX_sync();
+	}
+
+	unloadImages();
+
+	QuitSettings();
+	PWR_quit();
+	PAD_quit();
+	GFX_quit();
+
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/clock/clock.c b/workspace/all/clock/clock.c
index 78f181a7a..b9f65dc48 100644
--- a/workspace/all/clock/clock.c
+++ b/workspace/all/clock/clock.c
@@ -19,21 +19,22 @@ enum {
 	CURSOR_AMPM,
 };
 
-int main(int argc , char* argv[]) {
+int main(int argc, char *argv[])
+{
 	PWR_setCPUSpeed(CPU_SPEED_MENU);
-	
-	SDL_Surface* screen = GFX_init(MODE_MAIN);
+
+	SDL_Surface *screen = GFX_init(MODE_MAIN);
 	PAD_init();
 	PWR_init();
 	InitSettings();
-	
+
 	// TODO: make use of SCALE1()
-	SDL_Surface* digits = SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(120,16), FIXED_DEPTH,RGBA_MASK_AUTO);
+	SDL_Surface *digits = SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(120, 16), FIXED_DEPTH, RGBA_MASK_AUTO);
 	SDL_FillRect(digits, NULL, RGB_BLACK);
-	
-	SDL_Surface* digit;
-	char* chars[] = { "0","1","2","3","4","5","6","7","8","9","/",":", NULL };
-	char* c;
+
+	SDL_Surface *digit;
+	char *chars[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "/", ":", NULL};
+	char *c;
 	int i = 0;
 #define DIGIT_WIDTH 10
 #define DIGIT_HEIGHT 16
@@ -42,23 +43,26 @@ int main(int argc , char* argv[]) {
 #define CHAR_COLON 11
 	while (c = chars[i]) {
 		digit = TTF_RenderUTF8_Blended(font.large, c, COLOR_WHITE);
-		int y = i==CHAR_COLON ? SCALE1(-1.5) : 0; // : sits too low naturally
+		int y = i == CHAR_COLON ? SCALE1(-1.5) : 0; // : sits too low naturally
 		// TODO: y offset is wrong here
-		// printf("%s x:%i y:%i SCALE1(DIGIT_HEIGHT):%i SCALE1(DIGIT_HEIGHT) - digit->h:%i\n", c, (i * SCALE1(DIGIT_WIDTH)), y, SCALE1(DIGIT_HEIGHT), SCALE1(DIGIT_HEIGHT) - digit->h); fflush(stdout);
-		SDL_BlitSurface(digit, NULL, digits, &(SDL_Rect){ (i * SCALE1(DIGIT_WIDTH)) + (SCALE1(DIGIT_WIDTH) - digit->w)/2, y + (SCALE1(DIGIT_HEIGHT) - digit->h)/2 });
+		// printf("%s x:%i y:%i SCALE1(DIGIT_HEIGHT):%i SCALE1(DIGIT_HEIGHT) - digit->h:%i\n", c, (i *
+		// SCALE1(DIGIT_WIDTH)), y, SCALE1(DIGIT_HEIGHT), SCALE1(DIGIT_HEIGHT) - digit->h); fflush(stdout);
+		SDL_BlitSurface(digit, NULL, digits,
+						&(SDL_Rect){(i * SCALE1(DIGIT_WIDTH)) + (SCALE1(DIGIT_WIDTH) - digit->w) / 2,
+									y + (SCALE1(DIGIT_HEIGHT) - digit->h) / 2});
 		SDL_FreeSurface(digit);
 		i += 1;
 	}
-	
+
 	SDL_Event event;
 	int quit = 0;
 	int save_changes = 0;
 	int select_cursor = 0;
 	int show_24hour = exists(USERDATA_PATH "/show_24hour");
-	
+
 	time_t t = time(NULL);
 	struct tm tm = *localtime(&t);
-	
+
 	int32_t day_selected = tm.tm_mday;
 	int32_t month_selected = tm.tm_mon + 1;
 	uint32_t year_selected = tm.tm_year + 1900;
@@ -66,264 +70,285 @@ int main(int argc , char* argv[]) {
 	int32_t minute_selected = tm.tm_min;
 	int32_t seconds_selected = tm.tm_sec;
 	int32_t am_selected = tm.tm_hour < 12;
-	
+
 	// x,y,w are pre-scaled
-	int blit(int i, int x, int y) {
-		SDL_BlitSurface(digits, &(SDL_Rect){i*SCALE1(10),0,SCALE2(10,16)}, screen, &(SDL_Rect){x,y});
+	int blit(int i, int x, int y)
+	{
+		SDL_BlitSurface(digits, &(SDL_Rect){i * SCALE1(10), 0, SCALE2(10, 16)}, screen, &(SDL_Rect){x, y});
 		return x + SCALE1(10);
 	}
-	void blitBar(int x, int y, int w) {
-		GFX_blitPill(ASSET_UNDERLINE, screen, &(SDL_Rect){x,y,w});
+	void blitBar(int x, int y, int w)
+	{
+		GFX_blitPill(ASSET_UNDERLINE, screen, &(SDL_Rect){x, y, w});
 	}
-	int blitNumber(int num, int x, int y) {
+	int blitNumber(int num, int x, int y)
+	{
 		int n;
 		if (num > 999) {
 			n = num / 1000;
 			num -= n * 1000;
-			x = blit(n, x,y);
-			
+			x = blit(n, x, y);
+
 			n = num / 100;
 			num -= n * 100;
-			x = blit(n, x,y);
+			x = blit(n, x, y);
 		}
 		n = num / 10;
 		num -= n * 10;
-		x = blit(n, x,y);
-		
+		x = blit(n, x, y);
+
 		n = num;
-		x = blit(n, x,y);
-		
+		x = blit(n, x, y);
+
 		return x;
 	}
-	void validate(void) {
+	void validate(void)
+	{
 		// leap year
 		uint32_t february_days = 28;
-		if ( ((year_selected % 4 == 0) && (year_selected % 100 != 0)) || (year_selected % 400 == 0)) february_days = 29;
-	
+		if (((year_selected % 4 == 0) && (year_selected % 100 != 0)) || (year_selected % 400 == 0))
+			february_days = 29;
+
 		// day
 		// if (day_selected < 1) day_selected = 1;
-		if (month_selected > 12) month_selected -= 12;
-		else if (month_selected < 1) month_selected += 12;
-	
-		if (year_selected > 2100) year_selected = 2100;
-		else if (year_selected < 1970) year_selected = 1970;
-	
-		switch(month_selected)
-		{
-			case 2:
-				if (day_selected > february_days) day_selected -= february_days;
-				else if (day_selected<1) day_selected += february_days;
-				break;
-			case 4:
-			case 6:
-			case 9:
-			case 11:
-				if (day_selected > 30) day_selected -= 30;
-				else if (day_selected < 1) day_selected += 30;
+		if (month_selected > 12)
+			month_selected -= 12;
+		else if (month_selected < 1)
+			month_selected += 12;
 
-				break;
-			default:
-				if (day_selected > 31) day_selected -= 31;
-				else if (day_selected < 1) day_selected += 31;
-				break;
+		if (year_selected > 2100)
+			year_selected = 2100;
+		else if (year_selected < 1970)
+			year_selected = 1970;
+
+		switch (month_selected) {
+		case 2:
+			if (day_selected > february_days)
+				day_selected -= february_days;
+			else if (day_selected < 1)
+				day_selected += february_days;
+			break;
+		case 4:
+		case 6:
+		case 9:
+		case 11:
+			if (day_selected > 30)
+				day_selected -= 30;
+			else if (day_selected < 1)
+				day_selected += 30;
+
+			break;
+		default:
+			if (day_selected > 31)
+				day_selected -= 31;
+			else if (day_selected < 1)
+				day_selected += 31;
+			break;
 		}
-	
+
 		// time
-		if (hour_selected > 23) hour_selected -= 24;
-		else if (hour_selected < 0) hour_selected += 24;
-		if (minute_selected > 59) minute_selected -= 60;
-		else if (minute_selected < 0) minute_selected += 60;
-		if (seconds_selected > 59) seconds_selected -= 60;
-		else if (seconds_selected < 0) seconds_selected += 60;
+		if (hour_selected > 23)
+			hour_selected -= 24;
+		else if (hour_selected < 0)
+			hour_selected += 24;
+		if (minute_selected > 59)
+			minute_selected -= 60;
+		else if (minute_selected < 0)
+			minute_selected += 60;
+		if (seconds_selected > 59)
+			seconds_selected -= 60;
+		else if (seconds_selected < 0)
+			seconds_selected += 60;
 	}
-	
+
 	int option_count = 7;
 
 	int dirty = 1;
 	int show_setting = 0;
 	int was_online = PLAT_isOnline();
-    int had_bt = PLAT_btIsConnected();
-	while(!quit) {
+	int had_bt = PLAT_btIsConnected();
+	while (!quit) {
 		uint32_t frame_start = SDL_GetTicks();
-		
+
 		PAD_poll();
-		
+
 		if (PAD_justRepeated(BTN_UP)) {
 			dirty = 1;
-			switch(select_cursor) {
-				case CURSOR_YEAR:
-					year_selected++;
+			switch (select_cursor) {
+			case CURSOR_YEAR:
+				year_selected++;
 				break;
-				case CURSOR_MONTH:
-					month_selected++;
+			case CURSOR_MONTH:
+				month_selected++;
 				break;
-				case CURSOR_DAY:
-					day_selected++;
+			case CURSOR_DAY:
+				day_selected++;
 				break;
-				case CURSOR_HOUR:
-					hour_selected++;
+			case CURSOR_HOUR:
+				hour_selected++;
 				break;
-				case CURSOR_MINUTE:
-					minute_selected++;
+			case CURSOR_MINUTE:
+				minute_selected++;
 				break;
-				case CURSOR_SECOND:
-					seconds_selected++;
+			case CURSOR_SECOND:
+				seconds_selected++;
 				break;
-				case CURSOR_AMPM:
-					hour_selected += 12;
+			case CURSOR_AMPM:
+				hour_selected += 12;
 				break;
-				default:
+			default:
 				break;
 			}
-		}
-		else if (PAD_justRepeated(BTN_DOWN)) {
+		} else if (PAD_justRepeated(BTN_DOWN)) {
 			dirty = 1;
-			switch(select_cursor) {
-				case CURSOR_YEAR:
-					year_selected--;
+			switch (select_cursor) {
+			case CURSOR_YEAR:
+				year_selected--;
 				break;
-				case CURSOR_MONTH:
-					month_selected--;
+			case CURSOR_MONTH:
+				month_selected--;
 				break;
-				case CURSOR_DAY:
-					day_selected--;
+			case CURSOR_DAY:
+				day_selected--;
 				break;
-				case CURSOR_HOUR:
-					hour_selected--;
+			case CURSOR_HOUR:
+				hour_selected--;
 				break;
-				case CURSOR_MINUTE:
-					minute_selected--;
+			case CURSOR_MINUTE:
+				minute_selected--;
 				break;
-				case CURSOR_SECOND:
-					seconds_selected--;
+			case CURSOR_SECOND:
+				seconds_selected--;
 				break;
-				case CURSOR_AMPM:
-					hour_selected -= 12;
+			case CURSOR_AMPM:
+				hour_selected -= 12;
 				break;
-				default:
+			default:
 				break;
 			}
-		}
-		else if (PAD_justRepeated(BTN_LEFT)) {
+		} else if (PAD_justRepeated(BTN_LEFT)) {
 			dirty = 1;
 			select_cursor--;
-			if (select_cursor < 0) select_cursor += option_count;
-		}
-		else if (PAD_justRepeated(BTN_RIGHT)) {
+			if (select_cursor < 0)
+				select_cursor += option_count;
+		} else if (PAD_justRepeated(BTN_RIGHT)) {
 			dirty = 1;
 			select_cursor++;
-			if (select_cursor >= option_count) select_cursor -= option_count;
-		}
-		else if (PAD_justPressed(BTN_A)) {
+			if (select_cursor >= option_count)
+				select_cursor -= option_count;
+		} else if (PAD_justPressed(BTN_A)) {
 			save_changes = 1;
 			quit = 1;
-		}
-		else if (PAD_justPressed(BTN_B)) {
+		} else if (PAD_justPressed(BTN_B)) {
 			quit = 1;
-		}
-		else if (PAD_justPressed(BTN_SELECT)) {
+		} else if (PAD_justPressed(BTN_SELECT)) {
 			dirty = 1;
 			show_24hour = !show_24hour;
 			option_count = (show_24hour ? CURSOR_SECOND : CURSOR_AMPM) + 1;
-			if (select_cursor >= option_count) select_cursor -= option_count;
-			
+			if (select_cursor >= option_count)
+				select_cursor -= option_count;
+
 			if (show_24hour) {
 				system("touch " USERDATA_PATH "/show_24hour");
-			}
-			else {
+			} else {
 				system("rm " USERDATA_PATH "/show_24hour");
 			}
 		}
-		
-		PWR_update(&dirty, NULL, NULL,NULL);
-		
+
+		PWR_update(&dirty, NULL, NULL, NULL);
+
 		int is_online = PLAT_isOnline();
-		if (was_online!=is_online) 
+		if (was_online != is_online)
 			dirty = 1;
 		was_online = is_online;
 
-        int has_bt = PLAT_btIsConnected();
-        if (had_bt != has_bt)
-            dirty = 1;
-        had_bt = has_bt;
-		
+		int has_bt = PLAT_btIsConnected();
+		if (had_bt != has_bt)
+			dirty = 1;
+		had_bt = has_bt;
+
 		if (dirty) {
 			validate();
 
 			GFX_clear(screen);
-			
+
 			GFX_blitHardwareGroup(screen, show_setting);
-			
-			if (show_setting) GFX_blitHardwareHints(screen, show_setting);
-			else GFX_blitButtonGroup((char*[]){ "SELECT",show_24hour?"12 HOUR":"24 HOUR", NULL }, 0, screen, 0);
 
-			GFX_blitButtonGroup((char*[]){ "B","CANCEL", "A","SET", NULL }, 1, screen, 1);
-		
+			if (show_setting)
+				GFX_blitHardwareHints(screen, show_setting);
+			else
+				GFX_blitButtonGroup((char *[]){"SELECT", show_24hour ? "12 HOUR" : "24 HOUR", NULL}, 0, screen, 0);
+
+			GFX_blitButtonGroup((char *[]){"B", "CANCEL", "A", "SET", NULL}, 1, screen, 1);
+
 			// 376 or 446 (@2x)
 			// 188 or 223 (@1x)
-			int ox = (screen->w - (show_24hour?SCALE1(188):SCALE1(223))) / 2;
-			
+			int ox = (screen->w - (show_24hour ? SCALE1(188) : SCALE1(223))) / 2;
+
 			// datetime
 			int x = ox;
-			int y = SCALE1((((FIXED_HEIGHT / FIXED_SCALE)-PILL_SIZE-DIGIT_HEIGHT)/2));
-			
-			x = blitNumber(year_selected, x,y);
-			x = blit(CHAR_SLASH, x,y);
-			x = blitNumber(month_selected, x,y);
-			x = blit(CHAR_SLASH, x,y);
-			x = blitNumber(day_selected, x,y);
+			int y = SCALE1((((FIXED_HEIGHT / FIXED_SCALE) - PILL_SIZE - DIGIT_HEIGHT) / 2));
+
+			x = blitNumber(year_selected, x, y);
+			x = blit(CHAR_SLASH, x, y);
+			x = blitNumber(month_selected, x, y);
+			x = blit(CHAR_SLASH, x, y);
+			x = blitNumber(day_selected, x, y);
 			x += SCALE1(10); // space
-			
+
 			am_selected = hour_selected < 12;
 			if (show_24hour) {
-				 x = blitNumber(hour_selected, x,y);
-			}
-			else {
+				x = blitNumber(hour_selected, x, y);
+			} else {
 				// if (select_cursor==CURSOR_HOUR) blitNumber(hour_selected, x,233);
-				
+
 				// 12 hour
 				int hour = hour_selected;
-				if (hour==0) hour = 12;
-				else if (hour>12) hour -= 12;
-				x = blitNumber(hour, x,y);
+				if (hour == 0)
+					hour = 12;
+				else if (hour > 12)
+					hour -= 12;
+				x = blitNumber(hour, x, y);
 			}
-			x = blit(CHAR_COLON, x,y);
-			x = blitNumber(minute_selected, x,y);
-			x = blit(CHAR_COLON, x,y);
-			x = blitNumber(seconds_selected, x,y);
-			
+			x = blit(CHAR_COLON, x, y);
+			x = blitNumber(minute_selected, x, y);
+			x = blit(CHAR_COLON, x, y);
+			x = blitNumber(seconds_selected, x, y);
+
 			int ampm_w;
 			if (!show_24hour) {
 				x += SCALE1(10); // space
-				SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, am_selected ? "AM" : "PM", COLOR_WHITE);
+				SDL_Surface *text = TTF_RenderUTF8_Blended(font.large, am_selected ? "AM" : "PM", COLOR_WHITE);
 				ampm_w = text->w + SCALE1(2);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){x,y-SCALE1(3)});
+				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){x, y - SCALE1(3)});
 				SDL_FreeSurface(text);
 			}
-		
+
 			// cursor
 			x = ox;
 			y += SCALE1(19);
-			if (select_cursor!=CURSOR_YEAR) {
+			if (select_cursor != CURSOR_YEAR) {
 				x += SCALE1(50); // YYYY/
 				x += (select_cursor - 1) * SCALE1(30);
 			}
-			blitBar(x,y, (select_cursor==CURSOR_YEAR ? SCALE1(40) : (select_cursor==CURSOR_AMPM ? ampm_w : SCALE1(20))));
-		
+			blitBar(x, y,
+					(select_cursor == CURSOR_YEAR ? SCALE1(40) : (select_cursor == CURSOR_AMPM ? ampm_w : SCALE1(20))));
+
 			GFX_flip(screen);
 			dirty = 0;
-		}
-		else GFX_sync();
+		} else
+			GFX_sync();
 	}
-	
+
 	SDL_FreeSurface(digits);
-	
+
 	QuitSettings();
 	PWR_quit();
 	PAD_quit();
 	GFX_quit();
-	
-	if (save_changes) PLAT_setDateTime(year_selected, month_selected, day_selected, hour_selected, minute_selected, seconds_selected);
-	
+
+	if (save_changes)
+		PLAT_setDateTime(year_selected, month_selected, day_selected, hour_selected, minute_selected, seconds_selected);
+
 	return EXIT_SUCCESS;
 }
diff --git a/workspace/all/common/api.c b/workspace/all/common/api.c
index 8cd7c3822..ef6865900 100644
--- a/workspace/all/common/api.c
+++ b/workspace/all/common/api.c
@@ -30,8 +30,7 @@ void LOG_note(int level, const char *fmt, ...)
 	va_start(args, fmt);
 	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
-	switch (level)
-	{
+	switch (level) {
 #ifdef DEBUG
 	case LOG_DEBUG:
 		printf("[DEBUG] %s", buf);
@@ -82,8 +81,7 @@ enum LightProfile profile_override[PROFILE_OVERRIDE_SIZE];
 
 volatile int useAutoCpu;
 
-static struct GFX_Context
-{
+static struct GFX_Context {
 	SDL_Surface *screen;
 	SDL_Surface *assets;
 
@@ -155,13 +153,8 @@ static inline uint32_t UintMult(uint32_t color, uint32_t modulate_rgb)
 }
 
 ///////////////////////////////
-static int qualityLevels[] = {
-	3,
-	4,
-	2,
-	1};
-static struct PWR_Context
-{
+static int qualityLevels[] = {3, 4, 2, 1};
+static struct PWR_Context {
 	int initialized;
 
 	int can_sleep;
@@ -182,8 +175,7 @@ static struct PWR_Context
 	SDL_Surface *overlay;
 } pwr = {0};
 
-static struct SND_Context
-{
+static struct SND_Context {
 	int initialized;
 	double frame_rate;
 
@@ -283,7 +275,7 @@ SDL_Surface *GFX_init(int mode)
 	gfx.screen = PLAT_initVideo();
 	gfx.vsync = VSYNC_STRICT;
 	gfx.mode = mode;
-	
+
 	CFG_init(GFX_loadSystemFont, GFX_updateColors);
 
 	// TODO: this doesn't really belong here...
@@ -367,7 +359,6 @@ SDL_Surface *GFX_init(int mode)
 }
 void GFX_quit(void)
 {
-
 	TTF_CloseFont(font.large);
 	TTF_CloseFont(font.medium);
 	TTF_CloseFont(font.small);
@@ -425,36 +416,28 @@ void GFX_startFrame(void)
 void chmodfile(const char *file, int writable)
 {
 	struct stat statbuf;
-	if (stat(file, &statbuf) == 0)
-	{
+	if (stat(file, &statbuf) == 0) {
 		mode_t newMode;
-		if (writable)
-		{
+		if (writable) {
 			// Add write permissions for all users
 			newMode = statbuf.st_mode | S_IWUSR | S_IWGRP | S_IWOTH;
-		}
-		else
-		{
+		} else {
 			// Remove write permissions for all users
 			newMode = statbuf.st_mode & ~(S_IWUSR | S_IWGRP | S_IWOTH);
 		}
 
 		// Apply the new permissions
-		if (chmod(file, newMode) != 0)
-		{
+		if (chmod(file, newMode) != 0) {
 			printf("chmod error %d %s", writable, file);
 		}
-	}
-	else
-	{
+	} else {
 		printf("stat error %d %s", writable, file);
 	}
 }
 
 uint32_t GFX_extract_average_color(const void *data, unsigned width, unsigned height, size_t pitch)
 {
-	if (!data)
-	{
+	if (!data) {
 		return 0;
 	}
 
@@ -466,10 +449,8 @@ uint32_t GFX_extract_average_color(const void *data, unsigned width, unsigned he
 	uint64_t total_b = 0;
 	uint32_t colorful_pixel_count = 0;
 
-	for (unsigned y = 0; y < height; y++)
-	{
-		for (unsigned x = 0; x < width; x++)
-		{
+	for (unsigned y = 0; y < height; y++) {
+		for (unsigned x = 0; x < width; x++) {
 			uint16_t pixel = pixels[y * (pitch / 2) + x];
 
 			uint8_t r = ((pixel & 0xF800) >> 11) << 3;
@@ -484,8 +465,7 @@ uint32_t GFX_extract_average_color(const void *data, unsigned width, unsigned he
 			uint8_t min_c = fminf(fminf(r, g), b);
 			uint8_t saturation = max_c == 0 ? 0 : (max_c - min_c) * 255 / max_c;
 
-			if (saturation > 50 && max_c > 50)
-			{
+			if (saturation > 50 && max_c > 50) {
 				total_r += r;
 				total_g += g;
 				total_b += b;
@@ -494,15 +474,11 @@ uint32_t GFX_extract_average_color(const void *data, unsigned width, unsigned he
 		}
 	}
 
-	if (colorful_pixel_count == 0)
-	{
-
+	if (colorful_pixel_count == 0) {
 		colorful_pixel_count = pixel_count;
 		total_r = total_g = total_b = 0;
-		for (unsigned y = 0; y < height; y++)
-		{
-			for (unsigned x = 0; x < width; x++)
-			{
+		for (unsigned y = 0; y < height; y++) {
+			for (unsigned x = 0; x < width; x++) {
 				uint16_t pixel = pixels[y * (pitch / 2) + x];
 				uint8_t r = ((pixel & 0xF800) >> 11) << 3;
 				uint8_t g = ((pixel & 0x07E0) >> 5) << 2;
@@ -533,14 +509,12 @@ void GFX_setAmbientColor(const void *data, unsigned width, unsigned height, size
 
 	uint32_t dominant_color = GFX_extract_average_color(data, width, height, pitch);
 
-	if (mode == 1 || mode == 2 || mode == 5)
-	{
+	if (mode == 1 || mode == 2 || mode == 5) {
 		(lightsAmbient)[2].color1 = dominant_color;
 		(lightsAmbient)[2].effect = 4;
 		(lightsAmbient)[2].brightness = 100;
 	}
-	if (mode == 1 || mode == 3)
-	{
+	if (mode == 1 || mode == 3) {
 		(lightsAmbient)[0].color1 = dominant_color;
 		(lightsAmbient)[0].effect = 4;
 		(lightsAmbient)[0].brightness = 100;
@@ -548,8 +522,7 @@ void GFX_setAmbientColor(const void *data, unsigned width, unsigned height, size
 		(lightsAmbient)[1].effect = 4;
 		(lightsAmbient)[1].brightness = 100;
 	}
-	if (mode == 1 || mode == 4 || mode == 5)
-	{
+	if (mode == 1 || mode == 4 || mode == 5) {
 		(lightsAmbient)[3].color1 = dominant_color;
 		(lightsAmbient)[3].effect = 4;
 		(lightsAmbient)[3].brightness = 100;
@@ -558,7 +531,6 @@ void GFX_setAmbientColor(const void *data, unsigned width, unsigned height, size
 
 void GFX_flip(SDL_Surface *screen)
 {
-
 	PLAT_flip(screen, 0);
 
 	currentfps = current_fps;
@@ -576,12 +548,10 @@ void GFX_flip(SDL_Surface *screen)
 	fps_buffer_index = (fps_buffer_index + 1) % FPS_BUFFER_SIZE;
 	// give it a little bit to stabilize and then use, meanwhile the buffer will
 	// cover it
-	if (fps_counter > 100)
-	{
+	if (fps_counter > 100) {
 		double average_fps = 0.0;
 		int fpsbuffersize = MIN(fps_counter, FPS_BUFFER_SIZE);
-		for (int i = 0; i < fpsbuffersize; i++)
-		{
+		for (int i = 0; i < fpsbuffersize; i++) {
 			average_fps += fps_buffer[i];
 		}
 		average_fps /= fpsbuffersize;
@@ -592,7 +562,6 @@ void GFX_flip(SDL_Surface *screen)
 }
 void GFX_GL_Swap()
 {
-
 	PLAT_GL_Swap();
 
 	currentfps = current_fps;
@@ -610,12 +579,10 @@ void GFX_GL_Swap()
 	fps_buffer_index = (fps_buffer_index + 1) % FPS_BUFFER_SIZE;
 	// give it a little bit to stabilize and then use, meanwhile the buffer will
 	// cover it
-	if (fps_counter > 100)
-	{
+	if (fps_counter > 100) {
 		double average_fps = 0.0;
 		int fpsbuffersize = MIN(fps_counter, FPS_BUFFER_SIZE);
-		for (int i = 0; i < fpsbuffersize; i++)
-		{
+		for (int i = 0; i < fpsbuffersize; i++) {
 			average_fps += fps_buffer[i];
 		}
 		average_fps /= fpsbuffersize;
@@ -628,16 +595,13 @@ void GFX_GL_Swap()
 void GFX_sync(void)
 {
 	uint32_t frame_duration = SDL_GetTicks() - frame_start;
-	if (gfx.vsync != VSYNC_OFF)
-	{
+	if (gfx.vsync != VSYNC_OFF) {
 		// this limiting condition helps SuperFX chip games
-		if (gfx.vsync == VSYNC_STRICT || frame_start == 0 || frame_duration < FRAME_BUDGET)
-		{ // only wait if we're under frame budget
+		if (gfx.vsync == VSYNC_STRICT || frame_start == 0 ||
+			frame_duration < FRAME_BUDGET) { // only wait if we're under frame budget
 			PLAT_vsync(FRAME_BUDGET - frame_duration);
 		}
-	}
-	else
-	{
+	} else {
 		if (frame_duration < FRAME_BUDGET)
 			SDL_Delay(FRAME_BUDGET - frame_duration);
 	}
@@ -656,8 +620,7 @@ void GFX_flip_fixed_rate(SDL_Surface *screen, double target_fps)
 	int64_t perf_freq = SDL_GetPerformanceFrequency();
 	int64_t now = SDL_GetPerformanceCounter();
 
-	if (++frame_index == 0 || target_fps != last_target_fps)
-	{
+	if (++frame_index == 0 || target_fps != last_target_fps) {
 		frame_index = 0;
 		first_frame_start_time = now;
 		last_target_fps = target_fps;
@@ -675,38 +638,31 @@ void GFX_flip_fixed_rate(SDL_Surface *screen, double target_fps)
 	// 	time_of_frame,
 	// 	now - time_of_frame);
 
-	if (offset > 0)
-	{
-		if (offset > max_lost_frames * frame_duration)
-		{
+	if (offset > 0) {
+		if (offset > max_lost_frames * frame_duration) {
 			frame_index = -1;
 			last_target_fps = 0.0;
-			LOG_debug("%s: lost sync by more than %d frames (late) @%llu -> reset\n\n", __FUNCTION__, max_lost_frames, SDL_GetPerformanceCounter());
+			LOG_debug("%s: lost sync by more than %d frames (late) @%llu -> reset\n\n", __FUNCTION__, max_lost_frames,
+					  SDL_GetPerformanceCounter());
 		}
-	}
-	else
-	{
-		if (offset < -max_lost_frames * frame_duration)
-		{
+	} else {
+		if (offset < -max_lost_frames * frame_duration) {
 			frame_index = -1;
 			last_target_fps = 0.0;
-			LOG_debug("%s: lost sync by more than %d frames (early ?!) @%llu -> reset\n\n", __FUNCTION__, max_lost_frames, SDL_GetPerformanceCounter());
-		}
-		else if (offset < 0)
-		{
+			LOG_debug("%s: lost sync by more than %d frames (early ?!) @%llu -> reset\n\n", __FUNCTION__,
+					  max_lost_frames, SDL_GetPerformanceCounter());
+		} else if (offset < 0) {
 			useconds_t time_to_sleep_us = (useconds_t)((time_of_frame - now) * 1e6 / perf_freq);
 
 			// The OS scheduling algorithm cannot guarantee that
 			// the sleep will last the exact amount of requested time.
 			// We sleep as much as we can using the OS primitive.
 			const useconds_t min_waiting_time = 2000;
-			if (time_to_sleep_us > min_waiting_time)
-			{
+			if (time_to_sleep_us > min_waiting_time) {
 				usleep(time_to_sleep_us - min_waiting_time);
 			}
 
-			while (SDL_GetPerformanceCounter() < time_of_frame)
-			{
+			while (SDL_GetPerformanceCounter() < time_of_frame) {
 				// nothing...
 			}
 		}
@@ -721,19 +677,15 @@ void GFX_flip_fixed_rate(SDL_Surface *screen, double target_fps)
 	fps_buffer_index = (fps_buffer_index + 1) % FPS_BUFFER_SIZE;
 	// give it a little bit to stabilize and then use, meanwhile the buffer will
 	// cover it
-	if (fps_counter++ > 100)
-	{
+	if (fps_counter++ > 100) {
 		double average_fps = 0.0;
 		int fpsbuffersize = MIN(fps_counter, FPS_BUFFER_SIZE);
-		for (int i = 0; i < fpsbuffersize; i++)
-		{
+		for (int i = 0; i < fpsbuffersize; i++) {
 			average_fps += fps_buffer[i];
 		}
 		average_fps /= fpsbuffersize;
 		currentfps = current_fps = average_fps;
-	}
-	else
-	{
+	} else {
 		currentfps = current_fps = target_fps;
 	}
 	per_frame_start = SDL_GetPerformanceCounter();
@@ -747,8 +699,13 @@ void GFX_delay(void)
 		SDL_Delay(((1 / SCREEN_FPS) * 1000) - frame_duration);
 }
 
-FALLBACK_IMPLEMENTATION int PLAT_supportsOverscan(void) { return 0; }
-FALLBACK_IMPLEMENTATION void PLAT_setEffectColor(int next_color) {}
+FALLBACK_IMPLEMENTATION int PLAT_supportsOverscan(void)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION void PLAT_setEffectColor(int next_color)
+{
+}
 
 int GFX_truncateText(TTF_Font *font, const char *in_name, char *out_name, int max_width, int padding)
 {
@@ -757,8 +714,7 @@ int GFX_truncateText(TTF_Font *font, const char *in_name, char *out_name, int ma
 	TTF_SizeUTF8(font, out_name, &text_width, NULL);
 	text_width += padding;
 
-	while (text_width > max_width)
-	{
+	while (text_width > max_width) {
 		int len = strlen(out_name);
 		strcpy(&out_name[len - 4], "...\0");
 		TTF_SizeUTF8(font, out_name, &text_width, NULL);
@@ -797,8 +753,7 @@ int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines)
 	char buffer[MAX_PATH];
 
 	TTF_SizeUTF8(font, line, &line_width, NULL);
-	if (line_width <= max_width)
-	{
+	if (line_width <= max_width) {
 		line_width = GFX_truncateText(font, line, buffer, max_width, 0);
 		strcpy(line, buffer);
 		return line_width;
@@ -808,16 +763,12 @@ int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines)
 	char *tmp = line;
 	int lines = 1;
 	int i = 0;
-	while (!max_lines || lines < max_lines)
-	{
+	while (!max_lines || lines < max_lines) {
 		tmp = strchr(tmp, ' ');
-		if (!tmp)
-		{
-			if (prev)
-			{
+		if (!tmp) {
+			if (prev) {
 				TTF_SizeUTF8(font, line, &line_width, NULL);
-				if (line_width >= max_width)
-				{
+				if (line_width >= max_width) {
 					if (line_width > max_line_width)
 						max_line_width = line_width;
 					prev[0] = '\n';
@@ -830,8 +781,7 @@ int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines)
 
 		TTF_SizeUTF8(font, line, &line_width, NULL);
 
-		if (line_width >= max_width)
-		{ // wrap
+		if (line_width >= max_width) { // wrap
 			if (line_width > max_line_width)
 				max_line_width = line_width;
 			tmp[0] = ' ';
@@ -840,9 +790,7 @@ int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines)
 			prev += 1;
 			line = prev;
 			lines += 1;
-		}
-		else
-		{ // continue
+		} else { // continue
 			tmp[0] = ' ';
 			prev = tmp;
 			tmp += 1;
@@ -862,8 +810,7 @@ int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines)
 
 // scale_blend (and supporting logic) from picoarch
 
-struct blend_args
-{
+struct blend_args {
 	int w_ratio_in;
 	int w_ratio_out;
 	uint16_t w_bp[2];
@@ -904,32 +851,30 @@ static inline uint32x4_t average32_neon(uint32x4_t a, uint32x4_t b)
 static inline uint32_t average16(uint32_t c1, uint32_t c2)
 {
 	uint32_t ret, lowbits = 0x0821;
-	asm volatile(
-		"eor %0, %2, %3\n\t"
-		"and %0, %0, %1\n\t"
-		"add %0, %3, %0\n\t"
-		"add %0, %0, %2\n\t"
-		"lsr %0, %0, #1\n\t"
-		: "=&r"(ret)
-		: "r"(lowbits), "r"(c1), "r"(c2));
+	asm volatile("eor %0, %2, %3\n\t"
+				 "and %0, %0, %1\n\t"
+				 "add %0, %3, %0\n\t"
+				 "add %0, %0, %2\n\t"
+				 "lsr %0, %0, #1\n\t"
+				 : "=&r"(ret)
+				 : "r"(lowbits), "r"(c1), "r"(c2));
 	return ret;
 }
 
 static inline uint32_t average32(uint32_t c1, uint32_t c2)
 {
 	uint32_t ret, lowbits = 0x08210821;
-	asm volatile(
-		"eor %0, %3, %1\n\t"
-		"and %0, %0, %2\n\t"
-		"adds %0, %1, %0\n\t"
-		"and %1, %1, #0\n\t"
-		"movcs %1, #0x80000000\n\t"
-		"adds %0, %0, %3\n\t"
-		"rrx %0, %0\n\t"
-		"orr %0, %0, %1\n\t"
-		: "=&r"(ret), "+r"(c2)
-		: "r"(lowbits), "r"(c1)
-		: "cc");
+	asm volatile("eor %0, %3, %1\n\t"
+				 "and %0, %0, %2\n\t"
+				 "adds %0, %1, %0\n\t"
+				 "and %1, %1, #0\n\t"
+				 "movcs %1, #0x80000000\n\t"
+				 "adds %0, %0, %3\n\t"
+				 "rrx %0, %0\n\t"
+				 "orr %0, %0, %1\n\t"
+				 : "=&r"(ret), "+r"(c2)
+				 : "r"(lowbits), "r"(c1)
+				 : "cc");
 	return ret;
 }
 
@@ -939,30 +884,28 @@ static inline uint32_t average32(uint32_t c1, uint32_t c2)
 static inline uint32_t average16(uint32_t c1, uint32_t c2)
 {
 	uint32_t result;
-	asm volatile(
-		"and w2, %w0, %w1\n\t"
-		"eor w3, %w0, %w1\n\t"
-		"lsr w3, w3, #1\n\t"
-		"add %w2, w2, w3\n\t"
-		"mov %w0, w2\n\t"
-		: "+r"(c1)
-		: "r"(c2)
-		: "w2", "w3");
+	asm volatile("and w2, %w0, %w1\n\t"
+				 "eor w3, %w0, %w1\n\t"
+				 "lsr w3, w3, #1\n\t"
+				 "add %w2, w2, w3\n\t"
+				 "mov %w0, w2\n\t"
+				 : "+r"(c1)
+				 : "r"(c2)
+				 : "w2", "w3");
 	return c1;
 }
 
 static inline uint32_t average32(uint32_t c1, uint32_t c2)
 {
 	uint32_t result;
-	asm volatile(
-		"and w2, %w0, %w1\n\t"
-		"eor w3, %w0, %w1\n\t"
-		"lsr w3, w3, #1\n\t"
-		"add w2, w2, w3\n\t"
-		"mov %w0, w2\n\t"
-		: "+r"(c1)
-		: "r"(c2)
-		: "w2", "w3");
+	asm volatile("and w2, %w0, %w1\n\t"
+				 "eor w3, %w0, %w1\n\t"
+				 "lsr w3, w3, #1\n\t"
+				 "add w2, w2, w3\n\t"
+				 "mov %w0, w2\n\t"
+				 : "+r"(c1)
+				 : "r"(c2)
+				 : "w2", "w3");
 	return c1;
 }
 
@@ -986,7 +929,8 @@ static inline int gcd(int a, int b)
 	return b ? gcd(b, a % b) : a;
 }
 
-static void scaleAA(void *__restrict src, void *__restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_w, uint32_t dst_h, uint32_t dst_p)
+static void scaleAA(void *__restrict src, void *__restrict dst, uint32_t w, uint32_t h, uint32_t pitch, uint32_t dst_w,
+					uint32_t dst_h, uint32_t dst_p)
 {
 	int dy = 0;
 	int lines = h;
@@ -999,10 +943,8 @@ static void scaleAA(void *__restrict src, void *__restrict dst, uint32_t w, uint
 	int rat_dst_h = blend_args.h_ratio_out;
 	uint16_t *bh = blend_args.h_bp;
 
-	while (lines--)
-	{
-		while (dy < rat_dst_h)
-		{
+	while (lines--) {
+		while (dy < rat_dst_h) {
 			uint16_t *dst16 = (uint16_t *)dst;
 			uint16_t *pblend = (uint16_t *)blend_args.blend_line;
 			int col = w;
@@ -1012,42 +954,31 @@ static void scaleAA(void *__restrict src, void *__restrict dst, uint32_t w, uint
 			if (!lines)
 				pnext -= (pitch / sizeof(uint16_t));
 
-			if (dy > rat_dst_h - bh[0])
-			{
+			if (dy > rat_dst_h - bh[0]) {
 				pblend = pnext;
-			}
-			else if (dy <= bh[0])
-			{
+			} else if (dy <= bh[0]) {
 				/* Drops const, won't get touched later though */
 				pblend = (uint16_t *)src;
-			}
-			else
-			{
+			} else {
 				const uint32_t *src32 = (const uint32_t *)src;
 				const uint32_t *pnext32 = (const uint32_t *)pnext;
 				uint32_t *pblend32 = (uint32_t *)pblend;
 				int count = w / 2;
 
-				if (dy <= bh[1])
-				{
+				if (dy <= bh[1]) {
 					const uint32_t *tmp = pnext32;
 					pnext32 = src32;
 					src32 = tmp;
 				}
 
-				if (dy > rat_dst_h - bh[1] || dy <= bh[1])
-				{
-					while (count--)
-					{
+				if (dy > rat_dst_h - bh[1] || dy <= bh[1]) {
+					while (count--) {
 						*pblend32++ = AVERAGE32_1_3(*src32, *pnext32);
 						src32++;
 						pnext32++;
 					}
-				}
-				else
-				{
-					while (count--)
-					{
+				} else {
+					while (count--) {
 						*pblend32++ = AVERAGE32(*src32, *pnext32);
 						src32++;
 						pnext32++;
@@ -1055,35 +986,23 @@ static void scaleAA(void *__restrict src, void *__restrict dst, uint32_t w, uint
 				}
 			}
 
-			while (col--)
-			{
+			while (col--) {
 				uint16_t a, b, out;
 
 				a = *pblend;
 				b = *(pblend + 1);
 
-				while (dx < rat_dst_w)
-				{
-					if (a == b)
-					{
+				while (dx < rat_dst_w) {
+					if (a == b) {
 						out = a;
-					}
-					else if (dx > rat_dst_w - bw[0])
-					{ // top quintile, bbbb
+					} else if (dx > rat_dst_w - bw[0]) { // top quintile, bbbb
 						out = b;
-					}
-					else if (dx <= bw[0])
-					{ // last quintile, aaaa
+					} else if (dx <= bw[0]) { // last quintile, aaaa
 						out = a;
-					}
-					else
-					{
-						if (dx > rat_dst_w - bw[1])
-						{ // 2nd quintile, abbb
+					} else {
+						if (dx > rat_dst_w - bw[1]) { // 2nd quintile, abbb
 							a = AVERAGE16_NOCHK(a, b);
-						}
-						else if (dx <= bw[1])
-						{ // 4th quintile, aaab
+						} else if (dx <= bw[1]) { // 4th quintile, aaab
 							b = AVERAGE16_NOCHK(a, b);
 						}
 
@@ -1115,9 +1034,11 @@ scaler_t GFX_getAAScaler(GFX_Renderer *renderer)
 	blend_args.w_ratio_in = renderer->src_w / gcd_w;
 	blend_args.w_ratio_out = renderer->dst_w / gcd_w;
 
-	double blend_denominator = (renderer->src_w > renderer->dst_w) ? 5 : 2.5; // TODO: these values are really only good for the nano...
+	double blend_denominator =
+		(renderer->src_w > renderer->dst_w) ? 5 : 2.5; // TODO: these values are really only good for the nano...
 	// blend_denominator = 5.0; // better for trimui
-	// LOG_info("blend_denominator: %f (%i && %i)\n", blend_denominator, HAS_SKINNY_SCREEN, renderer->dst_w>renderer->src_w);
+	// LOG_info("blend_denominator: %f (%i && %i)\n", blend_denominator, HAS_SKINNY_SCREEN,
+	// renderer->dst_w>renderer->src_w);
 
 	div_w = round(blend_args.w_ratio_out / blend_denominator);
 	blend_args.w_bp[0] = div_w;
@@ -1135,8 +1056,7 @@ scaler_t GFX_getAAScaler(GFX_Renderer *renderer)
 }
 void GFX_freeAAScaler(void)
 {
-	if (blend_args.blend_line != NULL)
-	{
+	if (blend_args.blend_line != NULL) {
 		free(blend_args.blend_line);
 		blend_args.blend_line = NULL;
 	}
@@ -1156,8 +1076,7 @@ SDL_Color /*GFX_*/ uintToColour(uint32_t colour)
 
 SDL_Rect GFX_blitScaled(int scale, SDL_Surface *src, SDL_Surface *dst)
 {
-	switch (scale)
-	{
+	switch (scale) {
 	case GFX_SCALE_FIT:
 		return GFX_blitScaleAspect(src, dst);
 		break;
@@ -1172,8 +1091,7 @@ SDL_Rect GFX_blitScaled(int scale, SDL_Surface *src, SDL_Surface *dst)
 
 SDL_Rect GFX_blitStretch(SDL_Surface *src, SDL_Surface *dst)
 {
-	if (!src || !dst)
-	{
+	if (!src || !dst) {
 		SDL_Rect none = {0, 0};
 		return none;
 	}
@@ -1192,14 +1110,11 @@ static inline SDL_Rect GFX_scaledRectAspect(SDL_Rect src, SDL_Rect dst)
 	float preview_aspect = (float)dst.w / (float)dst.h;
 
 	// Determine scaling factor
-	if (image_aspect > preview_aspect)
-	{
+	if (image_aspect > preview_aspect) {
 		// Image is wider than the preview area
 		scaled_rect.w = dst.w;
 		scaled_rect.h = (int)(dst.w / image_aspect);
-	}
-	else
-	{
+	} else {
 		// Image is taller than or equal to the preview area
 		scaled_rect.h = dst.h;
 		scaled_rect.w = (int)(dst.h * image_aspect);
@@ -1214,8 +1129,7 @@ static inline SDL_Rect GFX_scaledRectAspect(SDL_Rect src, SDL_Rect dst)
 
 SDL_Rect GFX_blitScaleAspect(SDL_Surface *src, SDL_Surface *dst)
 {
-	if (!src || !dst)
-	{
+	if (!src || !dst) {
 		SDL_Rect none = {0, 0};
 		return none;
 	}
@@ -1237,13 +1151,10 @@ static inline SDL_Rect GFX_scaledRectAspectFill(SDL_Rect src, SDL_Rect dst)
 	float preview_aspect = (float)dst.w / (float)dst.h;
 
 	// Determine scaling factor
-	if (preview_aspect > image_aspect)
-	{
+	if (preview_aspect > image_aspect) {
 		scaled_rect.w = src.w;
 		scaled_rect.h = (int)(src.w / preview_aspect + 0.5f);
-	}
-	else
-	{
+	} else {
 		scaled_rect.w = (int)(src.h * preview_aspect + 0.5f);
 		scaled_rect.h = src.h;
 	}
@@ -1260,8 +1171,7 @@ static inline SDL_Rect GFX_scaledRectAspectFill(SDL_Rect src, SDL_Rect dst)
 
 SDL_Rect GFX_blitScaleToFill(SDL_Surface *src, SDL_Surface *dst)
 {
-	if (!src || !dst)
-	{
+	if (!src || !dst) {
 		SDL_Rect none = {0, 0};
 		return none;
 	}
@@ -1285,8 +1195,7 @@ void GFX_ApplyRoundedCorners16(SDL_Surface *surface, SDL_Rect *rect, int radius)
 	if (rect)
 		target = *rect;
 
-	if (fmt->format != SDL_PIXELFORMAT_RGBA8888)
-	{
+	if (fmt->format != SDL_PIXELFORMAT_RGBA8888) {
 		SDL_Log("Unsupported pixel format: %s", SDL_GetPixelFormatName(fmt->format));
 		return;
 	}
@@ -1298,16 +1207,11 @@ void GFX_ApplyRoundedCorners16(SDL_Surface *surface, SDL_Rect *rect, int radius)
 	const int xEnd = target.x + target.w;
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
-	for (int y = yBeg; y < yEnd; ++y)
-	{
-		for (int x = xBeg; x < xEnd; ++x)
-		{
-			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1)
-																					: 0;
-			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1)
-																					: 0;
-			if (dx * dx + dy * dy > radius * radius)
-			{
+	for (int y = yBeg; y < yEnd; ++y) {
+		for (int x = xBeg; x < xEnd; ++x) {
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
+			if (dx * dx + dy * dy > radius * radius) {
 				pixels[y * (surface->pitch / 2) + x] = transparent_black; // Set to black (0)
 			}
 		}
@@ -1331,16 +1235,11 @@ void GFX_ApplyRoundedCorners(SDL_Surface *surface, SDL_Rect *rect, int radius)
 	const int xEnd = target.x + target.w;
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
-	for (int y = yBeg; y < yEnd; ++y)
-	{
-		for (int x = xBeg; x < xEnd; ++x)
-		{
-			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1)
-																					: 0;
-			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1)
-																					: 0;
-			if (dx * dx + dy * dy > radius * radius)
-			{
+	for (int y = yBeg; y < yEnd; ++y) {
+		for (int x = xBeg; x < xEnd; ++x) {
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
+			if (dx * dx + dy * dy > radius * radius) {
 				pixels[y * target.w + x] = transparent_black; // Set to fully transparent black
 			}
 		}
@@ -1365,16 +1264,11 @@ void GFX_ApplyRoundedCorners_RGBA4444(SDL_Surface *surface, SDL_Rect *rect, int
 	const int xEnd = target.x + target.w;
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
-	for (int y = yBeg; y < yEnd; ++y)
-	{
-		for (int x = xBeg; x < xEnd; ++x)
-		{
-			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1)
-																					: 0;
-			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1)
-																					: 0;
-			if (dx * dx + dy * dy > radius * radius)
-			{
+	for (int y = yBeg; y < yEnd; ++y) {
+		for (int x = xBeg; x < xEnd; ++x) {
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
+			if (dx * dx + dy * dy > radius * radius) {
 				pixels[y * pitch + x] = transparent_black;
 			}
 		}
@@ -1400,18 +1294,13 @@ void GFX_ApplyRoundedCorners_RGBA8888(SDL_Surface *surface, SDL_Rect *rect, int
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
 
-	for (int y = yBeg; y < yEnd; ++y)
-	{
-		for (int x = xBeg; x < xEnd; ++x)
-		{
-			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1)
-																					: 0;
-			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1)
-																					: 0;
+	for (int y = yBeg; y < yEnd; ++y) {
+		for (int x = xBeg; x < xEnd; ++x) {
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
 
 			// Check if the pixel is outside the rounded corner radius
-			if (dx * dx + dy * dy > radius * radius)
-			{
+			if (dx * dx + dy * dy > radius * radius) {
 				pixels[y * pitch + x] = transparent_black;
 			}
 		}
@@ -1427,13 +1316,11 @@ void BlitRGBA4444toRGB565(SDL_Surface *src, SDL_Surface *dest, SDL_Rect *dest_re
 	int width = src->w;
 	int height = src->h;
 
-	for (int y = 0; y < height; ++y)
-	{
+	for (int y = 0; y < height; ++y) {
 		Uint16 *srcRow = (Uint16 *)(srcPixels + y * src->pitch);
 		Uint16 *destRow = (Uint16 *)(destPixels + (y + dest_rect->y) * dest->pitch);
 
-		for (int x = 0; x < width; ++x)
-		{
+		for (int x = 0; x < width; ++x) {
 			Uint16 srcPixel = srcRow[x];
 
 			Uint8 r = (srcPixel >> 12) & 0xF;
@@ -1448,19 +1335,15 @@ void BlitRGBA4444toRGB565(SDL_Surface *src, SDL_Surface *dest, SDL_Rect *dest_re
 			int destX = x + dest_rect->x;
 			int destY = y + dest_rect->y;
 
-			if (destX >= 0 && destX < dest->w && destY >= 0 && destY < dest->h)
-			{
+			if (destX >= 0 && destX < dest->w && destY >= 0 && destY < dest->h) {
 				Uint16 *destPixelPtr = &destRow[destX];
 
 				if (a == 0)
 					continue;
 
-				if (a == 15)
-				{
+				if (a == 15) {
 					*destPixelPtr = (r << 11) | (g << 5) | b;
-				}
-				else
-				{
+				} else {
 					Uint16 existingPixel = *destPixelPtr;
 
 					Uint8 destR = (existingPixel >> 11) & 0x1F;
@@ -1478,11 +1361,11 @@ void BlitRGBA4444toRGB565(SDL_Surface *src, SDL_Surface *dest, SDL_Rect *dest_re
 	}
 }
 
-void GFX_blitSurfaceColor(SDL_Surface *src, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t asset_color)
+void GFX_blitSurfaceColor(SDL_Surface *src, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect,
+						  uint32_t asset_color)
 {
 	// This could be a RAII
-	if (asset_color != RGB_WHITE)
-	{
+	if (asset_color != RGB_WHITE) {
 		// TODO: Is there a neat way to get the opposite effect of SDL_MapRGB?
 		// This is kinda ugly and not very generic.
 		if (asset_color == THEME_COLOR1)
@@ -1502,22 +1385,16 @@ void GFX_blitSurfaceColor(SDL_Surface *src, SDL_Rect *src_rect, SDL_Surface *dst
 
 		SDL_Color restore;
 		SDL_GetSurfaceColorMod(src, &restore.r, &restore.g, &restore.b);
-		SDL_SetSurfaceColorMod(src,
-							   (asset_color >> 16) & 0xFF,
-							   (asset_color >> 8) & 0xFF,
-							   asset_color & 0xFF);
+		SDL_SetSurfaceColorMod(src, (asset_color >> 16) & 0xFF, (asset_color >> 8) & 0xFF, asset_color & 0xFF);
 		SDL_BlitSurface(src, src_rect, dst, dst_rect);
 		SDL_SetSurfaceColorMod(src, restore.r, restore.g, restore.b);
-	}
-	else
-	{
+	} else {
 		SDL_BlitSurface(src, src_rect, dst, dst_rect);
 	}
 }
 
 void GFX_blitAssetColor(int asset, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t asset_color)
 {
-
 	SDL_Rect *rect = &asset_rects[asset];
 	SDL_Rect adj_rect = {
 		.x = rect->x,
@@ -1525,8 +1402,7 @@ void GFX_blitAssetColor(int asset, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rec
 		.w = rect->w,
 		.h = rect->h,
 	};
-	if (src_rect)
-	{
+	if (src_rect) {
 		adj_rect.x += src_rect->x;
 		adj_rect.y += src_rect->y;
 		adj_rect.w = src_rect->w;
@@ -1556,8 +1432,7 @@ void GFX_blitPillColor(int asset, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t
 
 	GFX_blitAssetColor(asset, &(SDL_Rect){0, 0, r, h}, dst, &(SDL_Rect){x, y}, asset_color);
 	x += r;
-	if (w > 0)
-	{
+	if (w > 0) {
 		// SDL_FillRect(dst, &(SDL_Rect){x,y,w,h}, UintMult(fill_color, asset_color));
 		SDL_FillRect(dst, &(SDL_Rect){x, y, w, h}, asset_color);
 		x += w;
@@ -1610,8 +1485,7 @@ void GFX_blitBattery(SDL_Surface *dst, SDL_Rect *dst_rect)
 {
 	int x = 0;
 	int y = 0;
-	if (dst_rect)
-	{
+	if (dst_rect) {
 		x = dst_rect->x;
 		y = dst_rect->y;
 	}
@@ -1625,12 +1499,9 @@ int GFX_getButtonWidth(char *hint, char *button)
 
 	int special_case = !strcmp(button, BRIGHTNESS_BUTTON_LABEL); // TODO: oof
 
-	if (strlen(button) == 1)
-	{
+	if (strlen(button) == 1) {
 		button_width += SCALE1(BUTTON_SIZE);
-	}
-	else
-	{
+	} else {
 		button_width += SCALE1(BUTTON_SIZE) / 2;
 		TTF_SizeUTF8(special_case ? font.large : font.tiny, button, &width, NULL);
 		button_width += width;
@@ -1649,24 +1520,26 @@ void GFX_blitButton(char *hint, char *button, SDL_Surface *dst, SDL_Rect *dst_re
 	int special_case = !strcmp(button, BRIGHTNESS_BUTTON_LABEL); // TODO: oof
 
 	// button
-	if (strlen(button) == 1)
-	{
+	if (strlen(button) == 1) {
 		GFX_blitAssetColor(ASSET_BUTTON, NULL, dst, dst_rect, THEME_COLOR1);
 
 		// label
 		text = TTF_RenderUTF8_Blended(font.medium, button, ALT_BUTTON_TEXT_COLOR);
-		SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){dst_rect->x + (SCALE1(BUTTON_SIZE) - text->w) / 2, dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2});
+		SDL_BlitSurface(text, NULL, dst,
+						&(SDL_Rect){dst_rect->x + (SCALE1(BUTTON_SIZE) - text->w) / 2,
+									dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2});
 		ox += SCALE1(BUTTON_SIZE);
 		SDL_FreeSurface(text);
-	}
-	else
-	{
+	} else {
 		text = TTF_RenderUTF8_Blended(special_case ? font.large : font.tiny, button, ALT_BUTTON_TEXT_COLOR);
-		GFX_blitPillDark(ASSET_BUTTON, dst, &(SDL_Rect){dst_rect->x, dst_rect->y, SCALE1(BUTTON_SIZE) / 2 + text->w, SCALE1(BUTTON_SIZE)});
+		GFX_blitPillDark(ASSET_BUTTON, dst,
+						 &(SDL_Rect){dst_rect->x, dst_rect->y, SCALE1(BUTTON_SIZE) / 2 + text->w, SCALE1(BUTTON_SIZE)});
 		ox += SCALE1(BUTTON_SIZE) / 4;
 
 		int oy = special_case ? SCALE1(-2) : 0;
-		SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){ox + dst_rect->x, oy + dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2, text->w, text->h});
+		SDL_BlitSurface(
+			text, NULL, dst,
+			&(SDL_Rect){ox + dst_rect->x, oy + dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2, text->w, text->h});
 		ox += text->w;
 		ox += SCALE1(BUTTON_SIZE) / 4;
 		SDL_FreeSurface(text);
@@ -1677,7 +1550,8 @@ void GFX_blitButton(char *hint, char *button, SDL_Surface *dst, SDL_Rect *dst_re
 	// hint text
 	SDL_Color text_color = uintToColour(THEME_COLOR6_255);
 	text = TTF_RenderUTF8_Blended(font.small, hint, text_color);
-	SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){ox + dst_rect->x, dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2, text->w, text->h});
+	SDL_BlitSurface(text, NULL, dst,
+					&(SDL_Rect){ox + dst_rect->x, dst_rect->y + (SCALE1(BUTTON_SIZE) - text->h) / 2, text->w, text->h});
 	SDL_FreeSurface(text);
 }
 void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_rect)
@@ -1694,8 +1568,7 @@ void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_
 
 	char *tmp;
 	rows[row_count++] = msg;
-	while ((tmp = strchr(rows[row_count - 1], '\n')) != NULL)
-	{
+	while ((tmp = strchr(rows[row_count - 1], '\n')) != NULL) {
 		if (row_count + 1 >= TEXT_BOX_MAX_ROWS)
 			return; // TODO: bail
 		rows[row_count++] = tmp + 1;
@@ -1707,24 +1580,19 @@ void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_
 	y += (dst_rect->h - rendered_height) / 2;
 
 	char line[256];
-	for (int i = 0; i < row_count; i++)
-	{
+	for (int i = 0; i < row_count; i++) {
 		int len;
-		if (i + 1 < row_count)
-		{
+		if (i + 1 < row_count) {
 			len = rows[i + 1] - rows[i] - 1;
 			if (len)
 				strncpy(line, rows[i], len);
 			line[len] = '\0';
-		}
-		else
-		{
+		} else {
 			len = strlen(rows[i]);
 			strcpy(line, rows[i]);
 		}
 
-		if (len)
-		{
+		if (len) {
 			text = TTF_RenderUTF8_Blended_Wrapped(font, line, COLOR_WHITE, dst_rect->w);
 			int x = dst_rect->x;
 			x += (dst_rect->w - text->w) / 2;
@@ -1739,35 +1607,27 @@ void GFX_blitBatteryAtPosition(SDL_Surface *dst, int x, int y)
 {
 	SDL_Rect battery_rect = asset_rects[ASSET_BATTERY];
 
-	if (pwr.is_charging)
-	{
+	if (pwr.is_charging) {
 		GFX_blitAssetColor(ASSET_BATTERY, NULL, dst, &(SDL_Rect){x, y}, THEME_COLOR6);
 		GFX_blitAssetColor(ASSET_BATTERY_BOLT, NULL, dst, &(SDL_Rect){x + SCALE1(3), y + SCALE1(2)}, THEME_COLOR6);
-	}
-	else
-	{
+	} else {
 		int percent = pwr.charge;
-		GFX_blitAssetColor(percent <= 10 ? ASSET_BATTERY_LOW : ASSET_BATTERY, NULL, dst, &(SDL_Rect){x, y}, THEME_COLOR6);
+		GFX_blitAssetColor(percent <= 10 ? ASSET_BATTERY_LOW : ASSET_BATTERY, NULL, dst, &(SDL_Rect){x, y},
+						   THEME_COLOR6);
 
-		if (CFG_getShowBatteryPercent())
-		{
+		if (CFG_getShowBatteryPercent()) {
 			char percentage[16];
 			sprintf(percentage, "%i", pwr.charge);
 			SDL_Surface *text = TTF_RenderUTF8_Blended(font.micro, percentage, uintToColour(THEME_COLOR6_255));
-			SDL_Rect target = {
-				x + (battery_rect.w - text->w) / 2 + 1,
-				y + (battery_rect.h - text->h) / 2 - 1};
+			SDL_Rect target = {x + (battery_rect.w - text->w) / 2 + 1, y + (battery_rect.h - text->h) / 2 - 1};
 			SDL_BlitSurface(text, NULL, dst, &target);
 			SDL_FreeSurface(text);
-		}
-		else
-		{
+		} else {
 			SDL_Rect fill_rect = asset_rects[ASSET_BATTERY_FILL];
 			SDL_Rect clip = fill_rect;
 			clip.w *= percent;
 			clip.w /= 100;
-			if (clip.w > 0)
-			{
+			if (clip.w > 0) {
 				clip.x = fill_rect.w - clip.w;
 				clip.y = 0;
 				GFX_blitAssetColor(percent <= 20 ? ASSET_BATTERY_FILL_LOW : ASSET_BATTERY_FILL, &clip, dst,
@@ -1787,34 +1647,28 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 	int setting_min;
 	int setting_max;
 
-	if (show_setting && !GetHDMI())
-	{
+	if (show_setting && !GetHDMI()) {
 		int asset;
 		ow = SCALE1(PILL_SIZE + SETTINGS_WIDTH + 10 + 4);
 		ox = dst->w - SCALE1(PADDING) - ow;
 		oy = SCALE1(PADDING);
 		GFX_blitPillColor(ASSET_WHITE_PILL, dst, &(SDL_Rect){ox, oy, ow, SCALE1(PILL_SIZE)}, THEME_COLOR2, RGB_WHITE);
 
-		if (show_setting == 1)
-		{
+		if (show_setting == 1) {
 			setting_value = GetBrightness();
 			setting_min = BRIGHTNESS_MIN;
 			setting_max = BRIGHTNESS_MAX;
 			asset = ASSET_BRIGHTNESS;
-		}
-		else if (show_setting == 3)
-		{
+		} else if (show_setting == 3) {
 			setting_value = GetColortemp();
 			setting_min = COLORTEMP_MIN;
 			setting_max = COLORTEMP_MAX;
 			asset = ASSET_COLORTEMP;
-		}
-		else
-		{
+		} else {
 			setting_value = GetVolume();
 			setting_min = VOLUME_MIN;
 			setting_max = VOLUME_MAX;
-			if(GetAudioSink() == AUDIO_SINK_BLUETOOTH)
+			if (GetAudioSink() == AUDIO_SINK_BLUETOOTH)
 				asset = (setting_value > 0 ? ASSET_BLUETOOTH : ASSET_BLUETOOTH_OFF);
 			else
 				asset = (setting_value > 0 ? ASSET_VOLUME : ASSET_VOLUME_MUTE);
@@ -1828,17 +1682,15 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 
 		ox += SCALE1(PILL_SIZE);
 		oy += SCALE1((PILL_SIZE - SETTINGS_SIZE) / 2);
-		GFX_blitPillColor(gfx.mode == MODE_MAIN ? ASSET_BAR_BG : ASSET_BAR_BG_MENU, dst, &(SDL_Rect){ox, oy, SCALE1(SETTINGS_WIDTH), SCALE1(SETTINGS_SIZE)}, 
-			THEME_COLOR3, RGB_WHITE);
+		GFX_blitPillColor(gfx.mode == MODE_MAIN ? ASSET_BAR_BG : ASSET_BAR_BG_MENU, dst,
+						  &(SDL_Rect){ox, oy, SCALE1(SETTINGS_WIDTH), SCALE1(SETTINGS_SIZE)}, THEME_COLOR3, RGB_WHITE);
 
 		float percent = ((float)(setting_value - setting_min) / (setting_max - setting_min));
-		if (show_setting == 1 || show_setting == 3 || setting_value > 0)
-		{
-			GFX_blitPillDark(ASSET_BAR, dst, &(SDL_Rect){ox, oy, SCALE1(SETTINGS_WIDTH) * percent, SCALE1(SETTINGS_SIZE)});
+		if (show_setting == 1 || show_setting == 3 || setting_value > 0) {
+			GFX_blitPillDark(ASSET_BAR, dst,
+							 &(SDL_Rect){ox, oy, SCALE1(SETTINGS_WIDTH) * percent, SCALE1(SETTINGS_SIZE)});
 		}
-	}
-	else
-	{
+	} else {
 		ConnectionStrength strength = PLAT_connectionStrength();
 		int show_wifi = strength > SIGNAL_STRENGTH_OFF;
 		// no need to handle in PLAT_updateNetworkStatus,
@@ -1847,31 +1699,27 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 		bool show_clock = CFG_getShowClock();
 		SDL_Rect battery_rect = asset_rects[ASSET_BATTERY];
 
-		if (!show_bt && !show_wifi && !show_clock)
-		{
+		if (!show_bt && !show_wifi && !show_clock) {
 			ow = SCALE1(PILL_SIZE);
 			ox = dst->w - SCALE1(PADDING) - ow;
 			oy = SCALE1(PADDING);
 
-			GFX_blitPillColor(ASSET_WHITE_PILL, dst, &(SDL_Rect){ox, oy, ow, SCALE1(PILL_SIZE)}, THEME_COLOR2, RGB_WHITE);
+			GFX_blitPillColor(ASSET_WHITE_PILL, dst, &(SDL_Rect){ox, oy, ow, SCALE1(PILL_SIZE)}, THEME_COLOR2,
+							  RGB_WHITE);
 
 			int battery_x = ox + (SCALE1(PILL_SIZE) - (battery_rect.w + FIXED_SCALE)) / 2;
 			int battery_y = oy + (SCALE1(PILL_SIZE) - battery_rect.h) / 2;
 
 			GFX_blitBatteryAtPosition(dst, battery_x, battery_y);
-		}
-		else
-		{
+		} else {
 			ow = SCALE1(BUTTON_MARGIN);
 
-			if (show_bt)
-			{
+			if (show_bt) {
 				SDL_Rect bt_rect = asset_rects[ASSET_BLUETOOTH];
 				ow += bt_rect.w + SCALE1(BUTTON_MARGIN);
 			}
 
-			if (show_wifi)
-			{
+			if (show_wifi) {
 				SDL_Rect wifi_rect = asset_rects[ASSET_WIFI];
 				ow += wifi_rect.w + SCALE1(BUTTON_MARGIN);
 			}
@@ -1879,8 +1727,7 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 			ow += battery_rect.w + SCALE1(BUTTON_MARGIN);
 
 			SDL_Surface *clock = NULL;
-			if (show_clock)
-			{
+			if (show_clock) {
 				int clock_width = 0;
 				char timeString[12];
 				time_t t = time(NULL);
@@ -1897,12 +1744,12 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 
 			ox = dst->w - SCALE1(PADDING) - ow;
 			oy = SCALE1(PADDING);
-			GFX_blitPillColor(ASSET_WHITE_PILL, dst, &(SDL_Rect){ox, oy, ow, SCALE1(PILL_SIZE)}, THEME_COLOR2, RGB_WHITE);
+			GFX_blitPillColor(ASSET_WHITE_PILL, dst, &(SDL_Rect){ox, oy, ow, SCALE1(PILL_SIZE)}, THEME_COLOR2,
+							  RGB_WHITE);
 
 			ox += SCALE1(BUTTON_MARGIN);
 
-			if (show_bt)
-			{
+			if (show_bt) {
 				int asset = ASSET_BLUETOOTH;
 				SDL_Rect bt_rect = asset_rects[asset];
 				int x = ox;
@@ -1912,12 +1759,12 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 				ox += bt_rect.w + SCALE1(BUTTON_MARGIN);
 			}
 
-			if (show_wifi)
-			{
-				int asset =
-					strength == SIGNAL_STRENGTH_HIGH ? ASSET_WIFI : strength == SIGNAL_STRENGTH_MED ? ASSET_WIFI_MED
-																: strength == SIGNAL_STRENGTH_LOW	? ASSET_WIFI_LOW
-																									: ASSET_WIFI_OFF; // this should use ASSET_WIFI and be greyed out
+			if (show_wifi) {
+				int asset = strength == SIGNAL_STRENGTH_HIGH  ? ASSET_WIFI
+							: strength == SIGNAL_STRENGTH_MED ? ASSET_WIFI_MED
+							: strength == SIGNAL_STRENGTH_LOW
+								? ASSET_WIFI_LOW
+								: ASSET_WIFI_OFF; // this should use ASSET_WIFI and be greyed out
 				SDL_Rect wifi_rect = asset_rects[asset];
 				int x = ox;
 				int y = oy + (SCALE1(PILL_SIZE) - wifi_rect.h) / 2;
@@ -1932,8 +1779,7 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 			GFX_blitBatteryAtPosition(dst, battery_x, battery_y);
 			ox += battery_rect.w + SCALE1(BUTTON_MARGIN);
 
-			if (show_clock && clock)
-			{
+			if (show_clock && clock) {
 				int x = ox;
 				int y = oy + (SCALE1(PILL_SIZE) - clock->h) / 2;
 				SDL_BlitSurface(clock, NULL, dst, &(SDL_Rect){x, y});
@@ -1946,7 +1792,6 @@ int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting)
 }
 void GFX_blitHardwareHints(SDL_Surface *dst, int show_setting)
 {
-
 	if (show_setting == 1)
 		GFX_blitButtonGroup((char *[]){BRIGHTNESS_BUTTON_LABEL, "BRIGHTNESS", NULL}, 0, dst, 0);
 	else if (show_setting == 3)
@@ -1963,8 +1808,7 @@ int GFX_blitButtonGroup(char **pairs, int primary, SDL_Surface *dst, int align_r
 	char *hint;
 	char *button;
 
-	struct Hint
-	{
+	struct Hint {
 		char *hint;
 		char *button;
 		int ow;
@@ -1975,8 +1819,7 @@ int GFX_blitButtonGroup(char **pairs, int primary, SDL_Surface *dst, int align_r
 	ox = align_right ? dst->w - SCALE1(PADDING) : SCALE1(PADDING);
 	oy = dst->h - SCALE1(PADDING + PILL_SIZE);
 
-	for (int i = 0; i < 2; i++)
-	{
+	for (int i = 0; i < 2; i++) {
 		if (!pairs[i * 2])
 			break;
 		if (HAS_SKINNY_SCREEN && i != primary)
@@ -1999,8 +1842,7 @@ int GFX_blitButtonGroup(char **pairs, int primary, SDL_Surface *dst, int align_r
 
 	ox += SCALE1(BUTTON_MARGIN);
 	oy += SCALE1(BUTTON_MARGIN);
-	for (int i = 0; i < h; i++)
-	{
+	for (int i = 0; i < h; i++) {
 		GFX_blitButton(hints[i].hint, hints[i].button, dst, &(SDL_Rect){ox, oy});
 		ox += hints[i].ow + SCALE1(BUTTON_MARGIN);
 	}
@@ -2015,8 +1857,7 @@ void GFX_sizeText(TTF_Font *font, const char *str, int leading, int *w, int *h)
 
 	const char *tmp;
 	lines[count++] = str;
-	while ((tmp = strchr(lines[count - 1], '\n')) != NULL)
-	{
+	while ((tmp = strchr(lines[count - 1], '\n')) != NULL) {
 		if (count + 1 > MAX_TEXT_LINES)
 			break; // TODO: bail?
 		lines[count++] = tmp + 1;
@@ -2025,24 +1866,19 @@ void GFX_sizeText(TTF_Font *font, const char *str, int leading, int *w, int *h)
 
 	int mw = 0;
 	char line[256];
-	for (int i = 0; i < count; i++)
-	{
+	for (int i = 0; i < count; i++) {
 		int len;
-		if (i + 1 < count)
-		{
+		if (i + 1 < count) {
 			len = lines[i + 1] - lines[i] - 1;
 			if (len)
 				strncpy(line, lines[i], len);
 			line[len] = '\0';
-		}
-		else
-		{
+		} else {
 			len = strlen(lines[i]);
 			strcpy(line, lines[i]);
 		}
 
-		if (len)
-		{
+		if (len) {
 			int lw;
 			TTF_SizeUTF8(font, line, &lw, NULL);
 			if (lw > mw)
@@ -2061,8 +1897,7 @@ void GFX_blitText(TTF_Font *font, const char *str, int leading, SDL_Color color,
 
 	const char *tmp;
 	lines[count++] = str;
-	while ((tmp = strchr(lines[count - 1], '\n')) != NULL)
-	{
+	while ((tmp = strchr(lines[count - 1], '\n')) != NULL) {
 		if (count + 1 > MAX_TEXT_LINES)
 			break; // TODO: bail?
 		lines[count++] = tmp + 1;
@@ -2072,24 +1907,19 @@ void GFX_blitText(TTF_Font *font, const char *str, int leading, SDL_Color color,
 
 	SDL_Surface *text;
 	char line[256];
-	for (int i = 0; i < count; i++)
-	{
+	for (int i = 0; i < count; i++) {
 		int len;
-		if (i + 1 < count)
-		{
+		if (i + 1 < count) {
 			len = lines[i + 1] - lines[i] - 1;
 			if (len)
 				strncpy(line, lines[i], len);
 			line[len] = '\0';
-		}
-		else
-		{
+		} else {
 			len = strlen(lines[i]);
 			strcpy(line, lines[i]);
 		}
 
-		if (len)
-		{
+		if (len) {
 			text = TTF_RenderUTF8_Blended(font, line, color);
 			SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){x + ((dst_rect->w - text->w) / 2), y + (i * leading)});
 			SDL_FreeSurface(text);
@@ -2130,8 +1960,7 @@ static void SND_audioCallback(void *userdata, uint8_t *stream, int len)
 	len /= (sizeof(int16_t) * 2);
 
 	pthread_mutex_lock(&audio_mutex);
-	while (snd.frame_out != snd.frame_in && len > 0)
-	{
+	while (snd.frame_out != snd.frame_in && len > 0) {
 		*out++ = snd.buffer[snd.frame_out].left;
 		*out++ = snd.buffer[snd.frame_out].right;
 		snd.frame_out += 1;
@@ -2182,35 +2011,27 @@ void SND_setQuality(int quality)
 	soundQuality = qualityLevels[quality];
 	resetSrcState = 1;
 }
-ResampledFrames resample_audio(const SND_Frame *input_frames,
-							   int input_frame_count, int input_sample_rate,
+ResampledFrames resample_audio(const SND_Frame *input_frames, int input_frame_count, int input_sample_rate,
 							   int output_sample_rate, double ratio)
 {
-
 	int error;
 	static double previous_ratio = 1.0;
 	static SRC_STATE *src_state = NULL;
 
 	double final_ratio = ((double)output_sample_rate / input_sample_rate) * ratio;
 
-	if (!src_state || resetSrcState)
-	{
+	if (!src_state || resetSrcState) {
 		resetSrcState = 0;
 		src_state = src_new(soundQuality, 2, &error);
-		if (src_state == NULL)
-		{
-			fprintf(stderr, "Error initializing SRC state: %s\n",
-					src_strerror(error));
+		if (src_state == NULL) {
+			fprintf(stderr, "Error initializing SRC state: %s\n", src_strerror(error));
 			exit(1);
 		}
 	}
 
-	if (previous_ratio != final_ratio)
-	{
-		if (src_set_ratio(src_state, final_ratio) != 0)
-		{
-			fprintf(stderr, "Error setting resampling ratio: %s\n",
-					src_strerror(src_error(src_state)));
+	if (previous_ratio != final_ratio) {
+		if (src_set_ratio(src_state, final_ratio) != 0) {
+			fprintf(stderr, "Error setting resampling ratio: %s\n", src_strerror(src_error(src_state)));
 			exit(1);
 		}
 		previous_ratio = final_ratio;
@@ -2220,8 +2041,7 @@ ResampledFrames resample_audio(const SND_Frame *input_frames,
 
 	float *input_buffer = (float *)malloc(input_frame_count * 2 * sizeof(float));
 	float *output_buffer = (float *)malloc(max_output_frames * 2 * sizeof(float));
-	if (!input_buffer || !output_buffer)
-	{
+	if (!input_buffer || !output_buffer) {
 		fprintf(stderr, "Error allocating buffers\n");
 		free(input_buffer);
 		free(output_buffer);
@@ -2229,24 +2049,20 @@ ResampledFrames resample_audio(const SND_Frame *input_frames,
 		exit(1);
 	}
 
-	for (int i = 0; i < input_frame_count; i++)
-	{
+	for (int i = 0; i < input_frame_count; i++) {
 		input_buffer[2 * i] = input_frames[i].left / 32768.0f;
 		input_buffer[2 * i + 1] = input_frames[i].right / 32768.0f;
 	}
 
-	SRC_DATA src_data = {
-		.data_in = input_buffer,
-		.data_out = output_buffer,
-		.input_frames = input_frame_count,
-		.output_frames = max_output_frames,
-		.src_ratio = final_ratio,
-		.end_of_input = 0};
-
-	if (src_process(src_state, &src_data) != 0)
-	{
-		fprintf(stderr, "Error resampling: %s\n",
-				src_strerror(src_error(src_state)));
+	SRC_DATA src_data = {.data_in = input_buffer,
+						 .data_out = output_buffer,
+						 .input_frames = input_frame_count,
+						 .output_frames = max_output_frames,
+						 .src_ratio = final_ratio,
+						 .end_of_input = 0};
+
+	if (src_process(src_state, &src_data) != 0) {
+		fprintf(stderr, "Error resampling: %s\n", src_strerror(src_error(src_state)));
 		free(input_buffer);
 		free(output_buffer);
 		exit(1);
@@ -2255,16 +2071,14 @@ ResampledFrames resample_audio(const SND_Frame *input_frames,
 	int output_frame_count = src_data.output_frames_gen;
 
 	SND_Frame *output_frames = (SND_Frame *)malloc(output_frame_count * sizeof(SND_Frame));
-	if (!output_frames)
-	{
+	if (!output_frames) {
 		fprintf(stderr, "Error allocating output frames\n");
 		free(input_buffer);
 		free(output_buffer);
 		exit(1);
 	}
 
-	for (int i = 0; i < output_frame_count; i++)
-	{
+	for (int i = 0; i < output_frame_count; i++) {
 		float left = output_buffer[2 * i];
 		float right = output_buffer[2 * i + 1];
 
@@ -2295,13 +2109,11 @@ int avgbufferfree = 0;
 
 float calculateBufferAdjustment(float remaining_space, float targetbuffer_over, float targetbuffer_under, int batchsize)
 {
-
 	// this is just to show average remaining space in debug window could be removed later
 	remaining_space_history[remaining_space_index] = remaining_space;
 	remaining_space_index = (remaining_space_index + 1) % ROLLING_AVERAGE_WINDOW_SIZE;
 	float avgspace = 0.0f;
-	for (int i = 0; i < ROLLING_AVERAGE_WINDOW_SIZE; ++i)
-	{
+	for (int i = 0; i < ROLLING_AVERAGE_WINDOW_SIZE; ++i) {
 		avgspace += remaining_space_history[i];
 	}
 	avgspace /= ROLLING_AVERAGE_WINDOW_SIZE;
@@ -2312,23 +2124,20 @@ float calculateBufferAdjustment(float remaining_space, float targetbuffer_over,
 	currentbuffertarget = midpoint;
 
 	float normalizedDistance;
-	if (remaining_space < midpoint)
-	{
+	if (remaining_space < midpoint) {
 		normalizedDistance = (midpoint - remaining_space) / (midpoint - targetbuffer_over);
-	}
-	else
-	{
+	} else {
 		normalizedDistance = (remaining_space - midpoint) / (targetbuffer_under - midpoint);
 	}
-	// I make crazy small adjustments, mooore tiny is mooore stable :D But don't come neir the limits cuz imma hit ya with that 0.005 ratio adjustment, pow pow!
-	// I wonder if staying in the middle of 0 to 4000 with 512 samples per batch playing at tiny different speeds each iteration is like the smallest I can get
-	// lets say hovering around 2000 means 2000 samples queue, about 4 frames, so at 17ms(60fps) thats  68ms delay right?
-	// Should have payed attention when my math teacher was talking dammit
-	// Also I chose 3 for pow, but idk if that really the best nr, anyone good in maths looking at my code?
+	// I make crazy small adjustments, mooore tiny is mooore stable :D But don't come neir the limits cuz imma hit ya
+	// with that 0.005 ratio adjustment, pow pow! I wonder if staying in the middle of 0 to 4000 with 512 samples per
+	// batch playing at tiny different speeds each iteration is like the smallest I can get lets say hovering around
+	// 2000 means 2000 samples queue, about 4 frames, so at 17ms(60fps) thats  68ms delay right? Should have payed
+	// attention when my math teacher was talking dammit Also I chose 3 for pow, but idk if that really the best nr,
+	// anyone good in maths looking at my code?
 	float adjustment = 0.001f + (0.01f - 0.001f) * pow(normalizedDistance, 3);
 
-	if (remaining_space < midpoint)
-	{
+	if (remaining_space < midpoint) {
 		adjustment = -adjustment;
 	}
 
@@ -2337,8 +2146,7 @@ float calculateBufferAdjustment(float remaining_space, float targetbuffer_over,
 
 	// Calculate the rolling average
 	float rolling_average = 0.0f;
-	for (int i = 0; i < ROLLING_AVERAGE_WINDOW_SIZE; ++i)
-	{
+	for (int i = 0; i < ROLLING_AVERAGE_WINDOW_SIZE; ++i) {
 		rolling_average += adjustment_history[i];
 	}
 	rolling_average /= ROLLING_AVERAGE_WINDOW_SIZE;
@@ -2360,28 +2168,22 @@ size_t SND_batchSamples(const SND_Frame *frames, size_t frame_count)
 	int total_consumed_frames = 0;
 	double ratio = 1.0;
 
-	if (snd.frame_count <= 0)
-	{
+	if (snd.frame_count <= 0) {
 		snd.frame_count = 4096; // idk some random samples nr this should never hit tho, just to be safe
 	}
 
-	if (snd.frame_in < 0 || snd.frame_in >= snd.frame_count)
-	{
+	if (snd.frame_in < 0 || snd.frame_in >= snd.frame_count) {
 		snd.frame_in = 0;
 	}
 
-	if (snd.frame_out < 0 || snd.frame_out >= snd.frame_count)
-	{
+	if (snd.frame_out < 0 || snd.frame_out >= snd.frame_count) {
 		snd.frame_out = 0;
 	}
 
 	float remaining_space = 0.0f;
-	if (snd.frame_in >= snd.frame_out)
-	{
+	if (snd.frame_in >= snd.frame_out) {
 		remaining_space = snd.frame_count - (snd.frame_in - snd.frame_out);
-	}
-	else
-	{
+	} else {
 		remaining_space = snd.frame_out - snd.frame_in;
 	}
 	currentbufferfree = remaining_space;
@@ -2389,41 +2191,39 @@ size_t SND_batchSamples(const SND_Frame *frames, size_t frame_count)
 	// let audio buffer fill a little first and then unpause audio so no underruns occur
 	if (currentbufferfree < snd.frame_count * 0.6f) {
 		SND_pauseAudio(false);
-	} else if (currentbufferfree > snd.frame_count * 0.99f) { // if for some reason buffer drops below threshold again, pause it (like psx core can stop sending audio in between scenes or after fast forward etc)
+	} else if (currentbufferfree >
+			   snd.frame_count * 0.99f) { // if for some reason buffer drops below threshold again, pause it (like psx
+										  // core can stop sending audio in between scenes or after fast forward etc)
 		SND_pauseAudio(true);
-	} 
+	}
 
 
 	float tempdelay = ((snd.frame_count - remaining_space) / snd.sample_rate_out) * 1000.0f;
 	currentbufferms = tempdelay;
 
 	// do some checks
-	if (current_fps <= 0.0f || !isfinite(current_fps))
-	{
+	if (current_fps <= 0.0f || !isfinite(current_fps)) {
 		current_fps = 0.01f;
 	}
-	if (!isfinite(snd.frame_rate) || snd.frame_rate <= 0.0f)
-	{
+	if (!isfinite(snd.frame_rate) || snd.frame_rate <= 0.0f) {
 		snd.frame_rate = 60.0f;
 	}
 
-	float bufferadjustment = calculateBufferAdjustment(remaining_space, snd.frame_count*0.2, snd.frame_count*0.8, frame_count);
+	float bufferadjustment =
+		calculateBufferAdjustment(remaining_space, snd.frame_count * 0.2, snd.frame_count * 0.8, frame_count);
 
-	if (!isfinite(bufferadjustment))
-	{
+	if (!isfinite(bufferadjustment)) {
 		bufferadjustment = 0.0f;
 	}
 
 	float safe_ratio = snd.frame_rate / current_fps;
-	if (!isfinite(safe_ratio))
-	{
+	if (!isfinite(safe_ratio)) {
 		safe_ratio = 1.0f;
 	}
 
 	ratio = safe_ratio + bufferadjustment;
 
-	if (!isfinite(ratio))
-	{
+	if (!isfinite(ratio)) {
 		ratio = 1.0;
 	}
 
@@ -2435,27 +2235,22 @@ size_t SND_batchSamples(const SND_Frame *frames, size_t frame_count)
 
 	currentratio = (ratio > 0.0) ? ratio : current_fps;
 
-	while (framecount > 0)
-	{
+	while (framecount > 0) {
 		int amount = MIN(BATCH_SIZE, framecount);
 
 		// Copy frames to tmpbuffer for resampling
-		for (int i = 0; i < amount; i++)
-		{
+		for (int i = 0; i < amount; i++) {
 			tmpbuffer[i] = frames[consumed + i];
 		}
 		consumed += amount;
 		framecount -= amount;
 
-		ResampledFrames resampled = resample_audio(
-			tmpbuffer, amount, snd.sample_rate_in, snd.sample_rate_out, ratio);
+		ResampledFrames resampled = resample_audio(tmpbuffer, amount, snd.sample_rate_in, snd.sample_rate_out, ratio);
 
 		int written_frames = 0;
-		for (int i = 0; i < resampled.frame_count; i++)
-		{
+		for (int i = 0; i < resampled.frame_count; i++) {
 			// Check if buffer full (leave one slot free)
-			if ((snd.frame_in + 1) % snd.frame_count == snd.frame_out)
-			{
+			if ((snd.frame_in + 1) % snd.frame_count == snd.frame_out) {
 				// Buffer full, break early
 				break;
 			}
@@ -2473,12 +2268,7 @@ size_t SND_batchSamples(const SND_Frame *frames, size_t frame_count)
 	return total_consumed_frames;
 }
 
-enum
-{
-	SND_FF_ON_TIME,
-	SND_FF_LATE,
-	SND_FF_VERY_LATE
-};
+enum { SND_FF_ON_TIME, SND_FF_LATE, SND_FF_VERY_LATE };
 
 size_t SND_batchSamples_fixed_rate(const SND_Frame *frames, size_t frame_count)
 {
@@ -2495,55 +2285,48 @@ size_t SND_batchSamples_fixed_rate(const SND_Frame *frames, size_t frame_count)
 	// int full = 0;
 
 	float remaining_space = snd.frame_count;
-	if (snd.frame_in >= snd.frame_out)
-	{
+	if (snd.frame_in >= snd.frame_out) {
 		remaining_space = snd.frame_count - (snd.frame_in - snd.frame_out);
-	}
-	else
-	{
+	} else {
 		remaining_space = snd.frame_out - snd.frame_in;
 	}
 	// printf("    actual free: %g\n", remaining_space);
 	currentbufferfree = remaining_space;
-	// let audio buffer fill up a little before playing audio, so no underruns occur. Target fill rate of buffer is about 50% so start playing when about 40% full
+	// let audio buffer fill up a little before playing audio, so no underruns occur. Target fill rate of buffer is
+	// about 50% so start playing when about 40% full
 	if (currentbufferfree < snd.frame_count * 0.6f) {
 		SND_pauseAudio(false);
-	} else if (currentbufferfree > snd.frame_count * 0.99f) { // if for some reason buffer drops below 1% again, pause audio again (like psx core can stop sending audio in between scenes or after fast forward etc)
+	} else if (currentbufferfree >
+			   snd.frame_count * 0.99f) { // if for some reason buffer drops below 1% again, pause audio again (like psx
+										  // core can stop sending audio in between scenes or after fast forward etc)
 		SND_pauseAudio(true);
-	} 
+	}
 
 	float tempdelay = ((snd.frame_count - remaining_space) / snd.sample_rate_out) * 1000;
 	currentbufferms = tempdelay;
 
 	float occupancy = (float)(snd.frame_count - currentbufferfree) / snd.frame_count;
-	switch (current_mode)
-	{
+	switch (current_mode) {
 	case SND_FF_ON_TIME:
-		if (occupancy > 0.65)
-		{
+		if (occupancy > 0.65) {
 			current_mode = SND_FF_LATE;
 		}
 		break;
 	case SND_FF_LATE:
-		if (occupancy > 0.85)
-		{
+		if (occupancy > 0.85) {
 			current_mode = SND_FF_VERY_LATE;
-		}
-		else if (occupancy < 0.25)
-		{
+		} else if (occupancy < 0.25) {
 			current_mode = SND_FF_ON_TIME;
 		}
 		break;
 	case SND_FF_VERY_LATE:
-		if (occupancy < 0.50)
-		{
+		if (occupancy < 0.50) {
 			current_mode = SND_FF_LATE;
 		}
 		break;
 	}
 
-	switch (current_mode)
-	{
+	switch (current_mode) {
 	case SND_FF_ON_TIME:
 		ratio = 1.0;
 		break;
@@ -2560,28 +2343,22 @@ size_t SND_batchSamples_fixed_rate(const SND_Frame *frames, size_t frame_count)
 	}
 	currentratio = ratio;
 
-	while (framecount > 0)
-	{
-
+	while (framecount > 0) {
 		int amount = MIN(BATCH_SIZE, framecount);
 
-		for (int i = 0; i < amount; i++)
-		{
+		for (int i = 0; i < amount; i++) {
 			tmpbuffer[i] = frames[consumed + i];
 		}
 		consumed += amount;
 		framecount -= amount;
 
-		ResampledFrames resampled = resample_audio(
-			tmpbuffer, amount, snd.sample_rate_in, snd.sample_rate_out, ratio);
+		ResampledFrames resampled = resample_audio(tmpbuffer, amount, snd.sample_rate_in, snd.sample_rate_out, ratio);
 
 		// Write resampled frames to the buffer
 		int written_frames = 0;
 
-		for (int i = 0; i < resampled.frame_count; i++)
-		{
-			if ((snd.frame_in + 1) % snd.frame_count == snd.frame_out)
-			{
+		for (int i = 0; i < resampled.frame_count; i++) {
+			if ((snd.frame_in + 1) % snd.frame_count == snd.frame_out) {
 				// Buffer is full, break. This should never happen tho, but just to be safe
 				break;
 			}
@@ -2602,7 +2379,7 @@ size_t SND_batchSamples_fixed_rate(const SND_Frame *frames, size_t frame_count)
 void SND_init(double sample_rate, double frame_rate)
 { // plat_sound_init
 	LOG_info("SND_init\n");
-	if(SDL_WasInit(SDL_INIT_AUDIO))
+	if (SDL_WasInit(SDL_INIT_AUDIO))
 		LOG_error("SND_init: already initialized\n");
 	currentreqfps = frame_rate;
 	SDL_InitSubSystem(SDL_INIT_AUDIO);
@@ -2612,15 +2389,13 @@ void SND_init(double sample_rate, double frame_rate)
 
 #if defined(USE_SDL2)
 	LOG_info("Available audio drivers:\n");
-	for (int i = 0; i < SDL_GetNumAudioDrivers(); i++)
-	{
+	for (int i = 0; i < SDL_GetNumAudioDrivers(); i++) {
 		LOG_info("- %s\n", SDL_GetAudioDriver(i));
 	}
 	LOG_info("Current audio driver: %s\n", SDL_GetCurrentAudioDriver());
 
 	LOG_info("Available audio devices:\n");
-	for (int i = 0; i < SDL_GetNumAudioDevices(0); i++)
-	{
+	for (int i = 0; i < SDL_GetNumAudioDevices(0); i++) {
 		LOG_info("- %s\n", SDL_GetAudioDeviceName(i, 0));
 	}
 #endif
@@ -2639,8 +2414,7 @@ void SND_init(double sample_rate, double frame_rate)
 
 #if defined(USE_SDL2)
 	snd.device_id = SDL_OpenAudioDevice(NULL, 0, &spec_in, &spec_out, SDL_AUDIO_ALLOW_ANY_CHANGE);
-	if (snd.device_id <= 0)
-	{
+	if (snd.device_id <= 0) {
 		LOG_info("SDL_OpenAudioDevice error: %s\n", SDL_GetError());
 		if (SDL_OpenAudio(&spec_in, &spec_out) < 0) {
 			LOG_info("SDL_OpenAudio error: %s\n", SDL_GetError());
@@ -2659,7 +2433,8 @@ void SND_init(double sample_rate, double frame_rate)
 
 	LOG_info("We now have audio device #%d\n", snd.device_id);
 
-	snd.frame_count = ((float)spec_out.freq / SCREEN_FPS) * 8; // buffer size based on sample rate out (times 12 samples headroom)
+	snd.frame_count =
+		((float)spec_out.freq / SCREEN_FPS) * 8; // buffer size based on sample rate out (times 12 samples headroom)
 	currentbuffersize = snd.frame_count;
 	snd.sample_rate_in = sample_rate;
 	snd.sample_rate_out = spec_out.freq;
@@ -2672,13 +2447,11 @@ void SND_init(double sample_rate, double frame_rate)
 	SND_pauseAudio(true);
 	LOG_info("sample rate: %i (req) %i (rec) [samples %i]\n", snd.sample_rate_in, snd.sample_rate_out, SAMPLES);
 	snd.initialized = 1;
-
 }
 
 void SND_quit(void)
 {
-	if (!snd.initialized)
-	{
+	if (!snd.initialized) {
 		LOG_warn("Skipping SND teardown, not initialized.\n");
 		return;
 	}
@@ -2692,13 +2465,12 @@ void SND_quit(void)
 #endif
 
 	SDL_QuitSubSystem(SDL_INIT_AUDIO);
-	if(SDL_WasInit(SDL_INIT_AUDIO))
+	if (SDL_WasInit(SDL_INIT_AUDIO))
 		LOG_error("SND_quit: failed to quit audio!!\n");
 	LOG_debug("SND_quit: quit audio!!\n");
 	snd.initialized = 0;
 
-	if (snd.buffer)
-	{
+	if (snd.buffer) {
 		free(snd.buffer);
 		snd.buffer = NULL;
 	}
@@ -2719,8 +2491,12 @@ void SND_pauseAudio(bool paused)
 #endif
 }
 
-FALLBACK_IMPLEMENTATION void PLAT_audioDeviceWatchRegister(void (*cb)(int, int)) {}
-FALLBACK_IMPLEMENTATION void PLAT_audioDeviceWatchUnregister(void) {}
+FALLBACK_IMPLEMENTATION void PLAT_audioDeviceWatchRegister(void (*cb)(int, int))
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_audioDeviceWatchUnregister(void)
+{
+}
 
 ///////////////////////////////
 
@@ -2729,8 +2505,13 @@ LID_Context lid = {
 	.is_open = 1,
 };
 
-FALLBACK_IMPLEMENTATION void PLAT_initLid(void) {}
-FALLBACK_IMPLEMENTATION int PLAT_lidChanged(int *state) { return 0; }
+FALLBACK_IMPLEMENTATION void PLAT_initLid(void)
+{
+}
+FALLBACK_IMPLEMENTATION int PLAT_lidChanged(int *state)
+{
+	return 0;
+}
 
 ///////////////////////////////
 
@@ -2742,50 +2523,39 @@ void PAD_setAnalog(int neg_id, int pos_id, int value, int repeat_at)
 	// LOG_info("neg %i pos %i value %i\n", neg_id, pos_id, value);
 	int neg = 1 << neg_id;
 	int pos = 1 << pos_id;
-	if (value > AXIS_DEADZONE)
-	{ // pressing
-		if (!(pad.is_pressed & pos))
-		{							  // not pressing
-			pad.is_pressed |= pos;	  // set
-			pad.just_pressed |= pos;  // set
-			pad.just_repeated |= pos; // set
+	if (value > AXIS_DEADZONE) {	   // pressing
+		if (!(pad.is_pressed & pos)) { // not pressing
+			pad.is_pressed |= pos;	   // set
+			pad.just_pressed |= pos;   // set
+			pad.just_repeated |= pos;  // set
 			pad.repeat_at[pos_id] = repeat_at;
 
-			if (pad.is_pressed & neg)
-			{							   // was pressing opposite
+			if (pad.is_pressed & neg) {	   // was pressing opposite
 				pad.is_pressed &= ~neg;	   // unset
 				pad.just_repeated &= ~neg; // unset
 				pad.just_released |= neg;  // set
 			}
 		}
-	}
-	else if (value < -AXIS_DEADZONE)
-	{ // pressing
-		if (!(pad.is_pressed & neg))
-		{							  // not pressing
-			pad.is_pressed |= neg;	  // set
-			pad.just_pressed |= neg;  // set
-			pad.just_repeated |= neg; // set
+	} else if (value < -AXIS_DEADZONE) { // pressing
+		if (!(pad.is_pressed & neg)) {	 // not pressing
+			pad.is_pressed |= neg;		 // set
+			pad.just_pressed |= neg;	 // set
+			pad.just_repeated |= neg;	 // set
 			pad.repeat_at[neg_id] = repeat_at;
 
-			if (pad.is_pressed & pos)
-			{							   // was pressing opposite
+			if (pad.is_pressed & pos) {	   // was pressing opposite
 				pad.is_pressed &= ~pos;	   // unset
 				pad.just_repeated &= ~pos; // unset
 				pad.just_released |= pos;  // set
 			}
 		}
-	}
-	else
-	{ // not pressing
-		if (pad.is_pressed & neg)
-		{							  // was pressing
+	} else {						  // not pressing
+		if (pad.is_pressed & neg) {	  // was pressing
 			pad.is_pressed &= ~neg;	  // unset
 			pad.just_repeated &= neg; // unset
 			pad.just_released |= neg; // set
 		}
-		if (pad.is_pressed & pos)
-		{							  // was pressing
+		if (pad.is_pressed & pos) {	  // was pressing
 			pad.is_pressed &= ~pos;	  // unset
 			pad.just_repeated &= pos; // unset
 			pad.just_released |= pos; // set
@@ -2809,11 +2579,9 @@ FALLBACK_IMPLEMENTATION void PLAT_pollInput(void)
 	pad.just_repeated = BTN_NONE;
 
 	uint32_t tick = SDL_GetTicks();
-	for (int i = 0; i < BTN_ID_COUNT; i++)
-	{
+	for (int i = 0; i < BTN_ID_COUNT; i++) {
 		int btn = 1 << i;
-		if ((pad.is_pressed & btn) && (tick >= pad.repeat_at[i]))
-		{
+		if ((pad.is_pressed & btn) && (tick >= pad.repeat_at[i])) {
 			pad.just_repeated |= btn; // set
 			pad.repeat_at[i] += PAD_REPEAT_INTERVAL;
 		}
@@ -2821,252 +2589,159 @@ FALLBACK_IMPLEMENTATION void PLAT_pollInput(void)
 
 	// the actual poll
 	SDL_Event event;
-	while (SDL_PollEvent(&event))
-	{
+	while (SDL_PollEvent(&event)) {
 		int btn = BTN_NONE;
 		int pressed = 0; // 0=up,1=down
 		int id = -1;
-		if (event.type == SDL_KEYDOWN || event.type == SDL_KEYUP)
-		{
+		if (event.type == SDL_KEYDOWN || event.type == SDL_KEYUP) {
 			uint8_t code = event.key.keysym.scancode;
 			pressed = event.type == SDL_KEYDOWN;
 			// LOG_info("key event: %i (%i)\n", code,pressed);
-			if (code == CODE_UP)
-			{
+			if (code == CODE_UP) {
 				btn = BTN_DPAD_UP;
 				id = BTN_ID_DPAD_UP;
-			}
-			else if (code == CODE_DOWN)
-			{
+			} else if (code == CODE_DOWN) {
 				btn = BTN_DPAD_DOWN;
 				id = BTN_ID_DPAD_DOWN;
-			}
-			else if (code == CODE_LEFT)
-			{
+			} else if (code == CODE_LEFT) {
 				btn = BTN_DPAD_LEFT;
 				id = BTN_ID_DPAD_LEFT;
-			}
-			else if (code == CODE_RIGHT)
-			{
+			} else if (code == CODE_RIGHT) {
 				btn = BTN_DPAD_RIGHT;
 				id = BTN_ID_DPAD_RIGHT;
-			}
-			else if (code == CODE_A)
-			{
+			} else if (code == CODE_A) {
 				btn = BTN_A;
 				id = BTN_ID_A;
-			}
-			else if (code == CODE_B)
-			{
+			} else if (code == CODE_B) {
 				btn = BTN_B;
 				id = BTN_ID_B;
-			}
-			else if (code == CODE_X)
-			{
+			} else if (code == CODE_X) {
 				btn = BTN_X;
 				id = BTN_ID_X;
-			}
-			else if (code == CODE_Y)
-			{
+			} else if (code == CODE_Y) {
 				btn = BTN_Y;
 				id = BTN_ID_Y;
-			}
-			else if (code == CODE_START)
-			{
+			} else if (code == CODE_START) {
 				btn = BTN_START;
 				id = BTN_ID_START;
-			}
-			else if (code == CODE_SELECT)
-			{
+			} else if (code == CODE_SELECT) {
 				btn = BTN_SELECT;
 				id = BTN_ID_SELECT;
-			}
-			else if (code == CODE_MENU)
-			{
+			} else if (code == CODE_MENU) {
 				btn = BTN_MENU;
 				id = BTN_ID_MENU;
-			}
-			else if (code == CODE_MENU_ALT)
-			{
+			} else if (code == CODE_MENU_ALT) {
 				btn = BTN_MENU;
 				id = BTN_ID_MENU;
-			}
-			else if (code == CODE_L1)
-			{
+			} else if (code == CODE_L1) {
 				btn = BTN_L1;
 				id = BTN_ID_L1;
-			}
-			else if (code == CODE_L2)
-			{
+			} else if (code == CODE_L2) {
 				btn = BTN_L2;
 				id = BTN_ID_L2;
-			}
-			else if (code == CODE_L3)
-			{
+			} else if (code == CODE_L3) {
 				btn = BTN_L3;
 				id = BTN_ID_L3;
-			}
-			else if (code == CODE_R1)
-			{
+			} else if (code == CODE_R1) {
 				btn = BTN_R1;
 				id = BTN_ID_R1;
-			}
-			else if (code == CODE_R2)
-			{
+			} else if (code == CODE_R2) {
 				btn = BTN_R2;
 				id = BTN_ID_R2;
-			}
-			else if (code == CODE_R3)
-			{
+			} else if (code == CODE_R3) {
 				btn = BTN_R3;
 				id = BTN_ID_R3;
-			}
-			else if (code == CODE_PLUS)
-			{
+			} else if (code == CODE_PLUS) {
 				btn = BTN_PLUS;
 				id = BTN_ID_PLUS;
-			}
-			else if (code == CODE_MINUS)
-			{
+			} else if (code == CODE_MINUS) {
 				btn = BTN_MINUS;
 				id = BTN_ID_MINUS;
-			}
-			else if (code == CODE_POWER)
-			{
+			} else if (code == CODE_POWER) {
 				btn = BTN_POWER;
 				id = BTN_ID_POWER;
-			}
-			else if (code == CODE_POWEROFF)
-			{
+			} else if (code == CODE_POWEROFF) {
 				btn = BTN_POWEROFF;
 				id = BTN_ID_POWEROFF;
 			} // nano-only
-		}
-		else if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_JOYBUTTONUP)
-		{
+		} else if (event.type == SDL_JOYBUTTONDOWN || event.type == SDL_JOYBUTTONUP) {
 			uint8_t joy = event.jbutton.button;
 			pressed = event.type == SDL_JOYBUTTONDOWN;
 			// LOG_info("joy event: %i (%i)\n", joy,pressed);
-			if (joy == JOY_UP)
-			{
+			if (joy == JOY_UP) {
 				btn = BTN_DPAD_UP;
 				id = BTN_ID_DPAD_UP;
-			}
-			else if (joy == JOY_DOWN)
-			{
+			} else if (joy == JOY_DOWN) {
 				btn = BTN_DPAD_DOWN;
 				id = BTN_ID_DPAD_DOWN;
-			}
-			else if (joy == JOY_LEFT)
-			{
+			} else if (joy == JOY_LEFT) {
 				btn = BTN_DPAD_LEFT;
 				id = BTN_ID_DPAD_LEFT;
-			}
-			else if (joy == JOY_RIGHT)
-			{
+			} else if (joy == JOY_RIGHT) {
 				btn = BTN_DPAD_RIGHT;
 				id = BTN_ID_DPAD_RIGHT;
-			}
-			else if (joy == JOY_A)
-			{
+			} else if (joy == JOY_A) {
 				btn = BTN_A;
 				id = BTN_ID_A;
-			}
-			else if (joy == JOY_B)
-			{
+			} else if (joy == JOY_B) {
 				btn = BTN_B;
 				id = BTN_ID_B;
-			}
-			else if (joy == JOY_X)
-			{
+			} else if (joy == JOY_X) {
 				btn = BTN_X;
 				id = BTN_ID_X;
-			}
-			else if (joy == JOY_Y)
-			{
+			} else if (joy == JOY_Y) {
 				btn = BTN_Y;
 				id = BTN_ID_Y;
-			}
-			else if (joy == JOY_START)
-			{
+			} else if (joy == JOY_START) {
 				btn = BTN_START;
 				id = BTN_ID_START;
-			}
-			else if (joy == JOY_SELECT)
-			{
+			} else if (joy == JOY_SELECT) {
 				btn = BTN_SELECT;
 				id = BTN_ID_SELECT;
-			}
-			else if (joy == JOY_MENU)
-			{
+			} else if (joy == JOY_MENU) {
 				btn = BTN_MENU;
 				id = BTN_ID_MENU;
-			}
-			else if (joy == JOY_MENU_ALT)
-			{
+			} else if (joy == JOY_MENU_ALT) {
 				btn = BTN_MENU;
 				id = BTN_ID_MENU;
-			}
-			else if (joy == JOY_MENU_ALT2)
-			{
+			} else if (joy == JOY_MENU_ALT2) {
 				btn = BTN_MENU;
 				id = BTN_ID_MENU;
-			}
-			else if (joy == JOY_L1)
-			{
+			} else if (joy == JOY_L1) {
 				btn = BTN_L1;
 				id = BTN_ID_L1;
-			}
-			else if (joy == JOY_L2)
-			{
+			} else if (joy == JOY_L2) {
 				btn = BTN_L2;
 				id = BTN_ID_L2;
-			}
-			else if (joy == JOY_L3)
-			{
+			} else if (joy == JOY_L3) {
 				btn = BTN_L3;
 				id = BTN_ID_L3;
-			}
-			else if (joy == JOY_R1)
-			{
+			} else if (joy == JOY_R1) {
 				btn = BTN_R1;
 				id = BTN_ID_R1;
-			}
-			else if (joy == JOY_R2)
-			{
+			} else if (joy == JOY_R2) {
 				btn = BTN_R2;
 				id = BTN_ID_R2;
-			}
-			else if (joy == JOY_R3)
-			{
+			} else if (joy == JOY_R3) {
 				btn = BTN_R3;
 				id = BTN_ID_R3;
-			}
-			else if (joy == JOY_PLUS)
-			{
+			} else if (joy == JOY_PLUS) {
 				btn = BTN_PLUS;
 				id = BTN_ID_PLUS;
-			}
-			else if (joy == JOY_MINUS)
-			{
+			} else if (joy == JOY_MINUS) {
 				btn = BTN_MINUS;
 				id = BTN_ID_MINUS;
-			}
-			else if (joy == JOY_POWER)
-			{
+			} else if (joy == JOY_POWER) {
 				btn = BTN_POWER;
 				id = BTN_ID_POWER;
 			}
-		}
-		else if (event.type == SDL_JOYHATMOTION)
-		{
+		} else if (event.type == SDL_JOYHATMOTION) {
 			int hats[4] = {-1, -1, -1, -1}; // -1=no change,0=up,1=down,2=left,3=right btn_ids
 			int hat = event.jhat.value;
 			// LOG_info("hat event: %i\n", hat);
 			// TODO: safe to assume hats will always be the primary dpad?
 			// TODO: this is literally a bitmask, make it one (oh, except there's 3 states...)
-			switch (hat)
-			{
+			switch (hat) {
 			case SDL_HAT_UP:
 				hats[0] = 1;
 				hats[1] = 0;
@@ -3125,18 +2800,14 @@ FALLBACK_IMPLEMENTATION void PLAT_pollInput(void)
 				break;
 			}
 
-			for (id = 0; id < 4; id++)
-			{
+			for (id = 0; id < 4; id++) {
 				int state = hats[id];
 				btn = 1 << id;
-				if (state == 0)
-				{
+				if (state == 0) {
 					pad.is_pressed &= ~btn;	   // unset
 					pad.just_repeated &= ~btn; // unset
 					pad.just_released |= btn;  // set
-				}
-				else if (state == 1 && (pad.is_pressed & btn) == BTN_NONE)
-				{
+				} else if (state == 1 && (pad.is_pressed & btn) == BTN_NONE) {
 					pad.just_pressed |= btn;  // set
 					pad.just_repeated |= btn; // set
 					pad.is_pressed |= btn;	  // set
@@ -3144,38 +2815,29 @@ FALLBACK_IMPLEMENTATION void PLAT_pollInput(void)
 				}
 			}
 			btn = BTN_NONE; // already handled, force continue
-		}
-		else if (event.type == SDL_JOYAXISMOTION)
-		{
+		} else if (event.type == SDL_JOYAXISMOTION) {
 			int axis = event.jaxis.axis;
 			int val = event.jaxis.value;
 			// LOG_info("axis: %i (%i)\n", axis,val);
 
 			// triggers on tg5040
-			if (axis == AXIS_L2)
-			{
+			if (axis == AXIS_L2) {
 				btn = BTN_L2;
 				id = BTN_ID_L2;
 				pressed = val > 0;
-			}
-			else if (axis == AXIS_R2)
-			{
+			} else if (axis == AXIS_R2) {
 				btn = BTN_R2;
 				id = BTN_ID_R2;
 				pressed = val > 0;
 			}
 
-			else if (axis == AXIS_LX)
-			{
+			else if (axis == AXIS_LX) {
 				pad.laxis.x = val;
 				PAD_setAnalog(BTN_ID_ANALOG_LEFT, BTN_ID_ANALOG_RIGHT, val, tick + PAD_REPEAT_DELAY);
-			}
-			else if (axis == AXIS_LY)
-			{
+			} else if (axis == AXIS_LY) {
 				pad.laxis.y = val;
 				PAD_setAnalog(BTN_ID_ANALOG_UP, BTN_ID_ANALOG_DOWN, val, tick + PAD_REPEAT_DELAY);
-			}
-			else if (axis == AXIS_RX)
+			} else if (axis == AXIS_RX)
 				pad.raxis.x = val;
 			else if (axis == AXIS_RY)
 				pad.raxis.y = val;
@@ -3183,32 +2845,24 @@ FALLBACK_IMPLEMENTATION void PLAT_pollInput(void)
 			// axis will fire off what looks like a release
 			// before the first press but you can't release
 			// a button that wasn't pressed
-			if (!pressed && btn != BTN_NONE && !(pad.is_pressed & btn))
-			{
+			if (!pressed && btn != BTN_NONE && !(pad.is_pressed & btn)) {
 				// LOG_info("cancel: %i\n", axis);
 				btn = BTN_NONE;
 			}
-		}
-		else if (event.type == SDL_QUIT)
-		{
+		} else if (event.type == SDL_QUIT) {
 			PWR_powerOff(0);
-		}
-		else if (event.type == SDL_JOYDEVICEADDED || event.type == SDL_JOYDEVICEREMOVED)
-		{
+		} else if (event.type == SDL_JOYDEVICEADDED || event.type == SDL_JOYDEVICEREMOVED) {
 			PAD_update(&event);
 		}
 
 		if (btn == BTN_NONE)
 			continue;
 
-		if (!pressed)
-		{
+		if (!pressed) {
 			pad.is_pressed &= ~btn;	   // unset
 			pad.just_repeated &= ~btn; // unset
 			pad.just_released |= btn;  // set
-		}
-		else if ((pad.is_pressed & btn) == BTN_NONE)
-		{
+		} else if ((pad.is_pressed & btn) == BTN_NONE) {
 			pad.just_pressed |= btn;  // set
 			pad.just_repeated |= btn; // set
 			pad.is_pressed |= btn;	  // set
@@ -3226,24 +2880,20 @@ FALLBACK_IMPLEMENTATION int PLAT_shouldWake(void)
 		return 1;
 
 	SDL_Event event;
-	while (SDL_PollEvent(&event))
-	{
-		if (event.type == SDL_KEYUP)
-		{
+	while (SDL_PollEvent(&event)) {
+		if (event.type == SDL_KEYUP) {
 			uint8_t code = event.key.keysym.scancode;
-			if ((BTN_WAKE == BTN_POWER && code == CODE_POWER) || (BTN_WAKE == BTN_MENU && (code == CODE_MENU || code == CODE_MENU_ALT)))
-			{
+			if ((BTN_WAKE == BTN_POWER && code == CODE_POWER) ||
+				(BTN_WAKE == BTN_MENU && (code == CODE_MENU || code == CODE_MENU_ALT))) {
 				// ignore input while lid is closed
 				if (lid.has_lid && !lid.is_open)
 					return 0; // do it here so we eat the input
 				return 1;
 			}
-		}
-		else if (event.type == SDL_JOYBUTTONUP)
-		{
+		} else if (event.type == SDL_JOYBUTTONUP) {
 			uint8_t joy = event.jbutton.button;
-			if ((BTN_WAKE == BTN_POWER && joy == JOY_POWER) || (BTN_WAKE == BTN_MENU && (joy == JOY_MENU || joy == JOY_MENU_ALT)))
-			{
+			if ((BTN_WAKE == BTN_POWER && joy == JOY_POWER) ||
+				(BTN_WAKE == BTN_MENU && (joy == JOY_MENU || joy == JOY_MENU_ALT))) {
 				// ignore input while lid is closed
 				if (lid.has_lid && !lid.is_open)
 					return 0; // do it here so we eat the input
@@ -3253,22 +2903,23 @@ FALLBACK_IMPLEMENTATION int PLAT_shouldWake(void)
 	}
 	return 0;
 }
-FALLBACK_IMPLEMENTATION int PLAT_supportsDeepSleep(void) { return 0; }
+FALLBACK_IMPLEMENTATION int PLAT_supportsDeepSleep(void)
+{
+	return 0;
+}
 FALLBACK_IMPLEMENTATION int PLAT_deepSleep(void)
 {
 	const char *state_path = "/sys/power/state";
 
 	int state_fd = open(state_path, O_WRONLY);
-	if (state_fd < 0)
-	{
+	if (state_fd < 0) {
 		LOG_error("failed to open %s: %d\n", state_path, errno);
 		return -1;
 	}
 
 	LOG_info("suspending to RAM\n");
 	int ret = write(state_fd, "mem", 3);
-	if (ret < 0)
-	{
+	if (ret < 0) {
 		// Can fail shortly after resuming with EBUSY
 		LOG_error("failed to set power state: %d\n", errno);
 		close(state_fd);
@@ -3280,27 +2931,46 @@ FALLBACK_IMPLEMENTATION int PLAT_deepSleep(void)
 	return 0;
 }
 
-int PAD_anyJustPressed(void) { return pad.just_pressed != BTN_NONE; }
-int PAD_anyPressed(void) { return pad.is_pressed != BTN_NONE; }
-int PAD_anyJustReleased(void) { return pad.just_released != BTN_NONE; }
+int PAD_anyJustPressed(void)
+{
+	return pad.just_pressed != BTN_NONE;
+}
+int PAD_anyPressed(void)
+{
+	return pad.is_pressed != BTN_NONE;
+}
+int PAD_anyJustReleased(void)
+{
+	return pad.just_released != BTN_NONE;
+}
 
-int PAD_justPressed(int btn) { return pad.just_pressed & btn; }
-int PAD_isPressed(int btn) { return pad.is_pressed & btn; }
-int PAD_justReleased(int btn) { return pad.just_released & btn; }
-int PAD_justRepeated(int btn) { return pad.just_repeated & btn; }
+int PAD_justPressed(int btn)
+{
+	return pad.just_pressed & btn;
+}
+int PAD_isPressed(int btn)
+{
+	return pad.is_pressed & btn;
+}
+int PAD_justReleased(int btn)
+{
+	return pad.just_released & btn;
+}
+int PAD_justRepeated(int btn)
+{
+	return pad.just_repeated & btn;
+}
 
 int PAD_tappedBtn(int btn, uint32_t now)
 {
 #define MENU_DELAY 250 // also in PWR_update()
 	static uint32_t menu_start = 0;
 	static int ignore_menu = 0;
-	if (PAD_justPressed(btn))
-	{
+	if (PAD_justPressed(btn)) {
 		ignore_menu = 0;
 		menu_start = now;
-	}
-	else if (PAD_isPressed(btn) && BTN_MOD_BRIGHTNESS == btn && (PAD_justPressed(BTN_MOD_PLUS) || PAD_justPressed(BTN_MOD_MINUS)))
-	{
+	} else if (PAD_isPressed(btn) && BTN_MOD_BRIGHTNESS == btn &&
+			   (PAD_justPressed(BTN_MOD_PLUS) || PAD_justPressed(BTN_MOD_MINUS))) {
 		ignore_menu = 1;
 	}
 	return (!ignore_menu && PAD_justReleased(btn) && now - menu_start < MENU_DELAY);
@@ -3317,8 +2987,7 @@ int PAD_tappedSelect(uint32_t now)
 }
 
 ///////////////////////////////
-static struct VIB_Context
-{
+static struct VIB_Context {
 	int initialized;
 	pthread_t pt;
 	int queued_strength;
@@ -3328,13 +2997,12 @@ static void *VIB_thread(void *arg)
 {
 #define DEFER_FRAMES 3
 	static int defer = 0;
-	while (1)
-	{
+	while (1) {
 		SDL_Delay(17);
-		if (vib.queued_strength != vib.strength)
-		{
-			if (defer < DEFER_FRAMES && vib.queued_strength == 0)
-			{ // minimize vacillation between 0 and some number (which this motor doesn't like)
+		if (vib.queued_strength != vib.strength) {
+			if (defer < DEFER_FRAMES &&
+				vib.queued_strength ==
+					0) { // minimize vacillation between 0 and some number (which this motor doesn't like)
 				defer += 1;
 				continue;
 			}
@@ -3456,8 +3124,7 @@ void PWR_updateFrequency(int secs, int updateWifi)
 
 static void *PWR_monitorBattery(void *arg)
 {
-	while (1)
-	{
+	while (1) {
 		struct PWR_Context *pwr_ctx = (struct PWR_Context *)arg;
 		sleep(pwr_ctx->update_secs);
 		PWR_updateBatteryStatus();
@@ -3529,41 +3196,35 @@ void PWR_update(int *_dirty, int *_show_setting, PWR_callback_t before_sleep, PW
 		was_muted = GetMute();
 
 	static int was_charging = -1;
-	if (was_charging == -1) was_charging = pwr.is_charging;
+	if (was_charging == -1)
+		was_charging = pwr.is_charging;
 
 	uint32_t now = SDL_GetTicks();
 	if (was_charging || PAD_anyPressed() || last_input_at == 0)
 		last_input_at = now;
 
 #define CHARGE_DELAY 1000
-	if (dirty || now - checked_charge_at >= CHARGE_DELAY)
-	{
+	if (dirty || now - checked_charge_at >= CHARGE_DELAY) {
 		int is_charging = pwr.is_charging;
-		if (was_charging != is_charging)
-		{
+		if (was_charging != is_charging) {
 			was_charging = is_charging;
 			dirty = 1;
 		}
 		checked_charge_at = now;
 	}
 
-	if (PAD_justReleased(BTN_POWEROFF) || (power_pressed_at && now - power_pressed_at >= 1000))
-	{
+	if (PAD_justReleased(BTN_POWEROFF) || (power_pressed_at && now - power_pressed_at >= 1000)) {
 		if (before_sleep)
 			before_sleep();
 		system("gametimectl.elf stop_all");
 		PWR_powerOff(0);
 	}
 
-	if (PAD_justPressed(BTN_POWER))
-	{
-		if (now - pwr.resume_tick < 1000)
-		{
+	if (PAD_justPressed(BTN_POWER)) {
+		if (now - pwr.resume_tick < 1000) {
 			LOG_debug("ignoring spurious power button press (just resumed)\n");
 			power_pressed_at = 0;
-		}
-		else
-		{
+		} else {
 			power_pressed_at = now;
 		}
 	}
@@ -3572,12 +3233,10 @@ void PWR_update(int *_dirty, int *_show_setting, PWR_callback_t before_sleep, PW
 	if (screenOffDelay == 0 || (now - last_input_at >= screenOffDelay && PWR_preventAutosleep()))
 		last_input_at = now;
 
-	if (
-		pwr.requested_sleep ||											   // hardware requested sleep
+	if (pwr.requested_sleep ||											   // hardware requested sleep
 		(screenOffDelay > 0 && now - last_input_at >= screenOffDelay) ||   // autosleep
 		(pwr.can_sleep && PAD_justReleased(BTN_SLEEP) && power_pressed_at) // manual sleep
-	)
-	{
+	) {
 		pwr.requested_sleep = 0;
 		if (before_sleep)
 			before_sleep();
@@ -3591,48 +3250,42 @@ void PWR_update(int *_dirty, int *_show_setting, PWR_callback_t before_sleep, PW
 
 	int was_dirty = dirty; // dirty list (not including settings/battery)
 
-	// TODO: only delay hiding setting changes if that setting didn't require a modifier button be held, otherwise release as soon as modifier is released
+	// TODO: only delay hiding setting changes if that setting didn't require a modifier button be held, otherwise
+	// release as soon as modifier is released
 
-	int delay_settings = BTN_MOD_BRIGHTNESS == BTN_MENU; // when both volume and brighness require a modifier hide settings as soon as it is released
+	int delay_settings =
+		BTN_MOD_BRIGHTNESS ==
+		BTN_MENU; // when both volume and brighness require a modifier hide settings as soon as it is released
 #define SETTING_DELAY 500
-	if (show_setting && (now - setting_shown_at >= SETTING_DELAY || !delay_settings) && !PAD_isPressed(BTN_MOD_VOLUME) && !PAD_isPressed(BTN_MOD_BRIGHTNESS) && !PAD_isPressed(BTN_MOD_COLORTEMP))
-	{
+	if (show_setting && (now - setting_shown_at >= SETTING_DELAY || !delay_settings) &&
+		!PAD_isPressed(BTN_MOD_VOLUME) && !PAD_isPressed(BTN_MOD_BRIGHTNESS) && !PAD_isPressed(BTN_MOD_COLORTEMP)) {
 		show_setting = 0;
 		dirty = 1;
 	}
 
-	if (!show_setting && !PAD_isPressed(BTN_MOD_VOLUME) && !PAD_isPressed(BTN_MOD_BRIGHTNESS) && !PAD_isPressed(BTN_MOD_COLORTEMP))
-	{
+	if (!show_setting && !PAD_isPressed(BTN_MOD_VOLUME) && !PAD_isPressed(BTN_MOD_BRIGHTNESS) &&
+		!PAD_isPressed(BTN_MOD_COLORTEMP)) {
 		mod_unpressed_at = now; // this feels backwards but is correct
 	}
 
 #define MOD_DELAY 250
-	if (
-		(
-			(PAD_isPressed(BTN_MOD_VOLUME) || PAD_isPressed(BTN_MOD_BRIGHTNESS) || PAD_isPressed(BTN_MOD_COLORTEMP)) &&
-			(!delay_settings || now - mod_unpressed_at >= MOD_DELAY)) ||
-		((!BTN_MOD_VOLUME || !BTN_MOD_BRIGHTNESS || !BTN_MOD_COLORTEMP) && (PAD_justRepeated(BTN_MOD_PLUS) || PAD_justRepeated(BTN_MOD_MINUS))))
-	{
+	if (((PAD_isPressed(BTN_MOD_VOLUME) || PAD_isPressed(BTN_MOD_BRIGHTNESS) || PAD_isPressed(BTN_MOD_COLORTEMP)) &&
+		 (!delay_settings || now - mod_unpressed_at >= MOD_DELAY)) ||
+		((!BTN_MOD_VOLUME || !BTN_MOD_BRIGHTNESS || !BTN_MOD_COLORTEMP) &&
+		 (PAD_justRepeated(BTN_MOD_PLUS) || PAD_justRepeated(BTN_MOD_MINUS)))) {
 		setting_shown_at = now;
-		if (PAD_isPressed(BTN_MOD_BRIGHTNESS))
-		{
+		if (PAD_isPressed(BTN_MOD_BRIGHTNESS)) {
 			show_setting = 1;
-		}
-		else if (PAD_isPressed(BTN_MOD_COLORTEMP))
-		{
+		} else if (PAD_isPressed(BTN_MOD_COLORTEMP)) {
 			show_setting = 3;
-		}
-		else
-		{
+		} else {
 			show_setting = 2;
 		}
 	}
 
-	if (InitializedSettings())
-	{
+	if (InitializedSettings()) {
 		int muted = GetMute();
-		if (muted != was_muted)
-		{
+		if (muted != was_muted) {
 			was_muted = muted;
 			show_setting = 2;
 			setting_shown_at = now;
@@ -3665,14 +3318,11 @@ void PWR_disablePowerOff(void)
 }
 void PWR_powerOff(int reboot)
 {
-	if (pwr.can_poweroff)
-	{
-
+	if (pwr.can_poweroff) {
 		int w = FIXED_WIDTH;
 		int h = FIXED_HEIGHT;
 		int p = FIXED_PITCH;
-		if (GetHDMI())
-		{
+		if (GetHDMI()) {
 			w = HDMI_WIDTH;
 			h = HDMI_HEIGHT;
 			p = HDMI_PITCH;
@@ -3680,17 +3330,14 @@ void PWR_powerOff(int reboot)
 		gfx.screen = GFX_resize(w, h, p);
 
 		char *msg;
-		if (HAS_POWER_BUTTON || HAS_POWEROFF_BUTTON)
-		{
+		if (HAS_POWER_BUTTON || HAS_POWEROFF_BUTTON) {
 			if (exists(AUTO_RESUME_PATH))
 				msg = (char *)"Quicksave created,\npowering off";
 			else if (reboot > 0)
 				msg = (char *)"Rebooting";
 			else
 				msg = (char *)"Powering off";
-		}
-		else
-		{
+		} else {
 			msg = exists(AUTO_RESUME_PATH) ? (char *)"Quicksave created,\npower off now" : (char *)"Power off now";
 		}
 
@@ -3718,16 +3365,12 @@ static void PWR_enterSleep(void)
 {
 	SND_pauseAudio(true);
 	LEDS_pushProfileOverride(LIGHT_PROFILE_SLEEP);
-	if (GetHDMI())
-	{
+	if (GetHDMI()) {
 		PLAT_clearVideo(gfx.screen);
 		PLAT_flip(gfx.screen, 0);
-	}
-	else
-	{
+	} else {
 		SetRawVolume(MUTE_VOLUME_RAW);
-		if (CFG_getHaptics())
-		{
+		if (CFG_getHaptics()) {
 			VIB_singlePulse(VIB_sleepStrength, VIB_sleepDuration_ms);
 		}
 		PLAT_enableBacklight(0);
@@ -3754,14 +3397,10 @@ static void PWR_exitSleep(void)
 	// system("killall -CONT wifi_daemon");
 	system("killall -CONT audiomon.elf");
 
-	if (GetHDMI())
-	{
+	if (GetHDMI()) {
 		// buh
-	}
-	else
-	{
-		if (CFG_getHaptics())
-		{
+	} else {
+		if (CFG_getHaptics()) {
 			VIB_singlePulse(VIB_sleepStrength, VIB_sleepDuration_ms);
 		}
 		PLAT_enableBacklight(1);
@@ -3779,44 +3418,32 @@ static void PWR_waitForWake(void)
 	uint32_t sleep_ticks = SDL_GetTicks();
 	int deep_sleep_attempts = 0;
 	const int sleepDelay = CFG_getSuspendTimeoutSecs() * 1000;
-	while (!PAD_wake())
-	{
-		if (pwr.requested_wake)
-		{
+	while (!PAD_wake()) {
+		if (pwr.requested_wake) {
 			pwr.requested_wake = 0;
 			break;
 		}
-		if (sleepDelay > 0)
-		{
+		if (sleepDelay > 0) {
 			SDL_Delay(200);
-			if (SDL_GetTicks() - sleep_ticks >= sleepDelay)
-			{ // increased to two minutes
-				if (pwr.is_charging)
-				{
+			if (SDL_GetTicks() - sleep_ticks >= sleepDelay) { // increased to two minutes
+				if (pwr.is_charging) {
 					sleep_ticks += 60000; // check again in a minute
 					continue;
 				}
-				if (PLAT_supportsDeepSleep())
-				{
+				if (PLAT_supportsDeepSleep()) {
 					int ret = PWR_deepSleep();
-					if (ret == 0)
-					{
+					if (ret == 0) {
 						return;
-					}
-					else if (deep_sleep_attempts < 3)
-					{
+					} else if (deep_sleep_attempts < 3) {
 						LOG_warn("failed to enter deep sleep - retrying in 5 seconds\n");
 						sleep_ticks += 5000;
 						deep_sleep_attempts++;
 						continue;
-					}
-					else
-					{
+					} else {
 						LOG_warn("failed to enter deep sleep - powering off\n");
 					}
 				}
-				if (pwr.can_poweroff)
-				{
+				if (pwr.can_poweroff) {
 					PWR_powerOff(0);
 				}
 			}
@@ -3851,13 +3478,11 @@ int PWR_deepSleep(void)
 	// We assume the suspend executable exits after a full
 	// suspend/resume cycle.
 	char *suspend_path = BIN_PATH "/suspend";
-	if (exists(suspend_path))
-	{
+	if (exists(suspend_path)) {
 		LOG_info("suspending using platform suspend executable\n");
 
 		int ret = system(suspend_path);
-		if (ret < 0)
-		{
+		if (ret < 0) {
 			LOG_error("failed to launch suspend executable: %d\n", errno);
 			return -1;
 		}
@@ -3906,70 +3531,83 @@ FALLBACK_IMPLEMENTATION int PLAT_setDateTime(int y, int m, int d, int h, int i,
 ///////////////////////////////
 // RGB LED cruft
 
-FALLBACK_IMPLEMENTATION void PLAT_initLeds(LightSettings *lights) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedBrightness(LightSettings *led) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedEffect(LightSettings *led) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedColor(LightSettings *led) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedInbrightness(LightSettings *led) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedEffectCycles(LightSettings *led) {}
-FALLBACK_IMPLEMENTATION void PLAT_setLedEffectSpeed(LightSettings *led) {}
+FALLBACK_IMPLEMENTATION void PLAT_initLeds(LightSettings *lights)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedBrightness(LightSettings *led)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedEffect(LightSettings *led)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedColor(LightSettings *led)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedInbrightness(LightSettings *led)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedEffectCycles(LightSettings *led)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_setLedEffectSpeed(LightSettings *led)
+{
+}
 
 void LEDS_setProfile(int profile)
 {
-	if(lights_initialized == 0)
+	if (lights_initialized == 0)
 		return;
 
 	LightSettings *new_lights = NULL;
 	bool indicator = true;
 
-	switch(profile)
-	{
-		case LIGHT_PROFILE_DEFAULT:
-			new_lights = lightsDefault;
-			indicator = false;
-			break;
-		case LIGHT_PROFILE_OFF:
-			new_lights = lightsOff;
-			indicator = false;
-			break;
-		case LIGHT_PROFILE_LOW_BATTERY:
-			new_lights = lightsLowBattery;
-			break;
-		case LIGHT_PROFILE_CRITICAL_BATTERY:
-			new_lights = lightsCriticalBattery;
-			break;
-		case LIGHT_PROFILE_CHARGING:
-			new_lights = lightsCharging;
-			break;
-		case LIGHT_PROFILE_SLEEP:
-			new_lights = lightsSleep;
-			break;
-		case LIGHT_PROFILE_AMBIENT:
-			new_lights = lightsAmbient;
-			indicator = false;
-			break;
-		default:
-			return;
+	switch (profile) {
+	case LIGHT_PROFILE_DEFAULT:
+		new_lights = lightsDefault;
+		indicator = false;
+		break;
+	case LIGHT_PROFILE_OFF:
+		new_lights = lightsOff;
+		indicator = false;
+		break;
+	case LIGHT_PROFILE_LOW_BATTERY:
+		new_lights = lightsLowBattery;
+		break;
+	case LIGHT_PROFILE_CRITICAL_BATTERY:
+		new_lights = lightsCriticalBattery;
+		break;
+	case LIGHT_PROFILE_CHARGING:
+		new_lights = lightsCharging;
+		break;
+	case LIGHT_PROFILE_SLEEP:
+		new_lights = lightsSleep;
+		break;
+	case LIGHT_PROFILE_AMBIENT:
+		new_lights = lightsAmbient;
+		indicator = false;
+		break;
+	default:
+		return;
 	}
-	if (profile != LIGHT_PROFILE_AMBIENT && lights == (LightSettings (*)[MAX_LIGHTS])new_lights)
+	if (profile != LIGHT_PROFILE_AMBIENT && lights == (LightSettings(*)[MAX_LIGHTS])new_lights)
 		return;
-	lights = (LightSettings (*)[MAX_LIGHTS])new_lights;
+	lights = (LightSettings(*)[MAX_LIGHTS])new_lights;
 
 	LEDS_updateLeds(indicator);
 }
 
 void LEDS_applyRules()
 {
-	if(lights_initialized == 0) {
+	if (lights_initialized == 0) {
 		LOG_error("LEDS_applyRules: lights not initialized, skipping\n");
 		return;
 	}
-	
+
 	// some rules rely on pwr.is_charging and pwr.charge being valid
-	if(pwr.initialized == 0)
+	if (pwr.initialized == 0)
 		LOG_warn("LEDS_applyRules called before PWR_init\n");
 	// some rules rely in InitSettings() being called (e.g GetMute())
-	if(!InitializedSettings())
+	if (!InitializedSettings())
 		LOG_warn("LEDS_applyRules called before InitSettings\n");
 
 	// these are defined in order of priority, not necessarily in the order
@@ -3977,53 +3615,51 @@ void LEDS_applyRules()
 	// e.g.
 	// - if charging and low battery, charging takes priority
 	if (pwr.initialized && pwr.is_charging) {
-		//LOG_info("LEDS_applyRules: charging\n");
+		// LOG_info("LEDS_applyRules: charging\n");
 		LEDS_setProfile(LIGHT_PROFILE_CHARGING);
 	}
 	// - if critical battery, critical battery takes priority over everything
 	else if (pwr.initialized && pwr.charge < PWR_LOW_CHARGE) {
-		//LOG_info("LEDS_applyRules: critical battery\n");
+		// LOG_info("LEDS_applyRules: critical battery\n");
 		LEDS_setProfile(LIGHT_PROFILE_CRITICAL_BATTERY);
 	}
 	// - if muted, muted takes priority over everything except critical battery
-	else if(InitializedSettings() && CFG_getMuteLEDs() && GetMute()) {
-		//LOG_info("LEDS_applyRules: muted\n");
+	else if (InitializedSettings() && CFG_getMuteLEDs() && GetMute()) {
+		// LOG_info("LEDS_applyRules: muted\n");
 		LEDS_setProfile(LIGHT_PROFILE_OFF);
 	}
 	// other rules
 	else if (pwr.initialized && pwr.charge < PWR_LOW_CHARGE + 10 && pwr.charge >= PWR_LOW_CHARGE) {
-		//LOG_info("LEDS_applyRules: low battery\n");
+		// LOG_info("LEDS_applyRules: low battery\n");
 		LEDS_setProfile(LIGHT_PROFILE_LOW_BATTERY);
 	}
 	// - if no other rule applies, use default (or temporary override)
 	// manual rules to be set on demand: LIGHT_PROFILE_SLEEP, LIGHT_PROFILE_AMBIENT
 	else {
-		//LOG_info("LEDS_applyRules: default/override: %i\n", LEDS_getProfileOverride());
+		// LOG_info("LEDS_applyRules: default/override: %i\n", LEDS_getProfileOverride());
 		LEDS_setProfile(LEDS_getProfileOverride());
 	}
 }
 
 void LEDS_updateLeds(bool indicator_only)
 {
-	if(lights_initialized == 0) {
+	if (lights_initialized == 0) {
 		LOG_error("LEDS_updateLeds: lights not initialized, skipping\n");
 		return;
 	}
-		
+
 	int lightsize = 3;
 	char *device = getenv("DEVICE");
 	int is_brick = exactMatch("brick", device);
 	if (is_brick)
 		lightsize = 4;
-	if(!lights)
-	{
+	if (!lights) {
 		LOG_error("LEDS_updateLeds called but lights is NULL\n");
 		return;
 	}
-	for (int i = 0; i < lightsize; i++)
-	{
+	for (int i = 0; i < lightsize; i++) {
 		// set brightness of each led
-		if(indicator_only)
+		if (indicator_only)
 			PLAT_setLedInbrightness(&(*lights)[i]);
 		else
 			PLAT_setLedBrightness(&(*lights)[i]);
@@ -4031,7 +3667,7 @@ void LEDS_updateLeds(bool indicator_only)
 		PLAT_setLedEffectCycles(&(*lights)[i]); // set how many times animation should loop
 		PLAT_setLedEffectSpeed(&(*lights)[i]);	// set animation speed
 		PLAT_setLedColor(&(*lights)[i]);		// set color
-		PLAT_setLedEffect(&(*lights)[i]);		// finally set the effect, on trimui devices this also applies the settings
+		PLAT_setLedEffect(&(*lights)[i]); // finally set the effect, on trimui devices this also applies the settings
 	}
 }
 
@@ -4039,15 +3675,13 @@ void LEDS_initLeds()
 {
 	PLAT_initLeds(lightsDefault);
 
-	if(!lightsDefault)
-	{
+	if (!lightsDefault) {
 		LOG_error("LEDS_initLeds called but lightsDefault is NULL\n");
 		return;
 	}
 
 	int lightsize = sizeof(lightsDefault) / sizeof(LightSettings);
-	for (int i = 0; i < lightsize; i++)
-	{
+	for (int i = 0; i < lightsize; i++) {
 		// LIGHT_PROFILE_OFF
 		lightsOff[i] = lightsDefault[i];
 		lightsOff[i].brightness = 0;
@@ -4069,7 +3703,7 @@ void LEDS_initLeds()
 		lightsCharging[i] = lightsDefault[i];
 		lightsCharging[i].effect = 2; // breathe
 		lightsCharging[i].color1 = 0x00FF00;
-		lightsCharging[i].cycles = -1; // infinite	
+		lightsCharging[i].cycles = -1; // infinite
 
 		// LIGHT_PROFILE_SLEEP
 		lightsSleep[i] = lightsDefault[i];
@@ -4092,8 +3726,7 @@ void LEDS_initLeds()
 
 bool LEDS_pushProfileOverride(int profile)
 {
-	if(profile_override_top == PROFILE_OVERRIDE_SIZE - 1)
-	{
+	if (profile_override_top == PROFILE_OVERRIDE_SIZE - 1) {
 		LOG_debug("LED_profile stack is full, ignoring.\n");
 		return false;
 	}
@@ -4105,12 +3738,13 @@ bool LEDS_pushProfileOverride(int profile)
 
 bool LEDS_popProfileOverride(int profile)
 {
-	if(profile_override_top == -1) {
+	if (profile_override_top == -1) {
 		LOG_debug("LED_profile stack is empty, nothing to pop.\n");
 		return false;
 	}
-	if(LEDS_getProfileOverride() != profile) {
-		LOG_debug("LEDS_popProfileOverride attempted to remove %d, but top of stack is %d\n", profile, LEDS_getProfileOverride());
+	if (LEDS_getProfileOverride() != profile) {
+		LOG_debug("LEDS_popProfileOverride attempted to remove %d, but top of stack is %d\n", profile,
+				  LEDS_getProfileOverride());
 		return false;
 	}
 	profile_override_top--;
@@ -4122,21 +3756,31 @@ bool LEDS_popProfileOverride(int profile)
 // returns top of stack, or default if stack is empty
 int LEDS_getProfileOverride()
 {
-	if(profile_override_top == -1) {
+	if (profile_override_top == -1) {
 		LOG_debug("LED_profile stack is empty, returning default profile.\n");
 		return LIGHT_PROFILE_DEFAULT;
 	}
-	
+
 	LOG_info("LEDS_getProfileOverride: %i\n", profile_override[profile_override_top]);
 	return profile_override[profile_override_top];
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-FALLBACK_IMPLEMENTATION bool PLAT_canTurbo(void) { return false; }
-FALLBACK_IMPLEMENTATION int PLAT_toggleTurbo(int btn_id) { return 0; }
-FALLBACK_IMPLEMENTATION void PLAT_clearTurbo() {}
-FALLBACK_IMPLEMENTATION void PLAT_updateInput(const SDL_Event *event) {}
+FALLBACK_IMPLEMENTATION bool PLAT_canTurbo(void)
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION int PLAT_toggleTurbo(int btn_id)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION void PLAT_clearTurbo()
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_updateInput(const SDL_Event *event)
+{
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -4146,8 +3790,7 @@ FALLBACK_IMPLEMENTATION FILE *PLAT_OpenSettings(const char *filename)
 	snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/%s", filename);
 
 	FILE *file = fopen(diskfilename, "r");
-	if (file == NULL)
-	{
+	if (file == NULL) {
 		return NULL;
 	}
 	return file;
@@ -4159,61 +3802,165 @@ FALLBACK_IMPLEMENTATION FILE *PLAT_WriteSettings(const char *filename)
 	snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/%s", filename);
 
 	FILE *file = fopen(diskfilename, "w");
-	if (file == NULL)
-	{
+	if (file == NULL) {
 		return NULL;
 	}
 	return file;
 }
 /////////////////////////////////////////////////////////////////////////////////////////
 
-FALLBACK_IMPLEMENTATION void PLAT_initTimezones() {}
-FALLBACK_IMPLEMENTATION void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count) { tz_count = 0; }
-FALLBACK_IMPLEMENTATION char *PLAT_getCurrentTimezone() { return "Foo/Bar"; }
-FALLBACK_IMPLEMENTATION void PLAT_setCurrentTimezone(const char *tz) {}
-FALLBACK_IMPLEMENTATION bool PLAT_getNetworkTimeSync(void) { return true; }
-FALLBACK_IMPLEMENTATION void PLAT_setNetworkTimeSync(bool on) {}
+FALLBACK_IMPLEMENTATION void PLAT_initTimezones()
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count)
+{
+	tz_count = 0;
+}
+FALLBACK_IMPLEMENTATION char *PLAT_getCurrentTimezone()
+{
+	return "Foo/Bar";
+}
+FALLBACK_IMPLEMENTATION void PLAT_setCurrentTimezone(const char *tz)
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_getNetworkTimeSync(void)
+{
+	return true;
+}
+FALLBACK_IMPLEMENTATION void PLAT_setNetworkTimeSync(bool on)
+{
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-FALLBACK_IMPLEMENTATION void PLAT_wifiInit() {}
-FALLBACK_IMPLEMENTATION bool PLAT_hasWifi() { return false; }
-FALLBACK_IMPLEMENTATION bool PLAT_wifiEnabled() { return false; }
-FALLBACK_IMPLEMENTATION void PLAT_wifiEnable(bool on) {}
-
-FALLBACK_IMPLEMENTATION int PLAT_wifiScan(struct WIFI_network *networks, int max) { return 0; }
-FALLBACK_IMPLEMENTATION bool PLAT_wifiConnected() { return false; }
-FALLBACK_IMPLEMENTATION int PLAT_wifiConnection(struct WIFI_connection *connection_info) { return 0; }
-FALLBACK_IMPLEMENTATION bool PLAT_wifiHasCredentials(char *ssid, WifiSecurityType sec) { return false; }
-FALLBACK_IMPLEMENTATION void PLAT_wifiForget(char *ssid, WifiSecurityType sec) {}
-FALLBACK_IMPLEMENTATION void PLAT_wifiConnect(char *ssid, WifiSecurityType sec) {}
-FALLBACK_IMPLEMENTATION void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char *pass) {}
-FALLBACK_IMPLEMENTATION void PLAT_wifiDisconnect() {}
-FALLBACK_IMPLEMENTATION bool PLAT_wifiDiagnosticsEnabled() { return false; }
-FALLBACK_IMPLEMENTATION void PLAT_wifiDiagnosticsEnable(bool on) {}
+FALLBACK_IMPLEMENTATION void PLAT_wifiInit()
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_hasWifi()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION bool PLAT_wifiEnabled()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiEnable(bool on)
+{
+}
+
+FALLBACK_IMPLEMENTATION int PLAT_wifiScan(struct WIFI_network *networks, int max)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION bool PLAT_wifiConnected()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION int PLAT_wifiConnection(struct WIFI_connection *connection_info)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION bool PLAT_wifiHasCredentials(char *ssid, WifiSecurityType sec)
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiForget(char *ssid, WifiSecurityType sec)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiConnect(char *ssid, WifiSecurityType sec)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char *pass)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiDisconnect()
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_wifiDiagnosticsEnabled()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION void PLAT_wifiDiagnosticsEnable(bool on)
+{
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothInit() {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothDeinit() {}
-FALLBACK_IMPLEMENTATION bool PLAT_hasBluetooth() { return false; }
-FALLBACK_IMPLEMENTATION bool PLAT_bluetoothEnabled() { return false; }
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothEnable(bool on) {}
-FALLBACK_IMPLEMENTATION bool PLAT_bluetoothDiagnosticsEnabled() { return false; }
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothDiagnosticsEnable(bool on) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothDiscovery(int on) {}
-FALLBACK_IMPLEMENTATION bool PLAT_bluetoothDiscovering() { return false; }
-FALLBACK_IMPLEMENTATION int PLAT_bluetoothScan(struct BT_device *devices, int max) { return 0; }
-FALLBACK_IMPLEMENTATION int PLAT_bluetoothPaired(struct BT_devicePaired *devices, int max) { return 0; }
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothPair(char *addr) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothUnpair(char *addr) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothConnect(char *addr) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothDisconnect(char *addr) {}
-FALLBACK_IMPLEMENTATION bool PLAT_bluetoothConnected() { return false; }
-FALLBACK_IMPLEMENTATION bool PLAT_btIsConnected(void) { return PLAT_bluetoothConnected(); }
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamInit(int ch, int samplerate) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamBegin(int buffersize) {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamEnd() {}
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamQuit() {}
-FALLBACK_IMPLEMENTATION int PLAT_bluetoothVolume() { return 100; }
-FALLBACK_IMPLEMENTATION void PLAT_bluetoothSetVolume(int vol) {}
\ No newline at end of file
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothInit()
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothDeinit()
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_hasBluetooth()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION bool PLAT_bluetoothEnabled()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothEnable(bool on)
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_bluetoothDiagnosticsEnabled()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothDiagnosticsEnable(bool on)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothDiscovery(int on)
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_bluetoothDiscovering()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION int PLAT_bluetoothScan(struct BT_device *devices, int max)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION int PLAT_bluetoothPaired(struct BT_devicePaired *devices, int max)
+{
+	return 0;
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothPair(char *addr)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothUnpair(char *addr)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothConnect(char *addr)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothDisconnect(char *addr)
+{
+}
+FALLBACK_IMPLEMENTATION bool PLAT_bluetoothConnected()
+{
+	return false;
+}
+FALLBACK_IMPLEMENTATION bool PLAT_btIsConnected(void)
+{
+	return PLAT_bluetoothConnected();
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamInit(int ch, int samplerate)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamBegin(int buffersize)
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamEnd()
+{
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothStreamQuit()
+{
+}
+FALLBACK_IMPLEMENTATION int PLAT_bluetoothVolume()
+{
+	return 100;
+}
+FALLBACK_IMPLEMENTATION void PLAT_bluetoothSetVolume(int vol)
+{
+}
\ No newline at end of file
diff --git a/workspace/all/common/api.h b/workspace/all/common/api.h
index 15a7a0b23..4f4bac7a8 100644
--- a/workspace/all/common/api.h
+++ b/workspace/all/common/api.h
@@ -19,33 +19,33 @@ enum {
 #define LOG_info(fmt, ...) LOG_note(LOG_INFO, fmt, ##__VA_ARGS__)
 #define LOG_warn(fmt, ...) LOG_note(LOG_WARN, fmt, ##__VA_ARGS__)
 #define LOG_error(fmt, ...) LOG_note(LOG_ERROR, fmt, ##__VA_ARGS__)
-void LOG_note(int level, const char* fmt, ...);
+void LOG_note(int level, const char *fmt, ...);
 
 ///////////////////////////////
 
-#define PAGE_COUNT	2
-#define PAGE_SCALE	3
-#define PAGE_WIDTH	(FIXED_WIDTH * PAGE_SCALE)
-#define PAGE_HEIGHT	(FIXED_HEIGHT * PAGE_SCALE)
-#define PAGE_PITCH	(PAGE_WIDTH * FIXED_BPP)
-#define PAGE_SIZE	(PAGE_PITCH * PAGE_HEIGHT)
+#define PAGE_COUNT 2
+#define PAGE_SCALE 3
+#define PAGE_WIDTH (FIXED_WIDTH * PAGE_SCALE)
+#define PAGE_HEIGHT (FIXED_HEIGHT * PAGE_SCALE)
+#define PAGE_PITCH (PAGE_WIDTH * FIXED_BPP)
+#define PAGE_SIZE (PAGE_PITCH * PAGE_HEIGHT)
 
 ///////////////////////////////
 
 // TODO: these only seem to be used by a tmp.pak in trimui (model s)
 // used by minarch, optionally defined in platform.h
 #ifndef PLAT_PAGE_BPP
-#define PLAT_PAGE_BPP 	FIXED_BPP
+#define PLAT_PAGE_BPP FIXED_BPP
 #endif
 #define PLAT_PAGE_DEPTH (PLAT_PAGE_BPP * 8)
 #define PLAT_PAGE_PITCH (PAGE_WIDTH * PLAT_PAGE_BPP)
-#define PLAT_PAGE_SIZE	(PLAT_PAGE_PITCH * PAGE_HEIGHT)
+#define PLAT_PAGE_SIZE (PLAT_PAGE_PITCH * PAGE_HEIGHT)
 
 ///////////////////////////////
 
-#define RGBA_MASK_AUTO	0x0, 0x0, 0x0, 0x0
-#define RGBA_MASK_565	0xF800, 0x07E0, 0x001F, 0x0000
-#define RGBA_MASK_8888	0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000
+#define RGBA_MASK_AUTO 0x0, 0x0, 0x0, 0x0
+#define RGBA_MASK_565 0xF800, 0x07E0, 0x001F, 0x0000
+#define RGBA_MASK_8888 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000
 
 ///////////////////////////////
 
@@ -118,9 +118,9 @@ enum {
 	ASSET_UNDERLINE,
 	ASSET_DOT,
 	ASSET_HOLE,
-	
+
 	ASSET_COLORS,
-	
+
 	ASSET_BRIGHTNESS,
 	ASSET_COLORTEMP,
 	ASSET_VOLUME_MUTE,
@@ -130,10 +130,10 @@ enum {
 	ASSET_BATTERY_FILL,
 	ASSET_BATTERY_FILL_LOW,
 	ASSET_BATTERY_BOLT,
-	
+
 	ASSET_SCROLL_UP,
 	ASSET_SCROLL_DOWN,
-	
+
 	ASSET_WIFI,
 	ASSET_WIFI_MED,
 	ASSET_WIFI_LOW,
@@ -143,7 +143,7 @@ enum {
 	ASSET_BLUETOOTH_OFF,
 	ASSET_AUDIO,
 	ASSET_CONTROLLER,
-	
+
 	ASSET_CHECKCIRCLE,
 	ASSET_LOCK,
 	ASSET_SETTINGS,
@@ -152,16 +152,16 @@ enum {
 	ASSET_POWEROFF,
 	ASSET_RESTART,
 	ASSET_SUSPEND,
-	
+
 	ASSET_COUNT,
 };
 
 typedef struct GFX_Fonts {
-	TTF_Font* large; 	// menu
-	TTF_Font* medium; 	// single char button label
-	TTF_Font* small; 	// button hint
-	TTF_Font* tiny; 	// multi char button label
-	TTF_Font* micro; 	// icon overlay text
+	TTF_Font *large;  // menu
+	TTF_Font *medium; // single char button label
+	TTF_Font *small;  // button hint
+	TTF_Font *tiny;	  // multi char button label
+	TTF_Font *micro;  // icon overlay text
 } GFX_Fonts;
 extern GFX_Fonts font;
 
@@ -179,12 +179,12 @@ enum {
 };
 
 typedef struct GFX_Renderer {
-	void* src;
-	void* dst;
-	void* blit;
+	void *src;
+	void *dst;
+	void *blit;
 	double aspect; // 0 for integer, -1 for fullscreen, otherwise aspect ratio, used for SDL2 accelerated scaling
 	int scale;
-	
+
 	// TODO: document this better
 	int true_w;
 	int true_h;
@@ -194,7 +194,7 @@ typedef struct GFX_Renderer {
 	int src_w;
 	int src_h;
 	int src_p;
-	
+
 	// TODO: I think this is overscaled
 	int dst_x;
 	int dst_y;
@@ -203,20 +203,19 @@ typedef struct GFX_Renderer {
 	int dst_p;
 } GFX_Renderer;
 
-typedef struct
-{
-    char name[255];
-    char filename[255];
-    int effect;
-    int speed;
-    int brightness;
-    uint32_t color1;
-    uint32_t color2;
-    int updated;
-    int colorFrames[255];
-    int trigger;
-    int inbrightness;
-    int cycles;
+typedef struct {
+	char name[255];
+	char filename[255];
+	int effect;
+	int speed;
+	int brightness;
+	uint32_t color1;
+	uint32_t color2;
+	int updated;
+	int colorFrames[255];
+	int trigger;
+	int inbrightness;
+	int cycles;
 
 } LightSettings;
 
@@ -229,12 +228,12 @@ enum {
 #define MAX_PARAM_NAME 128
 #define MAX_PARAM_LABEL 128
 typedef struct {
-    char name[MAX_PARAM_NAME];
-    char label[MAX_PARAM_LABEL];
-    float def;
-    float min;
-    float max;
-    float step;
+	char name[MAX_PARAM_NAME];
+	char label[MAX_PARAM_LABEL];
+	float def;
+	float min;
+	float max;
+	float step;
 	float value;
 	GLint uniformLocation;
 } ShaderParam;
@@ -248,39 +247,41 @@ enum {
 	LAYER_IDK2 = 5, // unused?
 };
 
-SDL_Surface* GFX_init(int mode);
-#define GFX_resize PLAT_resizeVideo				// (int w, int h, int pitch);
-#define GFX_setSharpness PLAT_setSharpness // (int sharpness)
-#define GFX_setEffectColor PLAT_setEffectColor // (int color)
-#define GFX_setEffect PLAT_setEffect // (int effect)
-#define GFX_setOverlay PLAT_setOverlay// (int effect)
-#define GFX_setOffsetX PLAT_setOffsetX// (int effect)
-#define GFX_setOffsetY PLAT_setOffsetY// (int effect)
-#define GFX_drawOnLayer PLAT_drawOnLayer //(SDL_Surface *inputSurface,int x, int y)
-#define GFX_clearLayers PLAT_clearLayers //(SDL_Surface *inputSurface,int x, int y)
+SDL_Surface *GFX_init(int mode);
+#define GFX_resize PLAT_resizeVideo								   // (int w, int h, int pitch);
+#define GFX_setSharpness PLAT_setSharpness						   // (int sharpness)
+#define GFX_setEffectColor PLAT_setEffectColor					   // (int color)
+#define GFX_setEffect PLAT_setEffect							   // (int effect)
+#define GFX_setOverlay PLAT_setOverlay							   // (int effect)
+#define GFX_setOffsetX PLAT_setOffsetX							   // (int effect)
+#define GFX_setOffsetY PLAT_setOffsetY							   // (int effect)
+#define GFX_drawOnLayer PLAT_drawOnLayer						   //(SDL_Surface *inputSurface,int x, int y)
+#define GFX_clearLayers PLAT_clearLayers						   //(SDL_Surface *inputSurface,int x, int y)
 #define GFX_captureRendererToSurface PLAT_captureRendererToSurface //(void)
-#define GFX_animateSurface PLAT_animateSurface //(SDL_Surface *inputSurface,int x, int y)
-#define GFX_animateSurfaceOpacity PLAT_animateSurfaceOpacity //(SDL_Surface *inputSurface,int x, int y)
-#define GFX_animateAndFadeSurface PLAT_animateAndFadeSurface //(SDL_Surface *inputSurface,int x, int y)
+#define GFX_animateSurface PLAT_animateSurface					   //(SDL_Surface *inputSurface,int x, int y)
+#define GFX_animateSurfaceOpacity PLAT_animateSurfaceOpacity	   //(SDL_Surface *inputSurface,int x, int y)
+#define GFX_animateAndFadeSurface PLAT_animateAndFadeSurface	   //(SDL_Surface *inputSurface,int x, int y)
 #define GFX_resetScrollText PLAT_resetScrollText
 #define GFX_scrollTextTexture PLAT_scrollTextTexture
-#define GFX_flipHidden PLAT_flipHidden //(void)
+#define GFX_flipHidden PLAT_flipHidden			   //(void)
 #define GFX_GL_screenCapture PLAT_GL_screenCapture //(void)
 
 void GFX_setMode(int mode);
 int GFX_hdmiChanged(void);
 SDL_Color /*GFX_*/ uintToColour(uint32_t colour);
 
-#define GFX_clear PLAT_clearVideo // (SDL_Surface* screen)
+#define GFX_clear PLAT_clearVideo  // (SDL_Surface* screen)
 #define GFX_clearAll PLAT_clearAll // (void)
 
 void GFX_startFrame(void);
-void GFX_flip(SDL_Surface* screen);
+void GFX_flip(SDL_Surface *screen);
 void PLAT_flipHidden();
-void GFX_flip_fixed_rate(SDL_Surface* screen, double target_fps); // if target_fps is 0, then use the native screen FPS
-#define GFX_supportsOverscan PLAT_supportsOverscan // (void)
-void GFX_sync(void); // call this to maintain 60fps when not calling GFX_flip() this frame
-void GFX_delay(void); // gfx_sync() is only for everywhere where there is no audio buffer to rely on for delaying, stupid so doing gfx_delay() for like waiting for input loop in binding menu. Need to remove gfx_sync() everwhere eventually
+void GFX_flip_fixed_rate(SDL_Surface *screen, double target_fps); // if target_fps is 0, then use the native screen FPS
+#define GFX_supportsOverscan PLAT_supportsOverscan				  // (void)
+void GFX_sync(void);  // call this to maintain 60fps when not calling GFX_flip() this frame
+void GFX_delay(void); // gfx_sync() is only for everywhere where there is no audio buffer to rely on for delaying,
+					  // stupid so doing gfx_delay() for like waiting for input loop in binding menu. Need to remove
+					  // gfx_sync() everwhere eventually
 void GFX_quit(void);
 
 enum {
@@ -292,22 +293,26 @@ enum {
 int GFX_getVsync(void);
 void GFX_setVsync(int vsync);
 
-int GFX_truncateText(TTF_Font* font, const char* in_name, char* out_name, int max_width, int padding); // returns final width
-int PLAT_resetScrollText(TTF_Font* font, const char* in_name,int max_width);
-void GFX_scrollTextSurface(TTF_Font* font, const char* in_name, SDL_Surface** out_surface, int max_width, int height, int padding, SDL_Color color,float heightratio); // returns final width
-int GFX_getTextWidth(TTF_Font* font, const char* in_name, char* out_name, int max_width, int padding); // returns final width
-int GFX_getTextHeight(TTF_Font* font, const char* in_name, char* out_name, int max_width, int padding); // returns final width
-int GFX_wrapText(TTF_Font* font, char* str, int max_width, int max_lines);
-
-#define GFX_getScaler PLAT_getScaler		// scaler_t:(GFX_Renderer* renderer)
-#define GFX_blitRenderer PLAT_blitRenderer	// void:(GFX_Renderer* renderer)
-#define GFX_setShaders PLAT_setShaders	// void:(GFX_Renderer* renderer)
-#define GFX_resetShaders PLAT_resetShaders	// void:(GFX_Renderer* renderer)
-#define GFX_clearShaders PLAT_clearShaders	// void:(GFX_Renderer* renderer)
-#define GFX_updateShader PLAT_updateShader	// void:(GFX_Renderer* renderer)
-#define GFX_initShaders PLAT_initShaders	// void:(GFX_Renderer* renderer)
-
-scaler_t GFX_getAAScaler(GFX_Renderer* renderer);
+int GFX_truncateText(TTF_Font *font, const char *in_name, char *out_name, int max_width,
+					 int padding); // returns final width
+int PLAT_resetScrollText(TTF_Font *font, const char *in_name, int max_width);
+void GFX_scrollTextSurface(TTF_Font *font, const char *in_name, SDL_Surface **out_surface, int max_width, int height,
+						   int padding, SDL_Color color, float heightratio); // returns final width
+int GFX_getTextWidth(TTF_Font *font, const char *in_name, char *out_name, int max_width,
+					 int padding); // returns final width
+int GFX_getTextHeight(TTF_Font *font, const char *in_name, char *out_name, int max_width,
+					  int padding); // returns final width
+int GFX_wrapText(TTF_Font *font, char *str, int max_width, int max_lines);
+
+#define GFX_getScaler PLAT_getScaler	   // scaler_t:(GFX_Renderer* renderer)
+#define GFX_blitRenderer PLAT_blitRenderer // void:(GFX_Renderer* renderer)
+#define GFX_setShaders PLAT_setShaders	   // void:(GFX_Renderer* renderer)
+#define GFX_resetShaders PLAT_resetShaders // void:(GFX_Renderer* renderer)
+#define GFX_clearShaders PLAT_clearShaders // void:(GFX_Renderer* renderer)
+#define GFX_updateShader PLAT_updateShader // void:(GFX_Renderer* renderer)
+#define GFX_initShaders PLAT_initShaders   // void:(GFX_Renderer* renderer)
+
+scaler_t GFX_getAAScaler(GFX_Renderer *renderer);
 void GFX_freeAAScaler(void);
 
 // calls the appropriate scale function based on the enum value.
@@ -321,35 +326,36 @@ SDL_Rect GFX_blitScaleAspect(SDL_Surface *src, SDL_Surface *dst);
 SDL_Rect GFX_blitScaleToFill(SDL_Surface *src, SDL_Surface *dst);
 
 // NOTE: all dimensions should be pre-scaled
-void GFX_blitSurfaceColor(SDL_Surface* src, SDL_Rect* src_rect, SDL_Surface* dst, SDL_Rect* dst_rect, uint32_t asset_color);
-void GFX_blitAssetColor(int asset, SDL_Rect* src_rect, SDL_Surface* dst, SDL_Rect* dst_rect, uint32_t asset_color);
-void GFX_blitAsset(int asset, SDL_Rect* src_rect, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitPillColor(int asset, SDL_Surface* dst, SDL_Rect* dst_rect, uint32_t asset_color, uint32_t fill_color);
-void GFX_blitPill(int asset, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitPillLight(int asset, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitPillDark(int asset, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitRect(int asset, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitRectColor(int asset, SDL_Surface* dst, SDL_Rect* dst_rect, uint32_t asset_color);
-void GFX_blitBattery(SDL_Surface* dst, SDL_Rect* dst_rect);
+void GFX_blitSurfaceColor(SDL_Surface *src, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect,
+						  uint32_t asset_color);
+void GFX_blitAssetColor(int asset, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t asset_color);
+void GFX_blitAsset(int asset, SDL_Rect *src_rect, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitPillColor(int asset, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t asset_color, uint32_t fill_color);
+void GFX_blitPill(int asset, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitPillLight(int asset, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitPillDark(int asset, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitRect(int asset, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitRectColor(int asset, SDL_Surface *dst, SDL_Rect *dst_rect, uint32_t asset_color);
+void GFX_blitBattery(SDL_Surface *dst, SDL_Rect *dst_rect);
 void GFX_blitBatteryAtPosition(SDL_Surface *dst, int x, int y);
-int GFX_getButtonWidth(char* hint, char* button);
-void GFX_blitButton(char* hint, char*button, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_blitMessage(TTF_Font* font, char* msg, SDL_Surface* dst, SDL_Rect* dst_rect);
-
-int GFX_blitHardwareGroup(SDL_Surface* dst, int show_setting);
-void GFX_blitHardwareHints(SDL_Surface* dst, int show_setting);
-int GFX_blitButtonGroup(char** hints, int primary, SDL_Surface* dst, int align_right);
-
-void GFX_assetRect(int asset, SDL_Rect* dst_rect);
-void GFX_sizeText(TTF_Font* font, const char* str, int leading, int* w, int* h);
-void GFX_blitText(TTF_Font* font, const char* str, int leading, SDL_Color color, SDL_Surface* dst, SDL_Rect* dst_rect);
-void GFX_setAmbientColor(const void *data, unsigned width, unsigned height, size_t pitch,int mode);
-
-void GFX_ApplyRoundedCorners(SDL_Surface* surface, SDL_Rect* rect, int radius);
-void GFX_ApplyRoundedCorners16(SDL_Surface* surface, SDL_Rect* rect, int radius);
-void GFX_ApplyRoundedCorners_RGBA4444(SDL_Surface* surface, SDL_Rect* rect, int radius);
-void GFX_ApplyRoundedCorners_RGBA8888(SDL_Surface* surface, SDL_Rect* rect, int radius);
-void BlitRGBA4444toRGB565(SDL_Surface* src, SDL_Surface* dest, SDL_Rect* dest_rect);
+int GFX_getButtonWidth(char *hint, char *button);
+void GFX_blitButton(char *hint, char *button, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_blitMessage(TTF_Font *font, char *msg, SDL_Surface *dst, SDL_Rect *dst_rect);
+
+int GFX_blitHardwareGroup(SDL_Surface *dst, int show_setting);
+void GFX_blitHardwareHints(SDL_Surface *dst, int show_setting);
+int GFX_blitButtonGroup(char **hints, int primary, SDL_Surface *dst, int align_right);
+
+void GFX_assetRect(int asset, SDL_Rect *dst_rect);
+void GFX_sizeText(TTF_Font *font, const char *str, int leading, int *w, int *h);
+void GFX_blitText(TTF_Font *font, const char *str, int leading, SDL_Color color, SDL_Surface *dst, SDL_Rect *dst_rect);
+void GFX_setAmbientColor(const void *data, unsigned width, unsigned height, size_t pitch, int mode);
+
+void GFX_ApplyRoundedCorners(SDL_Surface *surface, SDL_Rect *rect, int radius);
+void GFX_ApplyRoundedCorners16(SDL_Surface *surface, SDL_Rect *rect, int radius);
+void GFX_ApplyRoundedCorners_RGBA4444(SDL_Surface *surface, SDL_Rect *rect, int radius);
+void GFX_ApplyRoundedCorners_RGBA8888(SDL_Surface *surface, SDL_Rect *rect, int radius);
+void BlitRGBA4444toRGB565(SDL_Surface *src, SDL_Surface *dest, SDL_Rect *dest_rect);
 ///////////////////////////////
 
 typedef struct SND_Frame {
@@ -358,13 +364,13 @@ typedef struct SND_Frame {
 } SND_Frame;
 
 typedef struct {
-	SND_Frame* frames;
+	SND_Frame *frames;
 	int frame_count;
 } ResampledFrames;
 
 void SND_init(double sample_rate, double frame_rate);
-size_t SND_batchSamples(const SND_Frame* frames, size_t frame_count);
-size_t SND_batchSamples_fixed_rate(const SND_Frame* frames, size_t frame_count);
+size_t SND_batchSamples(const SND_Frame *frames, size_t frame_count);
+size_t SND_batchSamples_fixed_rate(const SND_Frame *frames, size_t frame_count);
 void SND_quit(void);
 void SND_resetAudio(double sample_rate, double frame_rate);
 void SND_pauseAudio(bool paused);
@@ -393,13 +399,13 @@ typedef struct LID_Context {
 extern LID_Context lid;
 
 void PLAT_initLid(void);
-int PLAT_lidChanged(int* state);
+int PLAT_lidChanged(int *state);
 void PLAT_getCPUTemp();
 ///////////////////////////////
 
 typedef struct PAD_Axis {
-		int x;
-		int y;
+	int x;
+	int y;
 } PAD_Axis;
 typedef struct PAD_Context {
 	int is_pressed;
@@ -412,7 +418,7 @@ typedef struct PAD_Context {
 } PAD_Context;
 extern PAD_Context pad;
 
-#define PAD_REPEAT_DELAY	300
+#define PAD_REPEAT_DELAY 300
 #define PAD_REPEAT_INTERVAL 100
 
 #define PAD_init PLAT_initInput
@@ -433,8 +439,10 @@ int PAD_isPressed(int btn);
 int PAD_justReleased(int btn);
 int PAD_justRepeated(int btn);
 
-int PAD_tappedMenu(uint32_t now); // special case, returns 1 on release of BTN_MENU within 250ms if BTN_PLUS/BTN_MINUS haven't been pressed
-int PAD_tappedSelect(uint32_t now); // special case, returns 1 on release of BTN_SELECT within 250ms if BTN_PLUS/BTN_MINUS haven't been pressed
+int PAD_tappedMenu(uint32_t now);	// special case, returns 1 on release of BTN_MENU within 250ms if BTN_PLUS/BTN_MINUS
+									// haven't been pressed
+int PAD_tappedSelect(uint32_t now); // special case, returns 1 on release of BTN_SELECT within 250ms if
+									// BTN_PLUS/BTN_MINUS haven't been pressed
 
 ///////////////////////////////
 #define VIB_sleepStrength 4
@@ -461,7 +469,7 @@ void PWR_quit(void);
 void PWR_warn(int enable);
 
 int PWR_ignoreSettingInput(int btn, int show_setting);
-void PWR_update(int* dirty, int* show_setting, PWR_callback_t before_sleep, PWR_callback_t after_sleep);
+void PWR_update(int *dirty, int *show_setting, PWR_callback_t before_sleep, PWR_callback_t after_sleep);
 void PWR_updateFrequency(int secs, int updateWifi);
 
 void PWR_disablePowerOff(void);
@@ -483,13 +491,13 @@ int PWR_getBattery(void);
 
 // rules-based presets managed and applied by LEDS_applyRules()
 enum LightProfile {
-	LIGHT_PROFILE_DEFAULT = 0, // configured via LedControl
-	LIGHT_PROFILE_OFF = 1, // all forced off
-	LIGHT_PROFILE_LOW_BATTERY = 2, // low battery warning
+	LIGHT_PROFILE_DEFAULT = 0,			// configured via LedControl
+	LIGHT_PROFILE_OFF = 1,				// all forced off
+	LIGHT_PROFILE_LOW_BATTERY = 2,		// low battery warning
 	LIGHT_PROFILE_CRITICAL_BATTERY = 3, // critical battery warning
-	LIGHT_PROFILE_CHARGING = 4, // derived from default
-	LIGHT_PROFILE_SLEEP = 5, // sleep mode
-	LIGHT_PROFILE_AMBIENT = 6, // ambient mode
+	LIGHT_PROFILE_CHARGING = 4,			// derived from default
+	LIGHT_PROFILE_SLEEP = 5,			// sleep mode
+	LIGHT_PROFILE_AMBIENT = 6,			// ambient mode
 	LIGHT_PROFILE_COUNT
 };
 
@@ -501,7 +509,7 @@ void LEDS_initLeds();
 void LEDS_applyRules();
 
 // temporary overrides outside of the scope of LEDS_applyRules
-// these will survive LEDS_applyRules() and need to be manually revoked, e.g. 
+// these will survive LEDS_applyRules() and need to be manually revoked, e.g.
 /*
 	LEDS_applyRules(); // applies rules
 	LEDS_pushProfile(LIGHT_PROFILE_AMBIENT); // manual override
@@ -537,7 +545,7 @@ enum {
 
 FILE *PLAT_OpenSettings(const char *filename);
 FILE *PLAT_WriteSettings(const char *filename);
-char* PLAT_findFileInDir(const char *directory, const char *filename);
+char *PLAT_findFileInDir(const char *directory, const char *filename);
 void PLAT_initInput(void);
 void PLAT_updateInput(const SDL_Event *event);
 void PLAT_quitInput(void);
@@ -545,60 +553,44 @@ void PLAT_quitInput(void);
 void PLAT_pollInput(void);
 int PLAT_shouldWake(void);
 
-SDL_Surface* PLAT_initVideo(void);
+SDL_Surface *PLAT_initVideo(void);
 void PLAT_quitVideo(void);
 uint32_t PLAT_get_dominant_color(void);
-void PLAT_clearVideo(SDL_Surface* screen);
+void PLAT_clearVideo(SDL_Surface *screen);
 void PLAT_clearAll(void);
 void PLAT_setVsync(int vsync);
-SDL_Surface* PLAT_resizeVideo(int w, int h, int pitch);
+SDL_Surface *PLAT_resizeVideo(int w, int h, int pitch);
 void PLAT_setSharpness(int sharpness);
 void PLAT_setEffectColor(int color);
 void PLAT_setEffect(int effect);
-void PLAT_setOverlay(const char* filename, const char* tag);
+void PLAT_setOverlay(const char *filename, const char *tag);
 void PLAT_setOffsetX(int x);
 void PLAT_setOffsetY(int y);
-void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,int layer);
+void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,
+					  int layer);
 void PLAT_clearLayers(int layer);
-SDL_Surface* PLAT_captureRendererToSurface();
-void PLAT_animateSurface(
-	SDL_Surface *inputSurface,
-	int x, int y,
-	int target_x, int target_y,
-	int w, int h,
-	int duration_ms,
-	int start_opacity,
-	int target_opacity,
-	int layer
-);
-void PLAT_animateAndFadeSurface(
-	SDL_Surface *inputSurface,
-	int x, int y, int target_x, int target_y, int w, int h, int duration_ms,
-	SDL_Surface *fadeSurface,
-	int fade_x, int fade_y, int fade_w, int fade_h,
-	int start_opacity, int target_opacity, int layer
-);
-
-void PLAT_animateSurfaceOpacity(SDL_Surface *inputSurface, int x, int y, int w, int h,
-	int start_opacity, int target_opacity, int duration_ms, int layer);
-
-void PLAT_scrollTextTexture(
-    TTF_Font* font,
-    const char* in_name,
-    int x, int y,      // Position on target layer
-    int w, int h,      // Clipping width and height
-    SDL_Color color,
-    float transparency
-);
-void drawTextWithCache(TTF_Font* font, const char* text, SDL_Color color, SDL_Rect* destRect);
+SDL_Surface *PLAT_captureRendererToSurface();
+void PLAT_animateSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+						 int duration_ms, int start_opacity, int target_opacity, int layer);
+void PLAT_animateAndFadeSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+								int duration_ms, SDL_Surface *fadeSurface, int fade_x, int fade_y, int fade_w,
+								int fade_h, int start_opacity, int target_opacity, int layer);
+
+void PLAT_animateSurfaceOpacity(SDL_Surface *inputSurface, int x, int y, int w, int h, int start_opacity,
+								int target_opacity, int duration_ms, int layer);
+
+void PLAT_scrollTextTexture(TTF_Font *font, const char *in_name, int x, int y, // Position on target layer
+							int w, int h,									   // Clipping width and height
+							SDL_Color color, float transparency);
+void drawTextWithCache(TTF_Font *font, const char *text, SDL_Color color, SDL_Rect *destRect);
 void PLAT_vsync(int remaining);
-scaler_t PLAT_getScaler(GFX_Renderer* renderer);
-void PLAT_blitRenderer(GFX_Renderer* renderer);
-void PLAT_flip(SDL_Surface* screen, int sync);
+scaler_t PLAT_getScaler(GFX_Renderer *renderer);
+void PLAT_blitRenderer(GFX_Renderer *renderer);
+void PLAT_flip(SDL_Surface *screen, int sync);
 void PLAT_GL_Swap();
 void GFX_GL_Swap();
-unsigned char* PLAT_GL_screenCapture(int* outWidth, int* outHeight);
-unsigned char* PLAT_pixelscaler(const unsigned char* src, int sw, int sh, int scale, int* outW, int* outH);
+unsigned char *PLAT_GL_screenCapture(int *outWidth, int *outHeight);
+unsigned char *PLAT_pixelscaler(const unsigned char *src, int sw, int sh, int scale, int *outW, int *outH);
 void PLAT_GPU_Flip();
 void PLAT_setShaders(int nr);
 void PLAT_resetShaders();
@@ -609,21 +601,21 @@ void PLAT_setShader3Filter(int value);
 void PLAT_setShaderUpscale1(int nr);
 void PLAT_setShaderUpscale2(int nr);
 void PLAT_setShaderUpscale3(int nr);
-void PLAT_setShader1(const char* filename);
-void PLAT_setShader2(const char* filename);
-void PLAT_setShader3(const char* filename);
+void PLAT_setShader1(const char *filename);
+void PLAT_setShader2(const char *filename);
+void PLAT_setShader3(const char *filename);
 void PLAT_updateShader(int i, const char *filename, int *scale, int *filter, int *scaletype, int *inputtype);
 void PLAT_initShaders();
-ShaderParam* PLAT_getShaderPragmas(int i);
+ShaderParam *PLAT_getShaderPragmas(int i);
 int PLAT_supportsOverscan(void);
 
-SDL_Surface* PLAT_initOverlay(void);
+SDL_Surface *PLAT_initOverlay(void);
 void PLAT_quitOverlay(void);
 void PLAT_enableOverlay(int enable);
-	
+
 #define PWR_LOW_CHARGE 10
-void PLAT_getBatteryStatus(int* is_charging, int* charge); // 0,1 and 0,10,20,40,60,80,100
-void PLAT_getBatteryStatusFine(int* is_charging, int* charge); // 0,1 and 0-100
+void PLAT_getBatteryStatus(int *is_charging, int *charge);	   // 0,1 and 0,10,20,40,60,80,100
+void PLAT_getBatteryStatusFine(int *is_charging, int *charge); // 0,1 and 0-100
 void PLAT_enableBacklight(int enable);
 int PLAT_supportsDeepSleep(void);
 int PLAT_deepSleep(void);
@@ -635,7 +627,7 @@ void PLAT_setCustomCPUSpeed(int speed);
 void PLAT_setRumble(int strength);
 int PLAT_pickSampleRate(int requested, int max);
 
-char* PLAT_getModel(void);
+char *PLAT_getModel(void);
 void PLAT_getOsVersionInfo(char *output_str, size_t max_len);
 void PLAT_updateNetworkStatus();
 bool PLAT_btIsConnected(void);
@@ -670,7 +662,7 @@ void PLAT_clearTurbo();
 void PLAT_initTimezones();
 void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count);
 char *PLAT_getCurrentTimezone();
-void PLAT_setCurrentTimezone(const char*);
+void PLAT_setCurrentTimezone(const char *);
 bool PLAT_getNetworkTimeSync(void);
 void PLAT_setNetworkTimeSync(bool on);
 
@@ -685,7 +677,7 @@ void PLAT_setNetworkTimeSync(bool on);
 
 #define SSID_MAX 64
 #define SCAN_MAX_RESULTS 128
-//#define LIST_NETWORK_MAX 4096
+// #define LIST_NETWORK_MAX 4096
 
 typedef enum {
 	SECURITY_NONE = 0,
@@ -736,9 +728,9 @@ void PLAT_wifiForget(char *ssid, WifiSecurityType sec);
 // attempt to connect to this SSID, using, stored credentials.
 // \sa PLAT_wifiHasCredentials
 void PLAT_wifiConnect(char *ssid, WifiSecurityType sec);
-// attempt to connect to this SSID with password given. 
+// attempt to connect to this SSID with password given.
 // If successful, stores credentials with wpa_supplicant.
-void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char* pass);
+void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char *pass);
 // disconnect from any active network
 void PLAT_wifiDisconnect();
 // enable wifi diagnostic logging
@@ -769,24 +761,24 @@ typedef enum {
 } BluetoothDeviceType;
 
 struct BT_device {
-	char addr[18]; // MAX_BT_ADDR_LEN
+	char addr[18];	// MAX_BT_ADDR_LEN
 	char name[249]; // MAX_BT_NAME_LEN
 	BluetoothDeviceType kind;
 };
 
-//struct BT_deviceUUID {
+// struct BT_deviceUUID {
 //	char *uuid;
 //	char *uuid_name;
-//};
+// };
 
 struct BT_devicePaired {
-	char remote_addr[18]; // MAX_BT_ADDR_LEN
+	char remote_addr[18];  // MAX_BT_ADDR_LEN
 	char remote_name[249]; // MAX_BT_NAME_LEN
 	int16_t rssi;
 	bool is_bonded;
 	bool is_connected;
-	//int uuid_len;
-	//BT_deviceUUID *uuids;
+	// int uuid_len;
+	// BT_deviceUUID *uuids;
 };
 
 // initializes our BT context and synchronizes it with the current system state
diff --git a/workspace/all/common/config.c b/workspace/all/common/config.c
index 1dd5a9e15..47bf40fa6 100644
--- a/workspace/all/common/config.c
+++ b/workspace/all/common/config.c
@@ -13,911 +13,802 @@ uint32_t THEME_COLOR5_255;
 uint32_t THEME_COLOR6_255;
 uint32_t THEME_COLOR7_255;
 
-static inline uint32_t HexToUint32_unmapped(const char *hexColor) {
-    // Convert the hex string to an unsigned long
-    uint32_t value = (uint32_t)strtoul(hexColor, NULL, 16);
-    return value;
+static inline uint32_t HexToUint32_unmapped(const char *hexColor)
+{
+	// Convert the hex string to an unsigned long
+	uint32_t value = (uint32_t)strtoul(hexColor, NULL, 16);
+	return value;
 }
 
 void CFG_defaults(NextUISettings *cfg)
 {
-    if (!cfg)
-        return;
-
-    NextUISettings defaults = {
-        .font = CFG_DEFAULT_FONT_ID,
-        .color1_255 = CFG_DEFAULT_COLOR1,
-        .color2_255 = CFG_DEFAULT_COLOR2,
-        .color3_255 = CFG_DEFAULT_COLOR3,
-        .color4_255 = CFG_DEFAULT_COLOR4,
-        .color5_255 = CFG_DEFAULT_COLOR5,
-        .color6_255 = CFG_DEFAULT_COLOR6,
-        .color7_255 = CFG_DEFAULT_COLOR7,
-        .thumbRadius = CFG_DEFAULT_THUMBRADIUS,
-        .gameArtWidth = CFG_DEFAULT_GAMEARTWIDTH,
+	if (!cfg)
+		return;
+
+	NextUISettings defaults = {
+		.font = CFG_DEFAULT_FONT_ID,
+		.color1_255 = CFG_DEFAULT_COLOR1,
+		.color2_255 = CFG_DEFAULT_COLOR2,
+		.color3_255 = CFG_DEFAULT_COLOR3,
+		.color4_255 = CFG_DEFAULT_COLOR4,
+		.color5_255 = CFG_DEFAULT_COLOR5,
+		.color6_255 = CFG_DEFAULT_COLOR6,
+		.color7_255 = CFG_DEFAULT_COLOR7,
+		.thumbRadius = CFG_DEFAULT_THUMBRADIUS,
+		.gameArtWidth = CFG_DEFAULT_GAMEARTWIDTH,
 		.showFolderNamesAtRoot = CFG_DEFAULT_SHOWFOLDERNAMESATROOT,
 
-        .showClock = CFG_DEFAULT_SHOWCLOCK,
-        .clock24h = CFG_DEFAULT_CLOCK24H,
-        .showBatteryPercent = CFG_DEFAULT_SHOWBATTERYPERCENT,
-        .showMenuAnimations = CFG_DEFAULT_SHOWMENUANIMATIONS,
-        .showMenuTransitions = CFG_DEFAULT_SHOWMENUTRANSITIONS,
-        .showRecents = CFG_DEFAULT_SHOWRECENTS,
-        .showTools = CFG_DEFAULT_SHOWTOOLS,
-        .showGameArt = CFG_DEFAULT_SHOWGAMEART,
-        .gameSwitcherScaling = CFG_DEFAULT_GAMESWITCHERSCALING,
-        .defaultView = CFG_DEFAULT_VIEW,
-        .showQuickSwitcherUi = CFG_DEFAULT_SHOWQUICKWITCHERUI,
+		.showClock = CFG_DEFAULT_SHOWCLOCK,
+		.clock24h = CFG_DEFAULT_CLOCK24H,
+		.showBatteryPercent = CFG_DEFAULT_SHOWBATTERYPERCENT,
+		.showMenuAnimations = CFG_DEFAULT_SHOWMENUANIMATIONS,
+		.showMenuTransitions = CFG_DEFAULT_SHOWMENUTRANSITIONS,
+		.showRecents = CFG_DEFAULT_SHOWRECENTS,
+		.showTools = CFG_DEFAULT_SHOWTOOLS,
+		.showGameArt = CFG_DEFAULT_SHOWGAMEART,
+		.gameSwitcherScaling = CFG_DEFAULT_GAMESWITCHERSCALING,
+		.defaultView = CFG_DEFAULT_VIEW,
+		.showQuickSwitcherUi = CFG_DEFAULT_SHOWQUICKWITCHERUI,
 
-        .muteLeds = CFG_DEFAULT_MUTELEDS,
+		.muteLeds = CFG_DEFAULT_MUTELEDS,
 
-        .screenTimeoutSecs = CFG_DEFAULT_SCREENTIMEOUTSECS,
-        .suspendTimeoutSecs = CFG_DEFAULT_SUSPENDTIMEOUTSECS,
+		.screenTimeoutSecs = CFG_DEFAULT_SCREENTIMEOUTSECS,
+		.suspendTimeoutSecs = CFG_DEFAULT_SUSPENDTIMEOUTSECS,
 
-        .haptics = CFG_DEFAULT_HAPTICS,
-        .romsUseFolderBackground = CFG_DEFAULT_ROMSUSEFOLDERBACKGROUND,
-        .saveFormat = CFG_DEFAULT_SAVEFORMAT,
-        .stateFormat = CFG_DEFAULT_STATEFORMAT,
-        .useExtractedFileName = CFG_DEFAULT_EXTRACTEDFILENAME,
+		.haptics = CFG_DEFAULT_HAPTICS,
+		.romsUseFolderBackground = CFG_DEFAULT_ROMSUSEFOLDERBACKGROUND,
+		.saveFormat = CFG_DEFAULT_SAVEFORMAT,
+		.stateFormat = CFG_DEFAULT_STATEFORMAT,
+		.useExtractedFileName = CFG_DEFAULT_EXTRACTEDFILENAME,
 
-        .wifi = CFG_DEFAULT_WIFI,
-        .wifiDiagnostics = CFG_DEFAULT_WIFI_DIAG,
-        .bluetooth = CFG_DEFAULT_BLUETOOTH,
-        .bluetoothDiagnostics = CFG_DEFAULT_BLUETOOTH_DIAG,
-        .bluetoothSamplerateLimit = CFG_DEFAULT_BLUETOOTH_MAXRATE,
-};
+		.wifi = CFG_DEFAULT_WIFI,
+		.wifiDiagnostics = CFG_DEFAULT_WIFI_DIAG,
+		.bluetooth = CFG_DEFAULT_BLUETOOTH,
+		.bluetoothDiagnostics = CFG_DEFAULT_BLUETOOTH_DIAG,
+		.bluetoothSamplerateLimit = CFG_DEFAULT_BLUETOOTH_MAXRATE,
+	};
 
-    *cfg = defaults;
+	*cfg = defaults;
 }
 
 void CFG_init(FontLoad_callback_t cb, ColorSet_callback_t ccb)
 {
-    CFG_defaults(&settings);
-    settings.onFontChange = cb;
-    settings.onColorSet = ccb;
-    bool fontLoaded = false;
-
-    char settingsPath[MAX_PATH];
-    sprintf(settingsPath, "%s/minuisettings.txt", SHARED_USERDATA_PATH);
-    FILE *file = fopen(settingsPath, "r");
-    if (file == NULL)
-    {
-        printf("[CFG] Unable to open settings file, loading defaults\n");
-    }
-    else
-    {
-        char line[256];
-        while (fgets(line, sizeof(line), file))
-        {
-            int temp_value;
-            uint32_t temp_color;
-            if (sscanf(line, "font=%i", &temp_value) == 1)
-            {
-                CFG_setFontId(temp_value);
-                fontLoaded = true;
-                continue;
-            }
-            if (sscanf(line, "color1=%x", &temp_color) == 1)
-            {
-                char hexColor[7];
-                snprintf(hexColor, sizeof(hexColor), "%06x", temp_color);
-                CFG_setColor(1, HexToUint32_unmapped(hexColor));
-                continue;
-            }
-            if (sscanf(line, "color2=%x", &temp_color) == 1)
-            {
-                CFG_setColor(2, temp_color);
-                continue;
-            }
-            if (sscanf(line, "color3=%x", &temp_color) == 1)
-            {
-                CFG_setColor(3, temp_color);
-                continue;
-            }
-            if (sscanf(line, "color4=%x", &temp_color) == 1)
-            {
-                CFG_setColor(4, temp_color);
-                continue;
-            }
-            if (sscanf(line, "color5=%x", &temp_color) == 1)
-            {
-                CFG_setColor(5, temp_color);
-                continue;
-            }
-            if (sscanf(line, "color6=%x", &temp_color) == 1)
-            {
-                CFG_setColor(6, temp_color);
-                continue;
-            }
-            if (sscanf(line, "color7=%x", &temp_color) == 1)
-            {
-                CFG_setColor(7, temp_color);
-                continue;
-            }
-            if (sscanf(line, "radius=%i", &temp_value) == 1)
-            {
-                CFG_setThumbnailRadius(temp_value);
-                continue;
-            }
-            if (sscanf(line, "showclock=%i", &temp_value) == 1)
-            {
-                CFG_setShowClock((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "clock24h=%i", &temp_value) == 1)
-            {
-                CFG_setClock24H((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "batteryperc=%i", &temp_value) == 1)
-            {
-                CFG_setShowBatteryPercent((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "menuanim=%i", &temp_value) == 1)
-            {
-                CFG_setMenuAnimations((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "menutransitions=%i", &temp_value) == 1)
-            {
-                CFG_setMenuTransitions((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "recents=%i", &temp_value) == 1)
-            {
-                CFG_setShowRecents((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "tools=%i", &temp_value) == 1)
-            {
-                CFG_setShowTools((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "gameart=%i", &temp_value) == 1)
-            {
-                CFG_setShowGameArt((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "screentimeout=%i", &temp_value) == 1)
-            {
-                CFG_setScreenTimeoutSecs(temp_value);
-                continue;
-            }
-            if (sscanf(line, "showfoldernamesatroot=%i", &temp_value) == 1)
-            {
-                CFG_setShowFolderNamesAtRoot((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "suspendTimeout=%i", &temp_value) == 1)
-            {
-                CFG_setSuspendTimeoutSecs(temp_value);
-                continue;
-            }
-            if (sscanf(line, "switcherscale=%i", &temp_value) == 1)
-            {
-                CFG_setGameSwitcherScaling(temp_value);
-                continue;
-            }
-            if (sscanf(line, "haptics=%i", &temp_value) == 1)
-            {
-                CFG_setHaptics((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "romfolderbg=%i", &temp_value) == 1)
-            {
-                CFG_setRomsUseFolderBackground((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "saveFormat=%i", &temp_value) == 1)
-            {
-                CFG_setSaveFormat(temp_value);
-                continue;
-            }
-            if (sscanf(line, "stateFormat=%i", &temp_value) == 1)
-            {
-                CFG_setStateFormat(temp_value);
-                continue;
-            }
-            if (sscanf(line, "useExtractedFileName=%i", &temp_value) == 1)
-            {
-                CFG_setUseExtractedFileName((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "muteLeds=%i", &temp_value) == 1)
-            {
-                CFG_setMuteLEDs(temp_value);
-                continue;
-            }
-            if (sscanf(line, "artWidth=%i", &temp_value) == 1)
-            {
-                CFG_setGameArtWidth((double)temp_value / 100.0);
-                continue;
-            }
-            if (sscanf(line, "wifi=%i", &temp_value) == 1)
-            {
-                CFG_setWifi((bool)temp_value);
-                continue;
-            }
-            if (sscanf(line, "defaultView=%i", &temp_value) == 1)
-            {
-                CFG_setDefaultView(temp_value);
-                continue;
-            }
-            if (sscanf(line, "quickSwitcherUi=%i", &temp_value) == 1)
-            {
-                CFG_setShowQuickswitcherUI(temp_value);
-                continue;
-            }
-            if (sscanf(line, "wifiDiagnostics=%i", &temp_value) == 1)
-            {
-                CFG_setWifiDiagnostics(temp_value);
-                continue;
-            }
-            if (sscanf(line, "bluetooth=%i", &temp_value) == 1)
-            {
-                CFG_setBluetooth(temp_value);
-                continue;
-            }
-            if (sscanf(line, "btDiagnostics=%i", &temp_value) == 1)
-            {
-                CFG_setBluetoothDiagnostics(temp_value);
-                continue;
-            }
-            if (sscanf(line, "btMaxRate=%i", &temp_value) == 1)
-            {
-                CFG_setBluetoothSamplingrateLimit(temp_value);
-                continue;
-            }
-        }
-        fclose(file);
-    }
-
-    // load gfx related stuff until we drop the indirection
-    CFG_setColor(1, CFG_getColor(1));
-    CFG_setColor(2, CFG_getColor(2));
-    CFG_setColor(3, CFG_getColor(3));
-    CFG_setColor(4, CFG_getColor(4));
-    CFG_setColor(5, CFG_getColor(5));
-    CFG_setColor(6, CFG_getColor(6));
-    CFG_setColor(7, CFG_getColor(7));
-    // avoid reloading the font if not neccessary
-    if (!fontLoaded)
-        CFG_setFontId(CFG_getFontId());
+	CFG_defaults(&settings);
+	settings.onFontChange = cb;
+	settings.onColorSet = ccb;
+	bool fontLoaded = false;
+
+	char settingsPath[MAX_PATH];
+	sprintf(settingsPath, "%s/minuisettings.txt", SHARED_USERDATA_PATH);
+	FILE *file = fopen(settingsPath, "r");
+	if (file == NULL) {
+		printf("[CFG] Unable to open settings file, loading defaults\n");
+	} else {
+		char line[256];
+		while (fgets(line, sizeof(line), file)) {
+			int temp_value;
+			uint32_t temp_color;
+			if (sscanf(line, "font=%i", &temp_value) == 1) {
+				CFG_setFontId(temp_value);
+				fontLoaded = true;
+				continue;
+			}
+			if (sscanf(line, "color1=%x", &temp_color) == 1) {
+				char hexColor[7];
+				snprintf(hexColor, sizeof(hexColor), "%06x", temp_color);
+				CFG_setColor(1, HexToUint32_unmapped(hexColor));
+				continue;
+			}
+			if (sscanf(line, "color2=%x", &temp_color) == 1) {
+				CFG_setColor(2, temp_color);
+				continue;
+			}
+			if (sscanf(line, "color3=%x", &temp_color) == 1) {
+				CFG_setColor(3, temp_color);
+				continue;
+			}
+			if (sscanf(line, "color4=%x", &temp_color) == 1) {
+				CFG_setColor(4, temp_color);
+				continue;
+			}
+			if (sscanf(line, "color5=%x", &temp_color) == 1) {
+				CFG_setColor(5, temp_color);
+				continue;
+			}
+			if (sscanf(line, "color6=%x", &temp_color) == 1) {
+				CFG_setColor(6, temp_color);
+				continue;
+			}
+			if (sscanf(line, "color7=%x", &temp_color) == 1) {
+				CFG_setColor(7, temp_color);
+				continue;
+			}
+			if (sscanf(line, "radius=%i", &temp_value) == 1) {
+				CFG_setThumbnailRadius(temp_value);
+				continue;
+			}
+			if (sscanf(line, "showclock=%i", &temp_value) == 1) {
+				CFG_setShowClock((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "clock24h=%i", &temp_value) == 1) {
+				CFG_setClock24H((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "batteryperc=%i", &temp_value) == 1) {
+				CFG_setShowBatteryPercent((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "menuanim=%i", &temp_value) == 1) {
+				CFG_setMenuAnimations((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "menutransitions=%i", &temp_value) == 1) {
+				CFG_setMenuTransitions((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "recents=%i", &temp_value) == 1) {
+				CFG_setShowRecents((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "tools=%i", &temp_value) == 1) {
+				CFG_setShowTools((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "gameart=%i", &temp_value) == 1) {
+				CFG_setShowGameArt((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "screentimeout=%i", &temp_value) == 1) {
+				CFG_setScreenTimeoutSecs(temp_value);
+				continue;
+			}
+			if (sscanf(line, "showfoldernamesatroot=%i", &temp_value) == 1) {
+				CFG_setShowFolderNamesAtRoot((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "suspendTimeout=%i", &temp_value) == 1) {
+				CFG_setSuspendTimeoutSecs(temp_value);
+				continue;
+			}
+			if (sscanf(line, "switcherscale=%i", &temp_value) == 1) {
+				CFG_setGameSwitcherScaling(temp_value);
+				continue;
+			}
+			if (sscanf(line, "haptics=%i", &temp_value) == 1) {
+				CFG_setHaptics((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "romfolderbg=%i", &temp_value) == 1) {
+				CFG_setRomsUseFolderBackground((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "saveFormat=%i", &temp_value) == 1) {
+				CFG_setSaveFormat(temp_value);
+				continue;
+			}
+			if (sscanf(line, "stateFormat=%i", &temp_value) == 1) {
+				CFG_setStateFormat(temp_value);
+				continue;
+			}
+			if (sscanf(line, "useExtractedFileName=%i", &temp_value) == 1) {
+				CFG_setUseExtractedFileName((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "muteLeds=%i", &temp_value) == 1) {
+				CFG_setMuteLEDs(temp_value);
+				continue;
+			}
+			if (sscanf(line, "artWidth=%i", &temp_value) == 1) {
+				CFG_setGameArtWidth((double)temp_value / 100.0);
+				continue;
+			}
+			if (sscanf(line, "wifi=%i", &temp_value) == 1) {
+				CFG_setWifi((bool)temp_value);
+				continue;
+			}
+			if (sscanf(line, "defaultView=%i", &temp_value) == 1) {
+				CFG_setDefaultView(temp_value);
+				continue;
+			}
+			if (sscanf(line, "quickSwitcherUi=%i", &temp_value) == 1) {
+				CFG_setShowQuickswitcherUI(temp_value);
+				continue;
+			}
+			if (sscanf(line, "wifiDiagnostics=%i", &temp_value) == 1) {
+				CFG_setWifiDiagnostics(temp_value);
+				continue;
+			}
+			if (sscanf(line, "bluetooth=%i", &temp_value) == 1) {
+				CFG_setBluetooth(temp_value);
+				continue;
+			}
+			if (sscanf(line, "btDiagnostics=%i", &temp_value) == 1) {
+				CFG_setBluetoothDiagnostics(temp_value);
+				continue;
+			}
+			if (sscanf(line, "btMaxRate=%i", &temp_value) == 1) {
+				CFG_setBluetoothSamplingrateLimit(temp_value);
+				continue;
+			}
+		}
+		fclose(file);
+	}
+
+	// load gfx related stuff until we drop the indirection
+	CFG_setColor(1, CFG_getColor(1));
+	CFG_setColor(2, CFG_getColor(2));
+	CFG_setColor(3, CFG_getColor(3));
+	CFG_setColor(4, CFG_getColor(4));
+	CFG_setColor(5, CFG_getColor(5));
+	CFG_setColor(6, CFG_getColor(6));
+	CFG_setColor(7, CFG_getColor(7));
+	// avoid reloading the font if not neccessary
+	if (!fontLoaded)
+		CFG_setFontId(CFG_getFontId());
 }
 
 int CFG_getFontId(void)
 {
-    return settings.font;
+	return settings.font;
 }
 
 void CFG_setFontId(int id)
 {
-    settings.font = clamp(id, 0, 2);
+	settings.font = clamp(id, 0, 2);
 
-    char *fontPath;
-    if (settings.font == 1)
-        fontPath = RES_PATH "/font1.ttf";
-    else
-        fontPath = RES_PATH "/font2.ttf";
+	char *fontPath;
+	if (settings.font == 1)
+		fontPath = RES_PATH "/font1.ttf";
+	else
+		fontPath = RES_PATH "/font2.ttf";
 
-    if(settings.onFontChange)
-        settings.onFontChange(fontPath);
+	if (settings.onFontChange)
+		settings.onFontChange(fontPath);
 }
 
 uint32_t CFG_getColor(int color_id)
 {
-    switch (color_id)
-    {
-    case 1:
-        return settings.color1_255;
-    case 2:
-        return settings.color2_255;
-    case 3:
-        return settings.color3_255;
-    case 4:
-        return settings.color4_255;
-    case 5:
-        return settings.color5_255;
-    case 6:
-        return settings.color6_255;
-    case 7:
-        return settings.color7_255;
-    default:
-        return 0;
-    }
+	switch (color_id) {
+	case 1:
+		return settings.color1_255;
+	case 2:
+		return settings.color2_255;
+	case 3:
+		return settings.color3_255;
+	case 4:
+		return settings.color4_255;
+	case 5:
+		return settings.color5_255;
+	case 6:
+		return settings.color6_255;
+	case 7:
+		return settings.color7_255;
+	default:
+		return 0;
+	}
 }
 
 void CFG_setColor(int color_id, uint32_t color)
 {
-    switch (color_id)
-    {
-    case 1:
-        settings.color1_255 = color;
-        THEME_COLOR1_255 = settings.color1_255;
-        break;
-    case 2:
-        settings.color2_255 = color;
-        THEME_COLOR2_255 = settings.color2_255;
-        break;
-    case 3:
-        settings.color3_255 = color;
-        THEME_COLOR3_255 = settings.color3_255;
-        break;
-    case 4:
-        settings.color4_255 = color;
-        THEME_COLOR4_255 = settings.color4_255;
-        break;
-    case 5:
-        settings.color5_255 = color;
-        THEME_COLOR5_255 = settings.color5_255;
-        break;
-    case 6:
-        settings.color6_255 = color;
-        THEME_COLOR6_255 = settings.color6_255;
-        break;
-    case 7:
-        settings.color7_255 = color;
-        THEME_COLOR7_255 = settings.color7_255;
-        break;
-    default:
-        break;
-    }
-
-    if(settings.onColorSet)
-        settings.onColorSet();
+	switch (color_id) {
+	case 1:
+		settings.color1_255 = color;
+		THEME_COLOR1_255 = settings.color1_255;
+		break;
+	case 2:
+		settings.color2_255 = color;
+		THEME_COLOR2_255 = settings.color2_255;
+		break;
+	case 3:
+		settings.color3_255 = color;
+		THEME_COLOR3_255 = settings.color3_255;
+		break;
+	case 4:
+		settings.color4_255 = color;
+		THEME_COLOR4_255 = settings.color4_255;
+		break;
+	case 5:
+		settings.color5_255 = color;
+		THEME_COLOR5_255 = settings.color5_255;
+		break;
+	case 6:
+		settings.color6_255 = color;
+		THEME_COLOR6_255 = settings.color6_255;
+		break;
+	case 7:
+		settings.color7_255 = color;
+		THEME_COLOR7_255 = settings.color7_255;
+		break;
+	default:
+		break;
+	}
+
+	if (settings.onColorSet)
+		settings.onColorSet();
 }
 
 bool CFG_getShowFolderNamesAtRoot(void)
 {
-    return settings.showFolderNamesAtRoot;
+	return settings.showFolderNamesAtRoot;
 }
 
 void CFG_setShowFolderNamesAtRoot(bool show)
 {
-    settings.showFolderNamesAtRoot = show;
+	settings.showFolderNamesAtRoot = show;
 	CFG_sync();
 }
 
 uint32_t CFG_getScreenTimeoutSecs(void)
 {
-    return settings.screenTimeoutSecs;
+	return settings.screenTimeoutSecs;
 }
 
 void CFG_setScreenTimeoutSecs(uint32_t secs)
 {
-    settings.screenTimeoutSecs = secs;
-    CFG_sync();
+	settings.screenTimeoutSecs = secs;
+	CFG_sync();
 }
 
 uint32_t CFG_getSuspendTimeoutSecs(void)
 {
-    return settings.suspendTimeoutSecs;
+	return settings.suspendTimeoutSecs;
 }
 
 void CFG_setSuspendTimeoutSecs(uint32_t secs)
 {
-    settings.suspendTimeoutSecs = secs;
-    CFG_sync();
+	settings.suspendTimeoutSecs = secs;
+	CFG_sync();
 }
 
 bool CFG_getShowClock(void)
 {
-    return settings.showClock;
+	return settings.showClock;
 }
 
 void CFG_setShowClock(bool show)
 {
-    settings.showClock = show;
-    CFG_sync();
+	settings.showClock = show;
+	CFG_sync();
 }
 
 bool CFG_getClock24H(void)
 {
-    return settings.clock24h;
+	return settings.clock24h;
 }
 
 void CFG_setClock24H(bool is24)
 {
-    settings.clock24h = is24;
-    CFG_sync();
+	settings.clock24h = is24;
+	CFG_sync();
 }
 
 bool CFG_getShowBatteryPercent(void)
 {
-    return settings.showBatteryPercent;
+	return settings.showBatteryPercent;
 }
 
 void CFG_setShowBatteryPercent(bool show)
 {
-    settings.showBatteryPercent = show;
-    CFG_sync();
+	settings.showBatteryPercent = show;
+	CFG_sync();
 }
 
 bool CFG_getMenuAnimations(void)
 {
-    return settings.showMenuAnimations;
+	return settings.showMenuAnimations;
 }
 
 void CFG_setMenuAnimations(bool show)
 {
-    settings.showMenuAnimations = show;
-    CFG_sync();
+	settings.showMenuAnimations = show;
+	CFG_sync();
 }
 
 bool CFG_getMenuTransitions(void)
 {
-    return settings.showMenuTransitions;
+	return settings.showMenuTransitions;
 }
 
 void CFG_setMenuTransitions(bool show)
 {
-    settings.showMenuTransitions = show;
-    CFG_sync();
+	settings.showMenuTransitions = show;
+	CFG_sync();
 }
 
 int CFG_getThumbnailRadius(void)
 {
-    return settings.thumbRadius;
+	return settings.thumbRadius;
 }
 
 void CFG_setThumbnailRadius(int radius)
 {
-    settings.thumbRadius = clamp(radius, 0, 24);
-    CFG_sync();
+	settings.thumbRadius = clamp(radius, 0, 24);
+	CFG_sync();
 }
 
 bool CFG_getShowRecents(void)
 {
-    return settings.showRecents;
+	return settings.showRecents;
 }
 
 void CFG_setShowRecents(bool show)
 {
-    settings.showRecents = show;
-    CFG_sync();
+	settings.showRecents = show;
+	CFG_sync();
 }
 
 bool CFG_getShowTools(void)
 {
-    return settings.showTools;
+	return settings.showTools;
 }
 
 void CFG_setShowTools(bool show)
 {
-    settings.showTools = show;
-    CFG_sync();
+	settings.showTools = show;
+	CFG_sync();
 }
 
 bool CFG_getShowGameArt(void)
 {
-    return settings.showGameArt;
+	return settings.showGameArt;
 }
 
 void CFG_setShowGameArt(bool show)
 {
-    settings.showGameArt = show;
-    CFG_sync();
+	settings.showGameArt = show;
+	CFG_sync();
 }
 
 bool CFG_getRomsUseFolderBackground(void)
 {
-    return settings.romsUseFolderBackground;
+	return settings.romsUseFolderBackground;
 }
 
 void CFG_setRomsUseFolderBackground(bool folder)
 {
-    settings.romsUseFolderBackground = folder;
-    CFG_sync();
+	settings.romsUseFolderBackground = folder;
+	CFG_sync();
 }
 
 int CFG_getGameSwitcherScaling(void)
 {
-    return settings.gameSwitcherScaling;
+	return settings.gameSwitcherScaling;
 }
 
 void CFG_setGameSwitcherScaling(int enumValue)
 {
-    settings.gameSwitcherScaling = clamp(enumValue, 0, GFX_SCALE_NUM_OPTIONS);
-    CFG_sync();
+	settings.gameSwitcherScaling = clamp(enumValue, 0, GFX_SCALE_NUM_OPTIONS);
+	CFG_sync();
 }
 
 bool CFG_getHaptics(void)
 {
-    return settings.haptics;
+	return settings.haptics;
 }
 
 void CFG_setHaptics(bool enable)
 {
-    settings.haptics = enable;
-    CFG_sync();
+	settings.haptics = enable;
+	CFG_sync();
 }
 
 int CFG_getSaveFormat(void)
 {
-    return settings.saveFormat;
+	return settings.saveFormat;
 }
 
 void CFG_setSaveFormat(int f)
 {
-    settings.saveFormat = f;
-    CFG_sync();
+	settings.saveFormat = f;
+	CFG_sync();
 }
 
 int CFG_getStateFormat(void)
 {
-    return settings.stateFormat;
+	return settings.stateFormat;
 }
 
 void CFG_setStateFormat(int f)
 {
-    settings.stateFormat = f;
-    CFG_sync();
+	settings.stateFormat = f;
+	CFG_sync();
 }
 
 bool CFG_getUseExtractedFileName(void)
 {
-    return settings.useExtractedFileName;
+	return settings.useExtractedFileName;
 }
 
 void CFG_setUseExtractedFileName(bool use)
 {
-    settings.useExtractedFileName = use;
-    CFG_sync();
+	settings.useExtractedFileName = use;
+	CFG_sync();
 }
 
 bool CFG_getMuteLEDs(void)
 {
-    return settings.muteLeds;
+	return settings.muteLeds;
 }
 
 void CFG_setMuteLEDs(bool on)
 {
-    settings.muteLeds = on;
-    CFG_sync();
+	settings.muteLeds = on;
+	CFG_sync();
 }
 
 double CFG_getGameArtWidth(void)
 {
-    return settings.gameArtWidth;
+	return settings.gameArtWidth;
 }
 
 void CFG_setGameArtWidth(double zeroToOne)
 {
-    settings.gameArtWidth = clampd(zeroToOne, 0.0, 1.0);
-    CFG_sync();
+	settings.gameArtWidth = clampd(zeroToOne, 0.0, 1.0);
+	CFG_sync();
 }
 
 bool CFG_getWifi(void)
 {
-    return settings.wifi;
+	return settings.wifi;
 }
 
 void CFG_setWifi(bool on)
 {
-    settings.wifi = on;
-    CFG_sync();
+	settings.wifi = on;
+	CFG_sync();
 }
 
 int CFG_getDefaultView(void)
 {
-    return settings.defaultView;
+	return settings.defaultView;
 }
 
 void CFG_setDefaultView(int view)
 {
-    settings.defaultView = view;
-    CFG_sync();
+	settings.defaultView = view;
+	CFG_sync();
 }
 
 bool CFG_getShowQuickswitcherUI(void)
 {
-    return settings.showQuickSwitcherUi;
+	return settings.showQuickSwitcherUi;
 }
 
 void CFG_setShowQuickswitcherUI(bool on)
 {
-    settings.showQuickSwitcherUi = on;
-    CFG_sync();
+	settings.showQuickSwitcherUi = on;
+	CFG_sync();
 }
 
 bool CFG_getWifiDiagnostics(void)
 {
-    return settings.wifiDiagnostics;
+	return settings.wifiDiagnostics;
 }
 
 void CFG_setWifiDiagnostics(bool on)
 {
-    settings.wifiDiagnostics = on;
-    CFG_sync();
+	settings.wifiDiagnostics = on;
+	CFG_sync();
 }
 
 bool CFG_getBluetooth(void)
 {
-    return settings.bluetooth;
+	return settings.bluetooth;
 }
 
 void CFG_setBluetooth(bool on)
 {
-    settings.bluetooth = on;
-    CFG_sync();
+	settings.bluetooth = on;
+	CFG_sync();
 }
 
 bool CFG_getBluetoothDiagnostics(void)
 {
-    return settings.bluetoothDiagnostics;
+	return settings.bluetoothDiagnostics;
 }
 
 void CFG_setBluetoothDiagnostics(bool on)
 {
-    settings.bluetoothDiagnostics = on;
-    CFG_sync();
+	settings.bluetoothDiagnostics = on;
+	CFG_sync();
 }
 
 int CFG_getBluetoothSamplingrateLimit(void)
 {
-    return settings.bluetoothSamplerateLimit;
+	return settings.bluetoothSamplerateLimit;
 }
 
 void CFG_setBluetoothSamplingrateLimit(int value)
 {
-    settings.bluetoothSamplerateLimit = value;
-    CFG_sync();
+	settings.bluetoothSamplerateLimit = value;
+	CFG_sync();
 }
 
 void CFG_get(const char *key, char *value)
 {
-    if (strcmp(key, "font") == 0)
-    {
-        sprintf(value, "%i", CFG_getFontId());
-    }
-    else if (strcmp(key, "color1") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(1));
-    }
-    else if (strcmp(key, "color2") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(2));
-    }
-    else if (strcmp(key, "color3") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(3));
-    }
-    else if (strcmp(key, "color4") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(4));
-    }
-    else if (strcmp(key, "color5") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(5));
-    }
-    else if (strcmp(key, "color6") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(6));
-    }
-    else if (strcmp(key, "color7") == 0)
-    {
-        sprintf(value, "\"0x%06X\"", CFG_getColor(7));
-    }
-    else if (strcmp(key, "radius") == 0)
-    {
-        sprintf(value, "%i", CFG_getThumbnailRadius());
-    }
-    else if (strcmp(key, "showclock") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowClock());
-    }
-    else if (strcmp(key, "clock24h") == 0)
-    {
-        sprintf(value, "%i", CFG_getClock24H());
-    }
-    else if (strcmp(key, "batteryperc") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowBatteryPercent());
-    }
-    else if (strcmp(key, "menuanim") == 0)
-    {
-        sprintf(value, "%i", CFG_getMenuAnimations());
-    }
-    else if (strcmp(key, "menutransitions") == 0)
-    {
-        sprintf(value, "%i", CFG_getMenuTransitions());
-    }
-    else if (strcmp(key, "recents") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowRecents());
-    }
-    else if (strcmp(key, "tools") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowTools());
-    }
-    else if (strcmp(key, "gameart") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowGameArt());
-    }
-	else if (strcmp(key, "showfoldernamesatroot") == 0)
-    {
-        sprintf(value, "%i", CFG_getShowFolderNamesAtRoot());
-    }
-    else if (strcmp(key, "screentimeout") == 0)
-    {
-        sprintf(value, "%i", CFG_getScreenTimeoutSecs());
-    }
-    else if (strcmp(key, "suspendTimeout") == 0)
-    {
-        sprintf(value, "%i", CFG_getSuspendTimeoutSecs());
-    }
-    else if (strcmp(key, "switcherscale") == 0)
-    {
-        sprintf(value, "%i", CFG_getGameSwitcherScaling());
-    }
-    else if (strcmp(key, "romfolderbg") == 0)
-    {
-        sprintf(value, "%i", CFG_getRomsUseFolderBackground());
-    }
-    else if (strcmp(key, "saveFormat") == 0)
-    {
-        sprintf(value, "%i", CFG_getSaveFormat());
-    }
-    else if (strcmp(key, "stateFormat") == 0)
-    {
-        sprintf(value, "%i", CFG_getStateFormat());
-    }
-    else if (strcmp(key, "useExtractedFileName") == 0)
-    {
-        sprintf(value, "%i", CFG_getUseExtractedFileName());
-    }
-    else if (strcmp(key, "muteLeds") == 0)
-    {
-        sprintf(value, "%i", CFG_getMuteLEDs());
-    }
-    else if (strcmp(key, "artWidth") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getGameArtWidth()) * 100);
-    }
-    else if (strcmp(key, "wifi") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getWifi()));
-    }
-    else if (strcmp(key, "defaultView") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getDefaultView()));
-    }
-    else if (strcmp(key, "quickSwitcherUi") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getShowQuickswitcherUI()));
-    }
-    else if (strcmp(key, "wifiDiagnostics") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getWifiDiagnostics()));
-    }
-    else if (strcmp(key, "bluetooth") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getBluetooth()));
-    }
-    else if (strcmp(key, "btDiagnostics") == 0)
-    {
-        sprintf(value, "%i", (int)(CFG_getBluetoothDiagnostics()));
-    }
-    else if (strcmp(key, "btMaxRate") == 0)
-    {
-        sprintf(value, "%i", CFG_getBluetoothSamplingrateLimit());
-    }
-
-    // meta, not a real setting
-    else if (strcmp(key, "fontpath") == 0)
-    {
-        if (CFG_getFontId() == 1)
-            sprintf(value, "\"%s\"", RES_PATH "/font1.ttf");
-        else
-            sprintf(value, "\"%s\"", RES_PATH "/font2.ttf");
-    }
-
-    else {
-        sprintf(value, "");
-    }
+	if (strcmp(key, "font") == 0) {
+		sprintf(value, "%i", CFG_getFontId());
+	} else if (strcmp(key, "color1") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(1));
+	} else if (strcmp(key, "color2") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(2));
+	} else if (strcmp(key, "color3") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(3));
+	} else if (strcmp(key, "color4") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(4));
+	} else if (strcmp(key, "color5") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(5));
+	} else if (strcmp(key, "color6") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(6));
+	} else if (strcmp(key, "color7") == 0) {
+		sprintf(value, "\"0x%06X\"", CFG_getColor(7));
+	} else if (strcmp(key, "radius") == 0) {
+		sprintf(value, "%i", CFG_getThumbnailRadius());
+	} else if (strcmp(key, "showclock") == 0) {
+		sprintf(value, "%i", CFG_getShowClock());
+	} else if (strcmp(key, "clock24h") == 0) {
+		sprintf(value, "%i", CFG_getClock24H());
+	} else if (strcmp(key, "batteryperc") == 0) {
+		sprintf(value, "%i", CFG_getShowBatteryPercent());
+	} else if (strcmp(key, "menuanim") == 0) {
+		sprintf(value, "%i", CFG_getMenuAnimations());
+	} else if (strcmp(key, "menutransitions") == 0) {
+		sprintf(value, "%i", CFG_getMenuTransitions());
+	} else if (strcmp(key, "recents") == 0) {
+		sprintf(value, "%i", CFG_getShowRecents());
+	} else if (strcmp(key, "tools") == 0) {
+		sprintf(value, "%i", CFG_getShowTools());
+	} else if (strcmp(key, "gameart") == 0) {
+		sprintf(value, "%i", CFG_getShowGameArt());
+	} else if (strcmp(key, "showfoldernamesatroot") == 0) {
+		sprintf(value, "%i", CFG_getShowFolderNamesAtRoot());
+	} else if (strcmp(key, "screentimeout") == 0) {
+		sprintf(value, "%i", CFG_getScreenTimeoutSecs());
+	} else if (strcmp(key, "suspendTimeout") == 0) {
+		sprintf(value, "%i", CFG_getSuspendTimeoutSecs());
+	} else if (strcmp(key, "switcherscale") == 0) {
+		sprintf(value, "%i", CFG_getGameSwitcherScaling());
+	} else if (strcmp(key, "romfolderbg") == 0) {
+		sprintf(value, "%i", CFG_getRomsUseFolderBackground());
+	} else if (strcmp(key, "saveFormat") == 0) {
+		sprintf(value, "%i", CFG_getSaveFormat());
+	} else if (strcmp(key, "stateFormat") == 0) {
+		sprintf(value, "%i", CFG_getStateFormat());
+	} else if (strcmp(key, "useExtractedFileName") == 0) {
+		sprintf(value, "%i", CFG_getUseExtractedFileName());
+	} else if (strcmp(key, "muteLeds") == 0) {
+		sprintf(value, "%i", CFG_getMuteLEDs());
+	} else if (strcmp(key, "artWidth") == 0) {
+		sprintf(value, "%i", (int)(CFG_getGameArtWidth()) * 100);
+	} else if (strcmp(key, "wifi") == 0) {
+		sprintf(value, "%i", (int)(CFG_getWifi()));
+	} else if (strcmp(key, "defaultView") == 0) {
+		sprintf(value, "%i", (int)(CFG_getDefaultView()));
+	} else if (strcmp(key, "quickSwitcherUi") == 0) {
+		sprintf(value, "%i", (int)(CFG_getShowQuickswitcherUI()));
+	} else if (strcmp(key, "wifiDiagnostics") == 0) {
+		sprintf(value, "%i", (int)(CFG_getWifiDiagnostics()));
+	} else if (strcmp(key, "bluetooth") == 0) {
+		sprintf(value, "%i", (int)(CFG_getBluetooth()));
+	} else if (strcmp(key, "btDiagnostics") == 0) {
+		sprintf(value, "%i", (int)(CFG_getBluetoothDiagnostics()));
+	} else if (strcmp(key, "btMaxRate") == 0) {
+		sprintf(value, "%i", CFG_getBluetoothSamplingrateLimit());
+	}
+
+	// meta, not a real setting
+	else if (strcmp(key, "fontpath") == 0) {
+		if (CFG_getFontId() == 1)
+			sprintf(value, "\"%s\"", RES_PATH "/font1.ttf");
+		else
+			sprintf(value, "\"%s\"", RES_PATH "/font2.ttf");
+	}
+
+	else {
+		sprintf(value, "");
+	}
 }
 
 void CFG_sync(void)
 {
-    // write to file
-    char settingsPath[MAX_PATH];
-    sprintf(settingsPath, "%s/minuisettings.txt", getenv("SHARED_USERDATA_PATH"));
-    FILE *file = fopen(settingsPath, "w");
-    if (file == NULL)
-    {
-        printf("[CFG] Unable to open settings file, cant write\n");
-        return;
-    }
-
-    fprintf(file, "font=%i\n", settings.font);
-    fprintf(file, "color1=0x%06X\n", settings.color1_255);
-    fprintf(file, "color2=0x%06X\n", settings.color2_255);
-    fprintf(file, "color3=0x%06X\n", settings.color3_255);
-    fprintf(file, "color4=0x%06X\n", settings.color4_255);
-    fprintf(file, "color5=0x%06X\n", settings.color5_255);
-    fprintf(file, "color6=0x%06X\n", settings.color6_255);
-    fprintf(file, "color7=0x%06X\n", settings.color7_255);
-    fprintf(file, "radius=%i\n", settings.thumbRadius);
-    fprintf(file, "showclock=%i\n", settings.showClock);
-    fprintf(file, "clock24h=%i\n", settings.clock24h);
-    fprintf(file, "batteryperc=%i\n", settings.showBatteryPercent);
-    fprintf(file, "menuanim=%i\n", settings.showMenuAnimations);
-    fprintf(file, "menutransitions=%i\n", settings.showMenuTransitions);
-    fprintf(file, "recents=%i\n", settings.showRecents);
-    fprintf(file, "tools=%i\n", settings.showTools);
-    fprintf(file, "gameart=%i\n", settings.showGameArt);
-    fprintf(file, "showfoldernamesatroot=%i\n", settings.showFolderNamesAtRoot);
-    fprintf(file, "screentimeout=%i\n", settings.screenTimeoutSecs);
-    fprintf(file, "suspendTimeout=%i\n", settings.suspendTimeoutSecs);
-    fprintf(file, "switcherscale=%i\n", settings.gameSwitcherScaling);
-    fprintf(file, "haptics=%i\n", settings.haptics);
-    fprintf(file, "romfolderbg=%i\n", settings.romsUseFolderBackground);
-    fprintf(file, "saveFormat=%i\n", settings.saveFormat);
-    fprintf(file, "stateFormat=%i\n", settings.stateFormat);
-    fprintf(file, "useExtractedFileName=%i\n", settings.useExtractedFileName);
-    fprintf(file, "muteLeds=%i\n", settings.muteLeds);
-    fprintf(file, "artWidth=%i\n", (int)(settings.gameArtWidth * 100));
-    fprintf(file, "wifi=%i\n", settings.wifi);
-    fprintf(file, "defaultView=%i\n", settings.defaultView);
-    fprintf(file, "quickSwitcherUi=%i\n", settings.showQuickSwitcherUi);
-    fprintf(file, "wifiDiagnostics=%i\n", settings.wifiDiagnostics);
-    fprintf(file, "bluetooth=%i\n", settings.bluetooth);
-    fprintf(file, "btDiagnostics=%i\n", settings.bluetoothDiagnostics);
-    fprintf(file, "btMaxRate=%i\n", settings.bluetoothSamplerateLimit);
-
-    fclose(file);
+	// write to file
+	char settingsPath[MAX_PATH];
+	sprintf(settingsPath, "%s/minuisettings.txt", getenv("SHARED_USERDATA_PATH"));
+	FILE *file = fopen(settingsPath, "w");
+	if (file == NULL) {
+		printf("[CFG] Unable to open settings file, cant write\n");
+		return;
+	}
+
+	fprintf(file, "font=%i\n", settings.font);
+	fprintf(file, "color1=0x%06X\n", settings.color1_255);
+	fprintf(file, "color2=0x%06X\n", settings.color2_255);
+	fprintf(file, "color3=0x%06X\n", settings.color3_255);
+	fprintf(file, "color4=0x%06X\n", settings.color4_255);
+	fprintf(file, "color5=0x%06X\n", settings.color5_255);
+	fprintf(file, "color6=0x%06X\n", settings.color6_255);
+	fprintf(file, "color7=0x%06X\n", settings.color7_255);
+	fprintf(file, "radius=%i\n", settings.thumbRadius);
+	fprintf(file, "showclock=%i\n", settings.showClock);
+	fprintf(file, "clock24h=%i\n", settings.clock24h);
+	fprintf(file, "batteryperc=%i\n", settings.showBatteryPercent);
+	fprintf(file, "menuanim=%i\n", settings.showMenuAnimations);
+	fprintf(file, "menutransitions=%i\n", settings.showMenuTransitions);
+	fprintf(file, "recents=%i\n", settings.showRecents);
+	fprintf(file, "tools=%i\n", settings.showTools);
+	fprintf(file, "gameart=%i\n", settings.showGameArt);
+	fprintf(file, "showfoldernamesatroot=%i\n", settings.showFolderNamesAtRoot);
+	fprintf(file, "screentimeout=%i\n", settings.screenTimeoutSecs);
+	fprintf(file, "suspendTimeout=%i\n", settings.suspendTimeoutSecs);
+	fprintf(file, "switcherscale=%i\n", settings.gameSwitcherScaling);
+	fprintf(file, "haptics=%i\n", settings.haptics);
+	fprintf(file, "romfolderbg=%i\n", settings.romsUseFolderBackground);
+	fprintf(file, "saveFormat=%i\n", settings.saveFormat);
+	fprintf(file, "stateFormat=%i\n", settings.stateFormat);
+	fprintf(file, "useExtractedFileName=%i\n", settings.useExtractedFileName);
+	fprintf(file, "muteLeds=%i\n", settings.muteLeds);
+	fprintf(file, "artWidth=%i\n", (int)(settings.gameArtWidth * 100));
+	fprintf(file, "wifi=%i\n", settings.wifi);
+	fprintf(file, "defaultView=%i\n", settings.defaultView);
+	fprintf(file, "quickSwitcherUi=%i\n", settings.showQuickSwitcherUi);
+	fprintf(file, "wifiDiagnostics=%i\n", settings.wifiDiagnostics);
+	fprintf(file, "bluetooth=%i\n", settings.bluetooth);
+	fprintf(file, "btDiagnostics=%i\n", settings.bluetoothDiagnostics);
+	fprintf(file, "btMaxRate=%i\n", settings.bluetoothSamplerateLimit);
+
+	fclose(file);
 }
 
 void CFG_print(void)
 {
-    printf("{\n");
-    printf("\t\"font\": %i,\n", settings.font);
-    printf("\t\"color1\": \"0x%06X\",\n", settings.color1_255);
-    printf("\t\"color2\": \"0x%06X\",\n", settings.color2_255);
-    printf("\t\"color3\": \"0x%06X\",\n", settings.color3_255);
-    printf("\t\"color4\": \"0x%06X\",\n", settings.color4_255);
-    printf("\t\"color5\": \"0x%06X\",\n", settings.color5_255);
-    printf("\t\"color6\": \"0x%06X\",\n", settings.color6_255);
-    printf("\t\"color7\": \"0x%06X\",\n", settings.color7_255);
-    printf("\t\"radius\": %i,\n", settings.thumbRadius);
-    printf("\t\"showclock\": %i,\n", settings.showClock);
-    printf("\t\"clock24h\": %i,\n", settings.clock24h);
-    printf("\t\"batteryperc\": %i,\n", settings.showBatteryPercent);
-    printf("\t\"menuanim\": %i,\n", settings.showMenuAnimations);
-    printf("\t\"menutransitions\": %i,\n", settings.showMenuTransitions);
-    printf("\t\"recents\": %i,\n", settings.showRecents);
-    printf("\t\"tools\": %i,\n", settings.showTools);
-    printf("\t\"gameart\": %i,\n", settings.showGameArt);
+	printf("{\n");
+	printf("\t\"font\": %i,\n", settings.font);
+	printf("\t\"color1\": \"0x%06X\",\n", settings.color1_255);
+	printf("\t\"color2\": \"0x%06X\",\n", settings.color2_255);
+	printf("\t\"color3\": \"0x%06X\",\n", settings.color3_255);
+	printf("\t\"color4\": \"0x%06X\",\n", settings.color4_255);
+	printf("\t\"color5\": \"0x%06X\",\n", settings.color5_255);
+	printf("\t\"color6\": \"0x%06X\",\n", settings.color6_255);
+	printf("\t\"color7\": \"0x%06X\",\n", settings.color7_255);
+	printf("\t\"radius\": %i,\n", settings.thumbRadius);
+	printf("\t\"showclock\": %i,\n", settings.showClock);
+	printf("\t\"clock24h\": %i,\n", settings.clock24h);
+	printf("\t\"batteryperc\": %i,\n", settings.showBatteryPercent);
+	printf("\t\"menuanim\": %i,\n", settings.showMenuAnimations);
+	printf("\t\"menutransitions\": %i,\n", settings.showMenuTransitions);
+	printf("\t\"recents\": %i,\n", settings.showRecents);
+	printf("\t\"tools\": %i,\n", settings.showTools);
+	printf("\t\"gameart\": %i,\n", settings.showGameArt);
 	printf("\t\"showfoldernamesatroot\": %i,\n", settings.showFolderNamesAtRoot);
-    printf("\t\"screentimeout\": %i,\n", settings.screenTimeoutSecs);
-    printf("\t\"suspendTimeout\": %i,\n", settings.suspendTimeoutSecs);
-    printf("\t\"switcherscale\": %i,\n", settings.gameSwitcherScaling);
-    printf("\t\"haptics\": %i,\n", settings.haptics);
-    printf("\t\"romfolderbg\": %i,\n", settings.romsUseFolderBackground);
-    printf("\t\"saveFormat\": %i,\n", settings.saveFormat);
-    printf("\t\"stateFormat\": %i,\n", settings.stateFormat);
-    printf("\t\"useExtractedFileName\": %i,\n", settings.useExtractedFileName);
-    printf("\t\"muteLeds\": %i,\n", settings.muteLeds);
-    printf("\t\"artWidth\": %i,\n", (int)(settings.gameArtWidth * 100));
-    printf("\t\"wifi\": %i,\n", settings.wifi);
-    printf("\t\"defaultView\": %i,\n", settings.defaultView);
-    printf("\t\"quickSwitcherUi\": %i,\n", settings.showQuickSwitcherUi);
-    printf("\t\"wifiDiagnostics\": %i,\n", settings.wifiDiagnostics);
-    printf("\t\"bluetooth\": %i,\n", settings.bluetooth);
-    printf("\t\"btDiagnostics\": %i,\n", settings.bluetoothDiagnostics);
-    printf("\t\"btMaxRate\": %i,\n", settings.bluetoothSamplerateLimit);
-
-    // meta, not a real setting
-    if (settings.font == 1)
-        printf("\t\"fontpath\": \"%s\"\n", RES_PATH "/font1.ttf");
-    else
-        printf("\t\"fontpath\": \"%s\"\n", RES_PATH "/font2.ttf");
-
-    printf("}\n");
+	printf("\t\"screentimeout\": %i,\n", settings.screenTimeoutSecs);
+	printf("\t\"suspendTimeout\": %i,\n", settings.suspendTimeoutSecs);
+	printf("\t\"switcherscale\": %i,\n", settings.gameSwitcherScaling);
+	printf("\t\"haptics\": %i,\n", settings.haptics);
+	printf("\t\"romfolderbg\": %i,\n", settings.romsUseFolderBackground);
+	printf("\t\"saveFormat\": %i,\n", settings.saveFormat);
+	printf("\t\"stateFormat\": %i,\n", settings.stateFormat);
+	printf("\t\"useExtractedFileName\": %i,\n", settings.useExtractedFileName);
+	printf("\t\"muteLeds\": %i,\n", settings.muteLeds);
+	printf("\t\"artWidth\": %i,\n", (int)(settings.gameArtWidth * 100));
+	printf("\t\"wifi\": %i,\n", settings.wifi);
+	printf("\t\"defaultView\": %i,\n", settings.defaultView);
+	printf("\t\"quickSwitcherUi\": %i,\n", settings.showQuickSwitcherUi);
+	printf("\t\"wifiDiagnostics\": %i,\n", settings.wifiDiagnostics);
+	printf("\t\"bluetooth\": %i,\n", settings.bluetooth);
+	printf("\t\"btDiagnostics\": %i,\n", settings.bluetoothDiagnostics);
+	printf("\t\"btMaxRate\": %i,\n", settings.bluetoothSamplerateLimit);
+
+	// meta, not a real setting
+	if (settings.font == 1)
+		printf("\t\"fontpath\": \"%s\"\n", RES_PATH "/font1.ttf");
+	else
+		printf("\t\"fontpath\": \"%s\"\n", RES_PATH "/font2.ttf");
+
+	printf("}\n");
 }
 
 void CFG_quit(void)
 {
-    CFG_sync();
+	CFG_sync();
 }
\ No newline at end of file
diff --git a/workspace/all/common/config.h b/workspace/all/common/config.h
index 64d663cbc..ca8ca2df9 100644
--- a/workspace/all/common/config.h
+++ b/workspace/all/common/config.h
@@ -16,32 +16,30 @@ extern uint32_t THEME_COLOR7_255;
 // Read-only interface for minui.c usage
 // Read/Write interface for settings.cpp usage
 
-typedef int (*FontLoad_callback_t)(const char* path);
+typedef int (*FontLoad_callback_t)(const char *path);
 typedef int (*ColorSet_callback_t)(void);
 
-enum
-{
+enum {
 	// MinUI: Game.gba.sav
 	SAVE_FORMAT_SAV,
-	//Retroarch: Game.srm
+	// Retroarch: Game.srm
 	SAVE_FORMAT_SRM,
 	// Generic: Game.sav
 	SAVE_FORMAT_GEN,
-	//Retroarch: Game.srm
+	// Retroarch: Game.srm
 	SAVE_FORMAT_SRM_UNCOMPRESSED
 };
 
-enum
-{
+enum {
 	// MinUI: Game.st0
 	STATE_FORMAT_SAV,
-	//Retroarch-ish: Game.state.<n> (a typo, but keeping it to avoid a breaking change)
+	// Retroarch-ish: Game.state.<n> (a typo, but keeping it to avoid a breaking change)
 	STATE_FORMAT_SRM_EXTRADOT,
-	//Retroarch-ish: Game.state.<n> (a typo, but keeping it to avoid a breaking change)
+	// Retroarch-ish: Game.state.<n> (a typo, but keeping it to avoid a breaking change)
 	STATE_FORMAT_SRM_UNCOMRESSED_EXTRADOT,
-	//Retroarch: Game.state<n>
+	// Retroarch: Game.state<n>
 	STATE_FORMAT_SRM,
-	//Retroarch: Game.state<n>
+	// Retroarch: Game.state<n>
 	STATE_FORMAT_SRM_UNCOMRESSED
 };
 
@@ -55,8 +53,7 @@ enum {
 	SCREEN_OFF
 };
 
-typedef struct
-{
+typedef struct {
 	// Theme
 	int font;
 	uint32_t color1_255; // not screen mapped
@@ -71,12 +68,12 @@ typedef struct
 	double gameArtWidth;	 // [0,1] -> 0-100% of screen width
 
 	// font loading/unloading callback
-    FontLoad_callback_t onFontChange;
+	FontLoad_callback_t onFontChange;
 
-    // color update callback
-    ColorSet_callback_t onColorSet;
+	// color update callback
+	ColorSet_callback_t onColorSet;
 
-    // UI
+	// UI
 	bool showClock;
 	bool clock24h;
 	bool showBatteryPercent;
@@ -114,7 +111,7 @@ typedef struct
 
 } NextUISettings;
 
-#define CFG_DEFAULT_FONT_ID 1  // Next
+#define CFG_DEFAULT_FONT_ID 1 // Next
 #define CFG_DEFAULT_COLOR1 0xffffffU
 #define CFG_DEFAULT_COLOR2 0x9b2257U
 #define CFG_DEFAULT_COLOR3 0x1e2329U
@@ -152,7 +149,7 @@ typedef struct
 
 void CFG_init(FontLoad_callback_t fontCallback, ColorSet_callback_t ccb);
 void CFG_print(void);
-void CFG_get(const char *key, char * value);
+void CFG_get(const char *key, char *value);
 // void CFG_defaults(NextUISettings*);
 //  The font id to use as the UI font.
 //  0 - Default MinUI font
diff --git a/workspace/all/common/defines.h b/workspace/all/common/defines.h
index ba5bf08f0..5991e45d5 100644
--- a/workspace/all/common/defines.h
+++ b/workspace/all/common/defines.h
@@ -3,12 +3,12 @@
 
 #include "platform.h"
 
-#define VOLUME_MIN 		0
-#define VOLUME_MAX 		20
-#define BRIGHTNESS_MIN 	0
-#define BRIGHTNESS_MAX 	10
-#define COLORTEMP_MIN 	0
-#define COLORTEMP_MAX 	40
+#define VOLUME_MIN 0
+#define VOLUME_MAX 20
+#define BRIGHTNESS_MIN 0
+#define BRIGHTNESS_MAX 10
+#define COLORTEMP_MIN 0
+#define COLORTEMP_MAX 40
 
 #define STR_MAX 256
 #define MAX_PATH 512
@@ -36,21 +36,45 @@
 #define RESUME_SLOT_PATH "/tmp/resume_slot.txt"
 #define NOUI_PATH "/tmp/noui"
 
-#define TRIAD_WHITE 		0xff,0xff,0xff
-#define TRIAD_BLACK 		0x00,0x00,0x00
-#define TRIAD_LIGHT_GRAY 	0x7f,0x7f,0x7f
-#define TRIAD_GRAY 			0x99,0x99,0x99
-#define TRIAD_DARK_GRAY 	0x26,0x26,0x26
-
-#define TRIAD_LIGHT_TEXT 	0xcc,0xcc,0xcc
-#define TRIAD_DARK_TEXT 	0x66,0x66,0x66
-
-#define COLOR_WHITE			(SDL_Color){TRIAD_WHITE}
-#define COLOR_GRAY			(SDL_Color){TRIAD_GRAY}
-#define COLOR_BLACK			(SDL_Color){TRIAD_BLACK}
-#define COLOR_LIGHT_TEXT	(SDL_Color){TRIAD_LIGHT_TEXT}
-#define COLOR_DARK_TEXT		(SDL_Color){TRIAD_DARK_TEXT}
-#define COLOR_BUTTON_TEXT	(SDL_Color){TRIAD_GRAY}
+#define TRIAD_WHITE 0xff, 0xff, 0xff
+#define TRIAD_BLACK 0x00, 0x00, 0x00
+#define TRIAD_LIGHT_GRAY 0x7f, 0x7f, 0x7f
+#define TRIAD_GRAY 0x99, 0x99, 0x99
+#define TRIAD_DARK_GRAY 0x26, 0x26, 0x26
+
+#define TRIAD_LIGHT_TEXT 0xcc, 0xcc, 0xcc
+#define TRIAD_DARK_TEXT 0x66, 0x66, 0x66
+
+#define COLOR_WHITE                                                                                                    \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_WHITE                                                                                                    \
+	}
+#define COLOR_GRAY                                                                                                     \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_GRAY                                                                                                     \
+	}
+#define COLOR_BLACK                                                                                                    \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_BLACK                                                                                                    \
+	}
+#define COLOR_LIGHT_TEXT                                                                                               \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_LIGHT_TEXT                                                                                               \
+	}
+#define COLOR_DARK_TEXT                                                                                                \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_DARK_TEXT                                                                                                \
+	}
+#define COLOR_BUTTON_TEXT                                                                                              \
+	(SDL_Color)                                                                                                        \
+	{                                                                                                                  \
+		TRIAD_GRAY                                                                                                     \
+	}
 
 // all before scale
 #define PILL_SIZE 30
@@ -72,11 +96,11 @@
 #define PADDING 10 // PILL_SIZE / 3 (or non-integer part of the previous calculatiom divided by three)
 #endif
 
-#define FONT_LARGE 16 	// menu
-#define FONT_MEDIUM 14 	// single char button label
-#define FONT_SMALL 12	// button hint
-#define FONT_TINY 10	// multi char button label
-#define FONT_MICRO 7	// icon overlay text
+#define FONT_LARGE 16  // menu
+#define FONT_MEDIUM 14 // single char button label
+#define FONT_SMALL 12  // button hint
+#define FONT_TINY 10   // multi char button label
+#define FONT_MICRO 7   // icon overlay text
 
 #ifndef MAX_LIGHTS
 #define MAX_LIGHTS 0
@@ -84,12 +108,11 @@
 #ifndef MAXSHADERS
 #define MAXSHADERS 3
 #endif
-enum
-{
+enum {
 	GFX_SCALE_FULLSCREEN = 0,
 	GFX_SCALE_FIT,
 	GFX_SCALE_FILL,
-	GFX_SCALE_NUM_OPTIONS // do not use 
+	GFX_SCALE_NUM_OPTIONS // do not use
 };
 
 ///////////////////////////////
@@ -99,26 +122,26 @@ enum
 
 #define MAX(a, b) (a) > (b) ? (a) : (b)
 #define MIN(a, b) (a) < (b) ? (a) : (b)
-#define CEIL_DIV(a,b) ((a) + (b) - 1) / (b)
+#define CEIL_DIV(a, b) ((a) + (b) - 1) / (b)
 
-#define SCALE1(a) ((a)*FIXED_SCALE)
-#define SCALE2(a,b) ((a)*FIXED_SCALE),((b)*FIXED_SCALE)
-#define SCALE3(a,b,c) ((a)*FIXED_SCALE),((b)*FIXED_SCALE),((c)*FIXED_SCALE)
-#define SCALE4(a,b,c,d) ((a)*FIXED_SCALE),((b)*FIXED_SCALE),((c)*FIXED_SCALE),((d)*FIXED_SCALE)
+#define SCALE1(a) ((a) * FIXED_SCALE)
+#define SCALE2(a, b) ((a) * FIXED_SCALE), ((b) * FIXED_SCALE)
+#define SCALE3(a, b, c) ((a) * FIXED_SCALE), ((b) * FIXED_SCALE), ((c) * FIXED_SCALE)
+#define SCALE4(a, b, c, d) ((a) * FIXED_SCALE), ((b) * FIXED_SCALE), ((c) * FIXED_SCALE), ((d) * FIXED_SCALE)
 
 ///////////////////////////////
 
-#define HAS_POWER_BUTTON (BUTTON_POWER!=BUTTON_NA||CODE_POWER!=CODE_NA||JOY_POWER!=JOY_NA)
-#define HAS_POWEROFF_BUTTON (BUTTON_POWEROFF!=BUTTON_NA)
-#define HAS_MENU_BUTTON (BUTTON_MENU!=BUTTON_NA||CODE_MENU!=CODE_NA||JOY_MENU!=JOY_NA)
-#define HAS_SKINNY_SCREEN (FIXED_WIDTH<320)
+#define HAS_POWER_BUTTON (BUTTON_POWER != BUTTON_NA || CODE_POWER != CODE_NA || JOY_POWER != JOY_NA)
+#define HAS_POWEROFF_BUTTON (BUTTON_POWEROFF != BUTTON_NA)
+#define HAS_MENU_BUTTON (BUTTON_MENU != BUTTON_NA || CODE_MENU != CODE_NA || JOY_MENU != JOY_NA)
+#define HAS_SKINNY_SCREEN (FIXED_WIDTH < 320)
 
 ///////////////////////////////
 
-#define BUTTON_NA	-1
-#define CODE_NA		-1
-#define JOY_NA		-1
-#define AXIS_NA		-1
+#define BUTTON_NA -1
+#define CODE_NA -1
+#define JOY_NA -1
+#define AXIS_NA -1
 
 #ifndef BUTTON_POWEROFF
 #define BUTTON_POWEROFF BUTTON_NA
@@ -142,22 +165,22 @@ enum
 #endif
 
 #ifndef AXIS_L2
-#define AXIS_L2	AXIS_NA
-#define AXIS_R2	AXIS_NA
-#endif 
+#define AXIS_L2 AXIS_NA
+#define AXIS_R2 AXIS_NA
+#endif
 
 #ifndef AXIS_LX
-#define AXIS_LX	AXIS_NA
-#define AXIS_LY	AXIS_NA
-#define AXIS_RX	AXIS_NA
-#define AXIS_RY	AXIS_NA
-#endif 
+#define AXIS_LX AXIS_NA
+#define AXIS_LY AXIS_NA
+#define AXIS_RX AXIS_NA
+#define AXIS_RY AXIS_NA
+#endif
 
 #ifndef HAS_HDMI
-#define HDMI_WIDTH	FIXED_WIDTH
-#define HDMI_HEIGHT	FIXED_HEIGHT
-#define HDMI_PITCH	FIXED_PITCH
-#define HDMI_SIZE	FIXED_SIZE
+#define HDMI_WIDTH FIXED_WIDTH
+#define HDMI_HEIGHT FIXED_HEIGHT
+#define HDMI_PITCH FIXED_PITCH
+#define HDMI_SIZE FIXED_SIZE
 #endif
 
 #ifndef BTN_A // prevent collisions with input.h in keymon
@@ -183,7 +206,7 @@ enum {
 	BTN_ID_MENU,
 	BTN_ID_PLUS,
 	BTN_ID_MINUS,
-	BTN_ID_POWER,	
+	BTN_ID_POWER,
 	BTN_ID_POWEROFF,
 
 	BTN_ID_ANALOG_UP,
@@ -194,38 +217,38 @@ enum {
 	BTN_ID_COUNT,
 };
 enum {
-	BTN_NONE		= 0,
-	BTN_DPAD_UP 	= 1 << BTN_ID_DPAD_UP,
-	BTN_DPAD_DOWN	= 1 << BTN_ID_DPAD_DOWN,
-	BTN_DPAD_LEFT	= 1 << BTN_ID_DPAD_LEFT,
-	BTN_DPAD_RIGHT	= 1 << BTN_ID_DPAD_RIGHT,
-	BTN_A			= 1 << BTN_ID_A,
-	BTN_B			= 1 << BTN_ID_B,
-	BTN_X			= 1 << BTN_ID_X,
-	BTN_Y			= 1 << BTN_ID_Y,
-	BTN_START		= 1 << BTN_ID_START,
-	BTN_SELECT		= 1 << BTN_ID_SELECT,
-	BTN_L1			= 1 << BTN_ID_L1,
-	BTN_R1			= 1 << BTN_ID_R1,
-	BTN_L2			= 1 << BTN_ID_L2,
-	BTN_R2			= 1 << BTN_ID_R2,
-	BTN_L3			= 1 << BTN_ID_L3,
-	BTN_R3			= 1 << BTN_ID_R3,
-	BTN_MENU		= 1 << BTN_ID_MENU,
-	BTN_PLUS		= 1 << BTN_ID_PLUS,
-	BTN_MINUS		= 1 << BTN_ID_MINUS,
-	BTN_POWER		= 1 << BTN_ID_POWER,
-	BTN_POWEROFF	= 1 << BTN_ID_POWEROFF,
-
-	BTN_ANALOG_UP 	= 1 << BTN_ID_ANALOG_UP,
-	BTN_ANALOG_DOWN	= 1 << BTN_ID_ANALOG_DOWN,
-	BTN_ANALOG_LEFT	= 1 << BTN_ID_ANALOG_LEFT,
-	BTN_ANALOG_RIGHT= 1 << BTN_ID_ANALOG_RIGHT,
-	
-	BTN_UP 		= BTN_DPAD_UP | BTN_ANALOG_UP,
-	BTN_DOWN 	= BTN_DPAD_DOWN | BTN_ANALOG_DOWN,
-	BTN_LEFT	= BTN_DPAD_LEFT | BTN_ANALOG_LEFT,
-	BTN_RIGHT	= BTN_DPAD_RIGHT | BTN_ANALOG_RIGHT,
+	BTN_NONE = 0,
+	BTN_DPAD_UP = 1 << BTN_ID_DPAD_UP,
+	BTN_DPAD_DOWN = 1 << BTN_ID_DPAD_DOWN,
+	BTN_DPAD_LEFT = 1 << BTN_ID_DPAD_LEFT,
+	BTN_DPAD_RIGHT = 1 << BTN_ID_DPAD_RIGHT,
+	BTN_A = 1 << BTN_ID_A,
+	BTN_B = 1 << BTN_ID_B,
+	BTN_X = 1 << BTN_ID_X,
+	BTN_Y = 1 << BTN_ID_Y,
+	BTN_START = 1 << BTN_ID_START,
+	BTN_SELECT = 1 << BTN_ID_SELECT,
+	BTN_L1 = 1 << BTN_ID_L1,
+	BTN_R1 = 1 << BTN_ID_R1,
+	BTN_L2 = 1 << BTN_ID_L2,
+	BTN_R2 = 1 << BTN_ID_R2,
+	BTN_L3 = 1 << BTN_ID_L3,
+	BTN_R3 = 1 << BTN_ID_R3,
+	BTN_MENU = 1 << BTN_ID_MENU,
+	BTN_PLUS = 1 << BTN_ID_PLUS,
+	BTN_MINUS = 1 << BTN_ID_MINUS,
+	BTN_POWER = 1 << BTN_ID_POWER,
+	BTN_POWEROFF = 1 << BTN_ID_POWEROFF,
+
+	BTN_ANALOG_UP = 1 << BTN_ID_ANALOG_UP,
+	BTN_ANALOG_DOWN = 1 << BTN_ID_ANALOG_DOWN,
+	BTN_ANALOG_LEFT = 1 << BTN_ID_ANALOG_LEFT,
+	BTN_ANALOG_RIGHT = 1 << BTN_ID_ANALOG_RIGHT,
+
+	BTN_UP = BTN_DPAD_UP | BTN_ANALOG_UP,
+	BTN_DOWN = BTN_DPAD_DOWN | BTN_ANALOG_DOWN,
+	BTN_LEFT = BTN_DPAD_LEFT | BTN_ANALOG_LEFT,
+	BTN_RIGHT = BTN_DPAD_RIGHT | BTN_ANALOG_RIGHT,
 };
 #endif
 
diff --git a/workspace/all/common/scaler.c b/workspace/all/common/scaler.c
index 1ca94ef19..4f6ffbc63 100644
--- a/workspace/all/common/scaler.c
+++ b/workspace/all/common/scaler.c
@@ -21,2954 +21,3781 @@
 //	if odd#, then handled by the C scaler
 //
 
-static void dummy(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {}
+static void dummy(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+}
 
-// 
+//
 // C scalers for Trimui Model S and GKD Pixel
 //
-void scale1x_c16to32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=2; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=2) {
+void scale1x_c16to32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+					 uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 2;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 2) {
 			pix = s[x];
 			dpix1 = 0xFF000000 | ((pix & 0xF800) << 8) | ((pix & 0x07E0) << 5) | ((pix & 0x001F) << 3);
-			dpix2 = 0xFF000000 | ((pix & 0xF8000000) >> 8) | ((pix & 0x07E00000) >> 11) | ((pix & 0x001F0000) >> 13);			d[dx  ] = dpix1; d[dx+1] = dpix1;
-			d[dx  ] = dpix1; d[dx+1] = dpix2;
+			dpix2 = 0xFF000000 | ((pix & 0xF8000000) >> 8) | ((pix & 0x07E00000) >> 11) | ((pix & 0x001F0000) >> 13);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx] = dpix1;
+			d[dx + 1] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t pix16 = s16[x*2];
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t pix16 = s16[x * 2];
 			pix16 = 0xFF000000 | ((pix16 & 0xF800) << 8) | ((pix16 & 0x07E0) << 5) | ((pix16 & 0x001F) << 3);
-			d[dx  ] = pix16; d[dx+1] = pix16;
+			d[dx] = pix16;
+			d[dx + 1] = pix16;
 		}
-		dst = (uint8_t*)dst+dp;
+		dst = (uint8_t *)dst + dp;
 	}
 }
-void scale2x_c16to32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=2; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=4) {
+void scale2x_c16to32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+					 uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 2;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 4) {
 			pix = s[x];
 			dpix1 = 0xFF000000 | ((pix & 0xF800) << 8) | ((pix & 0x07E0) << 5) | ((pix & 0x001F) << 3);
-			dpix2 = 0xFF000000 | ((pix & 0xF8000000) >> 8) | ((pix & 0x07E00000) >> 11) | ((pix & 0x001F0000) >> 13);			d[dx  ] = dpix1; d[dx+1] = dpix1;
-			d[dx+2] = dpix2; d[dx+3] = dpix2;
+			dpix2 = 0xFF000000 | ((pix & 0xF8000000) >> 8) | ((pix & 0x07E00000) >> 11) | ((pix & 0x001F0000) >> 13);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx + 2] = dpix2;
+			d[dx + 3] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t pix16 = s16[x*2];
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t pix16 = s16[x * 2];
 			pix16 = 0xFF000000 | ((pix16 & 0xF800) << 8) | ((pix16 & 0x07E0) << 5) | ((pix16 & 0x001F) << 3);
-			d[dx  ] = pix16; d[dx+1] = pix16;
+			d[dx] = pix16;
+			d[dx + 1] = pix16;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		memcpy(dst, dstsrc, swl); dst = (uint8_t*)dst+dp;
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		memcpy(dst, dstsrc, swl);
+		dst = (uint8_t *)dst + dp;
 	}
 }
 
 //
 //	C scalers
 //
-void scale1x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*1; }
-	if ((ymul == 1)&&(swl == sp)&&(sp == dp)) memcpy(dst, src, sp*sh);
+void scale1x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 1;
+	}
+	if ((ymul == 1) && (swl == sp) && (sp == dp))
+		memcpy(dst, src, sp * sh);
 	else {
-		if (swl>dp) swl = dp;
-		for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-			for (uint32_t i=ymul; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, src, swl);
+		if (swl > dp)
+			swl = dp;
+		for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+			for (uint32_t i = ymul; i > 0; i--, dst = (uint8_t *)dst + dp)
+				memcpy(dst, src, swl);
 		}
 	}
 }
 
-void scale1x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale1x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale1x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale1x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
+void scale1x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale1x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale1x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale1x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
 
-void scale1x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*1; }
-	if ((ymul == 1)&&(swl == sp)&&(sp == dp)) memcpy(dst, src, sp*sh);
+void scale1x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 1;
+	}
+	if ((ymul == 1) && (swl == sp) && (sp == dp))
+		memcpy(dst, src, sp * sh);
 	else {
-		for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-			for (uint32_t i=ymul; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, src, swl);
+		for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+			for (uint32_t i = ymul; i > 0; i--, dst = (uint8_t *)dst + dp)
+				memcpy(dst, src, swl);
 		}
 	}
 }
 
-void scale1x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale1x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale1x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale1x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale2x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } swl*=2; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=2) {
+void scale1x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale1x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale1x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale1x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale1x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale2x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 2;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 2) {
 			pix = s[x];
-			dpix1=(pix & 0x0000FFFF)|(pix<<16);
-			dpix2=(pix & 0xFFFF0000)|(pix>>16);
-			d[dx] = dpix1; d[dx+1] = dpix2;
+			dpix1 = (pix & 0x0000FFFF) | (pix << 16);
+			dpix2 = (pix & 0xFFFF0000) | (pix >> 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t pix16 = s16[x*2];
-			d[dx] = pix16|(pix16<<16);
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t pix16 = s16[x * 2];
+			d[dx] = pix16 | (pix16 << 16);
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale2x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale2x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale2x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale2x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale2x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=2; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<sw; x++, dx+=2) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale2x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale2x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale2x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale2x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale2x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 2;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < sw; x++, dx += 2) {
 			pix = s[x];
-			d[dx] = pix; d[dx+1] = pix;
+			d[dx] = pix;
+			d[dx + 1] = pix;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale2x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale2x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale2x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale2x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale3x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } swl*=3; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=3) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale2x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale2x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale2x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale2x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale2x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale3x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 3;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 3) {
 			pix = s[x];
-			dpix1=(pix & 0x0000FFFF)|(pix<<16);
-			dpix2=(pix & 0xFFFF0000)|(pix>>16);
-			d[dx] = dpix1; d[dx+1] = pix; d[dx+2] = dpix2;
+			dpix1 = (pix & 0x0000FFFF) | (pix << 16);
+			dpix2 = (pix & 0xFFFF0000) | (pix >> 16);
+			d[dx] = dpix1;
+			d[dx + 1] = pix;
+			d[dx + 2] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t *d16 = (uint16_t*)d;
-			uint16_t pix16 = s16[x*2];
-			dpix1 = pix16|(pix16<<16);
-			d[dx] = dpix1; d16[(dx+1)*2] = pix16;
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t *d16 = (uint16_t *)d;
+			uint16_t pix16 = s16[x * 2];
+			dpix1 = pix16 | (pix16 << 16);
+			d[dx] = dpix1;
+			d16[(dx + 1) * 2] = pix16;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale3x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale3x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale3x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale3x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale3x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=3; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<sw; x++, dx+=3) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale3x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale3x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale3x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale3x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale3x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 3;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < sw; x++, dx += 3) {
 			pix = s[x];
-			d[dx] = pix; d[dx+1] = pix; d[dx+2] = pix;
+			d[dx] = pix;
+			d[dx + 1] = pix;
+			d[dx + 2] = pix;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale3x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale3x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale3x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale3x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale4x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } swl*=4; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=4) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale3x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale3x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale3x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale3x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale3x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale4x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 4;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 4) {
 			pix = s[x];
-			dpix1=(pix & 0x0000FFFF)|(pix<<16);
-			dpix2=(pix & 0xFFFF0000)|(pix>>16);
-			d[dx] = dpix1; d[dx+1] = dpix1; d[dx+2] = dpix2; d[dx+3] = dpix2;
+			dpix1 = (pix & 0x0000FFFF) | (pix << 16);
+			dpix2 = (pix & 0xFFFF0000) | (pix >> 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx + 2] = dpix2;
+			d[dx + 3] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t pix16 = s16[x*2];
-			dpix1 = pix16|(pix16<<16);
-			d[dx] = dpix1; d[dx+1] = dpix1;
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t pix16 = s16[x * 2];
+			dpix1 = pix16 | (pix16 << 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale4x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale4x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale4x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale4x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale4x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=4; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<sw; x++, dx+=4) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale4x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale4x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale4x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale4x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale4x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 4;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < sw; x++, dx += 4) {
 			pix = s[x];
-			d[dx] = pix; d[dx+1] = pix; d[dx+2] = pix; d[dx+3] = pix;
+			d[dx] = pix;
+			d[dx + 1] = pix;
+			d[dx + 2] = pix;
+			d[dx + 3] = pix;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale4x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale4x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale4x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale4x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-
-void scale5x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } swl*=5; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=5) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale4x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale4x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale4x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale4x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale4x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+
+void scale5x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 5;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 5) {
 			pix = s[x];
-			dpix1=(pix & 0x0000FFFF)|(pix<<16);
-			dpix2=(pix & 0xFFFF0000)|(pix>>16);
-			d[dx] = dpix1; d[dx+1] = dpix1; d[dx+2] = pix; d[dx+3] = dpix2; d[dx+4] = dpix2;
+			dpix1 = (pix & 0x0000FFFF) | (pix << 16);
+			dpix2 = (pix & 0xFFFF0000) | (pix >> 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx + 2] = pix;
+			d[dx + 3] = dpix2;
+			d[dx + 4] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t *d16 = (uint16_t*)d;
-			uint16_t pix16 = s16[x*2];
-			dpix1 = pix16|(pix16<<16);
-			d[dx] = dpix1; d[dx+1] = dpix1; d16[(dx+2)*2] = pix16;
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t *d16 = (uint16_t *)d;
+			uint16_t pix16 = s16[x * 2];
+			dpix1 = pix16 | (pix16 << 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d16[(dx + 2) * 2] = pix16;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale5x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale5x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale5x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale5x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale5x5_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-
-void scale5x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=5; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<sw; x++, dx+=5) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale5x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale5x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale5x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale5x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale5x5_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+
+void scale5x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 5;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < sw; x++, dx += 5) {
 			pix = s[x];
-			d[dx] = pix; d[dx+1] = pix; d[dx+2] = pix; d[dx+3] = pix; d[dx+4] = pix;
+			d[dx] = pix;
+			d[dx + 1] = pix;
+			d[dx + 2] = pix;
+			d[dx + 3] = pix;
+			d[dx + 4] = pix;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale5x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale5x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale5x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale5x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale5x5_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-
-void scale6x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, dpix1, dpix2, swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } swl*=6; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<(sw/2); x++, dx+=6) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale5x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale5x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale5x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale5x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale5x5_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+
+void scale6x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, dpix1, dpix2, swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 6;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < (sw / 2); x++, dx += 6) {
 			pix = s[x];
-			dpix1=(pix & 0x0000FFFF)|(pix<<16);
-			dpix2=(pix & 0xFFFF0000)|(pix>>16);
-			d[dx] = dpix1; d[dx+1] = dpix1; d[dx+2] = dpix1; d[dx+3] = dpix2; d[dx+4] = dpix2; d[dx+5] = dpix2;
+			dpix1 = (pix & 0x0000FFFF) | (pix << 16);
+			dpix2 = (pix & 0xFFFF0000) | (pix >> 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx + 2] = dpix1;
+			d[dx + 3] = dpix2;
+			d[dx + 4] = dpix2;
+			d[dx + 5] = dpix2;
 		}
-		if (sw&1) {
-			uint16_t *s16 = (uint16_t*)s;
-			uint16_t pix16 = s16[x*2];
-			dpix1 = pix16|(pix16<<16);
-			d[dx] = dpix1; d[dx+1] = dpix1; d[dx+2] = dpix1;
+		if (sw & 1) {
+			uint16_t *s16 = (uint16_t *)s;
+			uint16_t pix16 = s16[x * 2];
+			dpix1 = pix16 | (pix16 << 16);
+			d[dx] = dpix1;
+			d[dx + 1] = dpix1;
+			d[dx + 2] = dpix1;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
-	}
-}
-
-void scale6x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale6x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale6x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale6x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale6x5_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-void scale6x6_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 6); }
-
-void scale6x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
-	uint32_t x, dx, pix, swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } swl*=6; if (!dp) { dp = swl; }
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
-		uint32_t *s = (uint32_t* __restrict)src;
-		uint32_t *d = (uint32_t* __restrict)dst;
-		for (x=dx=0; x<sw; x++, dx+=6) {
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
+	}
+}
+
+void scale6x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale6x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale6x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale6x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale6x5_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+void scale6x6_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, 6);
+}
+
+void scale6x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
+	uint32_t x, dx, pix, swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	swl *= 6;
+	if (!dp) {
+		dp = swl;
+	}
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
+		uint32_t *s = (uint32_t *__restrict)src;
+		uint32_t *d = (uint32_t *__restrict)dst;
+		for (x = dx = 0; x < sw; x++, dx += 6) {
 			pix = s[x];
-			d[dx] = pix; d[dx+1] = pix; d[dx+2] = pix; d[dx+3] = pix; d[dx+4] = pix; d[dx+5] = pix;
+			d[dx] = pix;
+			d[dx + 1] = pix;
+			d[dx + 2] = pix;
+			d[dx + 3] = pix;
+			d[dx + 4] = pix;
+			d[dx + 5] = pix;
 		}
-		void* __restrict dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy(dst, dstsrc, swl);
+		void *__restrict dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy(dst, dstsrc, swl);
 	}
 }
 
-void scale6x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale6x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale6x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale6x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale6x5_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-void scale6x6_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 6); }
+void scale6x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale6x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale6x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale6x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale6x5_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+void scale6x6_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, 6);
+}
 
 #ifdef HAS_NEON
 
 //
 //	memcpy_neon (dst/src must be aligned 4, size must be aligned 2)
 //
-void memcpy_neon(void* dst, void* src, uint32_t size) {
-	asm volatile (
-	"	bic r4, %[sz], #127	;"
-	"	add r3, %[s], %[sz]	;"	// r3 = endofs
-	"	add r4, %[s], r4	;"	// r4 = s128ofs
-	"	cmp %[s], r4		;"
-	"	beq 2f			;"
-	"1:	vldmia %[s]!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %[d]!, {q8-q15}	;"
-	"	cmp %[s], r4		;"
-	"	bne 1b			;"
-	"2:	cmp %[s], r3		;"
-	"	beq 7f			;"
-	"	tst %[sz], #64		;"
-	"	beq 3f			;"
-	"	vldmia %[s]!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %[d]!, {q8-q11}	;"
-	"	cmp %[s], r3		;"
-	"	beq 7f			;"
-	"3:	tst %[sz], #32		;"
-	"	beq 4f			;"
-	"	vldmia %[s]!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %[d]!, {q12-q13}	;"
-	"	cmp %[s], r3		;"
-	"	beq 7f			;"
-	"4:	tst %[sz], #16		;"
-	"	beq 5f			;"
-	"	vldmia %[s]!, {q14}	;"	// 16 bytes
-	"	vstmia %[d]!, {q14}	;"
-	"	cmp %[s], r3		;"
-	"	beq 7f			;"
-	"5:	tst %[sz], #8		;"
-	"	beq 6f			;"
-	"	vldmia %[s]!, {d30}	;"	// 8 bytes
-	"	vstmia %[d]!, {d30}	;"
-	"	cmp %[s], r3		;"
-	"	beq 7f			;"
-	"6:	ldrh r4, [%[s]],#2	;"	// rest
-	"	strh r4, [%[d]],#2	;"
-	"	cmp %[s], r3		;"
-	"	bne 6b			;"
-	"7:				"
-	: [s]"+r"(src), [d]"+r"(dst)
-	: [sz]"r"(size)
-	: "r3","r4","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
+void memcpy_neon(void *dst, void *src, uint32_t size)
+{
+	asm volatile("	bic r4, %[sz], #127	;"
+				 "	add r3, %[s], %[sz]	;" // r3 = endofs
+				 "	add r4, %[s], r4	;" // r4 = s128ofs
+				 "	cmp %[s], r4		;"
+				 "	beq 2f			;"
+				 "1:	vldmia %[s]!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %[d]!, {q8-q15}	;"
+				 "	cmp %[s], r4		;"
+				 "	bne 1b			;"
+				 "2:	cmp %[s], r3		;"
+				 "	beq 7f			;"
+				 "	tst %[sz], #64		;"
+				 "	beq 3f			;"
+				 "	vldmia %[s]!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %[d]!, {q8-q11}	;"
+				 "	cmp %[s], r3		;"
+				 "	beq 7f			;"
+				 "3:	tst %[sz], #32		;"
+				 "	beq 4f			;"
+				 "	vldmia %[s]!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %[d]!, {q12-q13}	;"
+				 "	cmp %[s], r3		;"
+				 "	beq 7f			;"
+				 "4:	tst %[sz], #16		;"
+				 "	beq 5f			;"
+				 "	vldmia %[s]!, {q14}	;" // 16 bytes
+				 "	vstmia %[d]!, {q14}	;"
+				 "	cmp %[s], r3		;"
+				 "	beq 7f			;"
+				 "5:	tst %[sz], #8		;"
+				 "	beq 6f			;"
+				 "	vldmia %[s]!, {d30}	;" // 8 bytes
+				 "	vstmia %[d]!, {d30}	;"
+				 "	cmp %[s], r3		;"
+				 "	beq 7f			;"
+				 "6:	ldrh r4, [%[s]],#2	;" // rest
+				 "	strh r4, [%[d]],#2	;"
+				 "	cmp %[s], r3		;"
+				 "	bne 6b			;"
+				 "7:				"
+				 : [s] "+r"(src), [d] "+r"(dst)
+				 : [sz] "r"(size)
+				 : "r3", "r4", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
 }
 
 //
 //	NEON scalers
 //
 
-void scale1x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*1; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x1_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
-	if ((swl == sp)&&(sp == dp)) memcpy_neon(dst, src, sp*sh);
+void scale1x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 1;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x1_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
+	if ((swl == sp) && (sp == dp))
+		memcpy_neon(dst, src, sp * sh);
 	else {
-		if (swl>dp) swl = dp;
-		for (; sh>0; sh--, src=(uint8_t*)src+sp, dst=(uint8_t*)dst+dp) memcpy_neon(dst, src, swl);
+		if (swl > dp)
+			swl = dp;
+		for (; sh > 0; sh--, src = (uint8_t *)src + sp, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, src, swl);
 	}
 }
 
-void scale1x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x2_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+void scale1x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x2_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	vstmia r9!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	vstmia r9!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x3_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	uint32_t dadd = dp * 2 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	vstmia r9!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	vstmia r9!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale1x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x3_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	vstmia r10!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	vstmia r9!, {q14}	;"
-	"	vstmia r10!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	vstmia r9!, {d30}	;"
-	"	vstmia r10!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"	str lr, [r10]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x4_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	uint32_t dadd = dp * 3 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	vstmia r10!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	vstmia r9!, {q14}	;"
+				 "	vstmia r10!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	vstmia r9!, {d30}	;"
+				 "	vstmia r10!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "	str lr, [r10]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale1x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint16_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x4_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	vstmia r11!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	vstmia r11!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	vstmia r10!, {q12-q13}	;"
-	"	vstmia r11!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	vstmia r9!, {q14}	;"
-	"	vstmia r10!, {q14}	;"
-	"	vstmia r11!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	vstmia r9!, {d30}	;"
-	"	vstmia r10!, {d30}	;"
-	"	vstmia r11!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"	str lr, [r10]		;"
-	"	str lr, [r11]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale1x1_n16, &scale1x2_n16, &scale1x3_n16, &scale1x4_n16 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	vstmia r11!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	vstmia r11!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	vstmia r10!, {q12-q13}	;"
+				 "	vstmia r11!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	vstmia r9!, {q14}	;"
+				 "	vstmia r10!, {q14}	;"
+				 "	vstmia r11!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	vstmia r9!, {d30}	;"
+				 "	vstmia r10!, {d30}	;"
+				 "	vstmia r11!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "	str lr, [r10]		;"
+				 "	str lr, [r11]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale1x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale1x1_n16, &scale1x2_n16, &scale1x3_n16, &scale1x4_n16};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
-void scale1x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*1; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x1_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
-	if ((swl == sp)&&(sp == dp)) memcpy_neon(dst, src, sp*sh);
-	else for (; sh>0; sh--, src=(uint8_t*)src+sp, dst=(uint8_t*)dst+dp) memcpy_neon(dst, src, swl);
-}
-
-void scale1x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x2_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+void scale1x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 1;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x1_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
+	if ((swl == sp) && (sp == dp))
+		memcpy_neon(dst, src, sp * sh);
+	else
+		for (; sh > 0; sh--, src = (uint8_t *)src + sp, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, src, swl);
+}
+
+void scale1x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x2_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	vstmia r9!, {q14}	;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	vstmia r9!, {d30}	;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x3_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	uint32_t dadd = dp * 2 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia r9!, {q14}	;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia r9!, {d30}	;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale1x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x3_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	vstmia r10!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	vstmia r9!, {q14}	;"
-	"	vstmia r10!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	vstmia r9!, {d30}	;"
-	"	vstmia r10!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"	str lr, [r10]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
-	uint32_t swl = sw*sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale1x4_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	uint32_t dadd = dp * 3 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	vstmia r10!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	vstmia r9!, {q14}	;"
+				 "	vstmia r10!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	vstmia r9!, {d30}	;"
+				 "	vstmia r10!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "	str lr, [r10]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale1x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
+	uint32_t swl = sw * sizeof(uint32_t);
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale1x4_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl128 = swl & ~127;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x128bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q15}	;"	// 128 bytes
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	vstmia r11!, {q8-q15}	;"
-	"	cmp %0, lr		;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 8f			;"
-	"	tst %3, #64		;"
-	"	beq 4f			;"
-	"	vldmia %0!, {q8-q11}	;"	// 64 bytes
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	vstmia r11!, {q8-q11}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"4:	tst %3, #32		;"
-	"	beq 5f			;"
-	"	vldmia %0!, {q12-q13}	;"	// 32 bytes
-	"	vstmia %1!, {q12-q13}	;"
-	"	vstmia r9!, {q12-q13}	;"
-	"	vstmia r10!, {q12-q13}	;"
-	"	vstmia r11!, {q12-q13}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"5:	tst %3, #16		;"
-	"	beq 6f			;"
-	"	vldmia %0!, {q14}	;"	// 16 bytes
-	"	vstmia %1!, {q14}	;"
-	"	vstmia r9!, {q14}	;"
-	"	vstmia r10!, {q14}	;"
-	"	vstmia r11!, {q14}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"6:	tst %3, #8		;"
-	"	beq 7f			;"
-	"	vldmia %0!, {d30}	;"	// 8 bytes
-	"	vstmia %1!, {d30}	;"
-	"	vstmia r9!, {d30}	;"
-	"	vstmia r10!, {d30}	;"
-	"	vstmia r11!, {d30}	;"
-	"	cmp %0, r8		;"
-	"	beq 8f			;"
-	"7:	ldr lr, [%0],#4		;"	// 4 bytes
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9]		;"
-	"	str lr, [r10]		;"
-	"	str lr, [r11]		;"
-	"8:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale1x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale1x1_n32, &scale1x2_n32, &scale1x3_n32, &scale1x4_n32 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x128bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q15}	;" // 128 bytes
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	vstmia r11!, {q8-q15}	;"
+				 "	cmp %0, lr		;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "	tst %3, #64		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!, {q8-q11}	;" // 64 bytes
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	vstmia r11!, {q8-q11}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "4:	tst %3, #32		;"
+				 "	beq 5f			;"
+				 "	vldmia %0!, {q12-q13}	;" // 32 bytes
+				 "	vstmia %1!, {q12-q13}	;"
+				 "	vstmia r9!, {q12-q13}	;"
+				 "	vstmia r10!, {q12-q13}	;"
+				 "	vstmia r11!, {q12-q13}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "5:	tst %3, #16		;"
+				 "	beq 6f			;"
+				 "	vldmia %0!, {q14}	;" // 16 bytes
+				 "	vstmia %1!, {q14}	;"
+				 "	vstmia r9!, {q14}	;"
+				 "	vstmia r10!, {q14}	;"
+				 "	vstmia r11!, {q14}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "6:	tst %3, #8		;"
+				 "	beq 7f			;"
+				 "	vldmia %0!, {d30}	;" // 8 bytes
+				 "	vstmia %1!, {d30}	;"
+				 "	vstmia r9!, {d30}	;"
+				 "	vstmia r10!, {d30}	;"
+				 "	vstmia r11!, {d30}	;"
+				 "	cmp %0, r8		;"
+				 "	beq 8f			;"
+				 "7:	ldr lr, [%0],#4		;" // 4 bytes
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9]		;"
+				 "	str lr, [r10]		;"
+				 "	str lr, [r11]		;"
+				 "8:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl128), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale1x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale1x1_n32, &scale1x2_n32, &scale1x3_n32, &scale1x4_n32};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale2x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale2x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x1_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x1_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x64bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 32 pixels 64 bytes
-	"	vdup.16 d0, d23[3]	;"
-	"	vdup.16 d1, d23[2]	;"
-	"	vext.16 d31, d1,d0,#2	;"
-	"	vdup.16 d0, d23[1]	;"
-	"	vdup.16 d1, d23[0]	;"
-	"	vext.16 d30, d1,d0,#2	;"
-	"	vdup.16 d0, d22[3]	;"
-	"	vdup.16 d1, d22[2]	;"
-	"	vext.16 d29, d1,d0,#2	;"
-	"	vdup.16 d0, d22[1]	;"
-	"	vdup.16 d1, d22[0]	;"
-	"	vext.16 d28, d1,d0,#2	;"
-	"	vdup.16 d0, d21[3]	;"
-	"	vdup.16 d1, d21[2]	;"
-	"	vext.16 d27, d1,d0,#2	;"
-	"	vdup.16 d0, d21[1]	;"
-	"	vdup.16 d1, d21[0]	;"
-	"	vext.16 d26, d1,d0,#2	;"
-	"	vdup.16 d0, d20[3]	;"
-	"	vdup.16 d1, d20[2]	;"
-	"	vext.16 d25, d1,d0,#2	;"
-	"	vdup.16 d0, d20[1]	;"
-	"	vdup.16 d1, d20[0]	;"
-	"	vext.16 d24, d1,d0,#2	;"
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"	tst %3, #32		;"
-	"	beq 4f			;"
-	"	vldmia %0!,{q8-q9}	;"	// 16 pixels
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8-q11}	;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q0","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 32 pixels 64 bytes
+				 "	vdup.16 d0, d23[3]	;"
+				 "	vdup.16 d1, d23[2]	;"
+				 "	vext.16 d31, d1,d0,#2	;"
+				 "	vdup.16 d0, d23[1]	;"
+				 "	vdup.16 d1, d23[0]	;"
+				 "	vext.16 d30, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[3]	;"
+				 "	vdup.16 d1, d22[2]	;"
+				 "	vext.16 d29, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[1]	;"
+				 "	vdup.16 d1, d22[0]	;"
+				 "	vext.16 d28, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[3]	;"
+				 "	vdup.16 d1, d21[2]	;"
+				 "	vext.16 d27, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[1]	;"
+				 "	vdup.16 d1, d21[0]	;"
+				 "	vext.16 d26, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[3]	;"
+				 "	vdup.16 d1, d20[2]	;"
+				 "	vext.16 d25, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[1]	;"
+				 "	vdup.16 d1, d20[0]	;"
+				 "	vext.16 d24, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "	tst %3, #32		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!,{q8-q9}	;" // 16 pixels
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q0", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x2_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x2_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x64bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 32 pixels 64 bytes
-	"	vdup.16 d0, d23[3]	;"
-	"	vdup.16 d1, d23[2]	;"
-	"	vext.16 d31, d1,d0,#2	;"
-	"	vdup.16 d0, d23[1]	;"
-	"	vdup.16 d1, d23[0]	;"
-	"	vext.16 d30, d1,d0,#2	;"
-	"	vdup.16 d0, d22[3]	;"
-	"	vdup.16 d1, d22[2]	;"
-	"	vext.16 d29, d1,d0,#2	;"
-	"	vdup.16 d0, d22[1]	;"
-	"	vdup.16 d1, d22[0]	;"
-	"	vext.16 d28, d1,d0,#2	;"
-	"	vdup.16 d0, d21[3]	;"
-	"	vdup.16 d1, d21[2]	;"
-	"	vext.16 d27, d1,d0,#2	;"
-	"	vdup.16 d0, d21[1]	;"
-	"	vdup.16 d1, d21[0]	;"
-	"	vext.16 d26, d1,d0,#2	;"
-	"	vdup.16 d0, d20[3]	;"
-	"	vdup.16 d1, d20[2]	;"
-	"	vext.16 d25, d1,d0,#2	;"
-	"	vdup.16 d0, d20[1]	;"
-	"	vdup.16 d1, d20[0]	;"
-	"	vext.16 d24, d1,d0,#2	;"
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"	tst %3, #32		;"
-	"	beq 4f			;"
-	"	vldmia %0!,{q8-q9}	;"	// 16 pixels
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9],#4		;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q0","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 32 pixels 64 bytes
+				 "	vdup.16 d0, d23[3]	;"
+				 "	vdup.16 d1, d23[2]	;"
+				 "	vext.16 d31, d1,d0,#2	;"
+				 "	vdup.16 d0, d23[1]	;"
+				 "	vdup.16 d1, d23[0]	;"
+				 "	vext.16 d30, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[3]	;"
+				 "	vdup.16 d1, d22[2]	;"
+				 "	vext.16 d29, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[1]	;"
+				 "	vdup.16 d1, d22[0]	;"
+				 "	vext.16 d28, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[3]	;"
+				 "	vdup.16 d1, d21[2]	;"
+				 "	vext.16 d27, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[1]	;"
+				 "	vdup.16 d1, d21[0]	;"
+				 "	vext.16 d26, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[3]	;"
+				 "	vdup.16 d1, d20[2]	;"
+				 "	vext.16 d25, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[1]	;"
+				 "	vdup.16 d1, d20[0]	;"
+				 "	vext.16 d24, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "	tst %3, #32		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!,{q8-q9}	;" // 16 pixels
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9],#4		;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q0", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x3_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x3_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x64bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 32 pixels 64 bytes
-	"	vdup.16 d0, d23[3]	;"
-	"	vdup.16 d1, d23[2]	;"
-	"	vext.16 d31, d1,d0,#2	;"
-	"	vdup.16 d0, d23[1]	;"
-	"	vdup.16 d1, d23[0]	;"
-	"	vext.16 d30, d1,d0,#2	;"
-	"	vdup.16 d0, d22[3]	;"
-	"	vdup.16 d1, d22[2]	;"
-	"	vext.16 d29, d1,d0,#2	;"
-	"	vdup.16 d0, d22[1]	;"
-	"	vdup.16 d1, d22[0]	;"
-	"	vext.16 d28, d1,d0,#2	;"
-	"	vdup.16 d0, d21[3]	;"
-	"	vdup.16 d1, d21[2]	;"
-	"	vext.16 d27, d1,d0,#2	;"
-	"	vdup.16 d0, d21[1]	;"
-	"	vdup.16 d1, d21[0]	;"
-	"	vext.16 d26, d1,d0,#2	;"
-	"	vdup.16 d0, d20[3]	;"
-	"	vdup.16 d1, d20[2]	;"
-	"	vext.16 d25, d1,d0,#2	;"
-	"	vdup.16 d0, d20[1]	;"
-	"	vdup.16 d1, d20[0]	;"
-	"	vext.16 d24, d1,d0,#2	;"
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"	tst %3, #32		;"
-	"	beq 4f			;"
-	"	vldmia %0!,{q8-q9}	;"	// 16 pixels
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9],#4		;"
-	"	str lr, [r10],#4	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q0","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 32 pixels 64 bytes
+				 "	vdup.16 d0, d23[3]	;"
+				 "	vdup.16 d1, d23[2]	;"
+				 "	vext.16 d31, d1,d0,#2	;"
+				 "	vdup.16 d0, d23[1]	;"
+				 "	vdup.16 d1, d23[0]	;"
+				 "	vext.16 d30, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[3]	;"
+				 "	vdup.16 d1, d22[2]	;"
+				 "	vext.16 d29, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[1]	;"
+				 "	vdup.16 d1, d22[0]	;"
+				 "	vext.16 d28, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[3]	;"
+				 "	vdup.16 d1, d21[2]	;"
+				 "	vext.16 d27, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[1]	;"
+				 "	vdup.16 d1, d21[0]	;"
+				 "	vext.16 d26, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[3]	;"
+				 "	vdup.16 d1, d20[2]	;"
+				 "	vext.16 d25, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[1]	;"
+				 "	vdup.16 d1, d20[0]	;"
+				 "	vext.16 d24, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "	tst %3, #32		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!,{q8-q9}	;" // 16 pixels
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9],#4		;"
+				 "	str lr, [r10],#4	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q0", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x3_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x3_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x64bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 32 pixels 64 bytes
-	"	vdup.16 d0, d23[3]	;"
-	"	vdup.16 d1, d23[2]	;"
-	"	vext.16 d31, d1,d0,#2	;"
-	"	vdup.16 d0, d23[1]	;"
-	"	vdup.16 d1, d23[0]	;"
-	"	vext.16 d30, d1,d0,#2	;"
-	"	vdup.16 d0, d22[3]	;"
-	"	vdup.16 d1, d22[2]	;"
-	"	vext.16 d29, d1,d0,#2	;"
-	"	vdup.16 d0, d22[1]	;"
-	"	vdup.16 d1, d22[0]	;"
-	"	vext.16 d28, d1,d0,#2	;"
-	"	vdup.16 d0, d21[3]	;"
-	"	vdup.16 d1, d21[2]	;"
-	"	vext.16 d27, d1,d0,#2	;"
-	"	vdup.16 d0, d21[1]	;"
-	"	vdup.16 d1, d21[0]	;"
-	"	vext.16 d26, d1,d0,#2	;"
-	"	vdup.16 d0, d20[3]	;"
-	"	vdup.16 d1, d20[2]	;"
-	"	vext.16 d25, d1,d0,#2	;"
-	"	vdup.16 d0, d20[1]	;"
-	"	vdup.16 d1, d20[0]	;"
-	"	vext.16 d24, d1,d0,#2	;"
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	vstmia r11!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"	tst %3, #32		;"
-	"	beq 4f			;"
-	"	vldmia %0!,{q8-q9}	;"	// 16 pixels
-	"	vdup.16 d0, d19[3]	;"
-	"	vdup.16 d1, d19[2]	;"
-	"	vext.16 d23, d1,d0,#2	;"
-	"	vdup.16 d0, d19[1]	;"
-	"	vdup.16 d1, d19[0]	;"
-	"	vext.16 d22, d1,d0,#2	;"
-	"	vdup.16 d0, d18[3]	;"
-	"	vdup.16 d1, d18[2]	;"
-	"	vext.16 d21, d1,d0,#2	;"
-	"	vdup.16 d0, d18[1]	;"
-	"	vdup.16 d1, d18[0]	;"
-	"	vext.16 d20, d1,d0,#2	;"
-	"	vdup.16 d0, d17[3]	;"
-	"	vdup.16 d1, d17[2]	;"
-	"	vext.16 d19, d1,d0,#2	;"
-	"	vdup.16 d0, d17[1]	;"
-	"	vdup.16 d1, d17[0]	;"
-	"	vext.16 d18, d1,d0,#2	;"
-	"	vdup.16 d0, d16[3]	;"
-	"	vdup.16 d1, d16[2]	;"
-	"	vext.16 d17, d1,d0,#2	;"
-	"	vdup.16 d0, d16[1]	;"
-	"	vdup.16 d1, d16[0]	;"
-	"	vext.16 d16, d1,d0,#2	;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8-q11}	;"
-	"	vstmia r9!, {q8-q11}	;"
-	"	vstmia r10!, {q8-q11}	;"
-	"	vstmia r11!, {q8-q11}	;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	str lr, [r9],#4		;"
-	"	str lr, [r10],#4	;"
-	"	str lr, [r11],#4	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q0","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale2x1_n16, &scale2x2_n16, &scale2x3_n16, &scale2x4_n16 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 32 pixels 64 bytes
+				 "	vdup.16 d0, d23[3]	;"
+				 "	vdup.16 d1, d23[2]	;"
+				 "	vext.16 d31, d1,d0,#2	;"
+				 "	vdup.16 d0, d23[1]	;"
+				 "	vdup.16 d1, d23[0]	;"
+				 "	vext.16 d30, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[3]	;"
+				 "	vdup.16 d1, d22[2]	;"
+				 "	vext.16 d29, d1,d0,#2	;"
+				 "	vdup.16 d0, d22[1]	;"
+				 "	vdup.16 d1, d22[0]	;"
+				 "	vext.16 d28, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[3]	;"
+				 "	vdup.16 d1, d21[2]	;"
+				 "	vext.16 d27, d1,d0,#2	;"
+				 "	vdup.16 d0, d21[1]	;"
+				 "	vdup.16 d1, d21[0]	;"
+				 "	vext.16 d26, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[3]	;"
+				 "	vdup.16 d1, d20[2]	;"
+				 "	vext.16 d25, d1,d0,#2	;"
+				 "	vdup.16 d0, d20[1]	;"
+				 "	vdup.16 d1, d20[0]	;"
+				 "	vext.16 d24, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	vstmia r11!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "	tst %3, #32		;"
+				 "	beq 4f			;"
+				 "	vldmia %0!,{q8-q9}	;" // 16 pixels
+				 "	vdup.16 d0, d19[3]	;"
+				 "	vdup.16 d1, d19[2]	;"
+				 "	vext.16 d23, d1,d0,#2	;"
+				 "	vdup.16 d0, d19[1]	;"
+				 "	vdup.16 d1, d19[0]	;"
+				 "	vext.16 d22, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[3]	;"
+				 "	vdup.16 d1, d18[2]	;"
+				 "	vext.16 d21, d1,d0,#2	;"
+				 "	vdup.16 d0, d18[1]	;"
+				 "	vdup.16 d1, d18[0]	;"
+				 "	vext.16 d20, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[3]	;"
+				 "	vdup.16 d1, d17[2]	;"
+				 "	vext.16 d19, d1,d0,#2	;"
+				 "	vdup.16 d0, d17[1]	;"
+				 "	vdup.16 d1, d17[0]	;"
+				 "	vext.16 d18, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[3]	;"
+				 "	vdup.16 d1, d16[2]	;"
+				 "	vext.16 d17, d1,d0,#2	;"
+				 "	vdup.16 d0, d16[1]	;"
+				 "	vdup.16 d1, d16[0]	;"
+				 "	vext.16 d16, d1,d0,#2	;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8-q11}	;"
+				 "	vstmia r9!, {q8-q11}	;"
+				 "	vstmia r10!, {q8-q11}	;"
+				 "	vstmia r11!, {q8-q11}	;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	str lr, [r9],#4		;"
+				 "	str lr, [r10],#4	;"
+				 "	str lr, [r11],#4	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q0", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale2x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale2x1_n16, &scale2x2_n16, &scale2x3_n16, &scale2x4_n16};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale2x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale2x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x1_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x1_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x64bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 16 pixels 64 bytes
-	"	vdup.32 d31, d23[1]	;"
-	"	vdup.32 d30, d23[0]	;"
-	"	vdup.32 d29, d22[1]	;"
-	"	vdup.32 d28, d22[0]	;"
-	"	vdup.32 d27, d21[1]	;"
-	"	vdup.32 d26, d21[0]	;"
-	"	vdup.32 d25, d20[1]	;"
-	"	vdup.32 d24, d20[0]	;"
-	"	vdup.32 d23, d19[1]	;"
-	"	vdup.32 d22, d19[0]	;"
-	"	vdup.32 d21, d18[1]	;"
-	"	vdup.32 d20, d18[0]	;"
-	"	vdup.32 d19, d17[1]	;"
-	"	vdup.32 d18, d17[0]	;"
-	"	vdup.32 d17, d16[1]	;"
-	"	vdup.32 d16, d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 16 pixels 64 bytes
+				 "	vdup.32 d31, d23[1]	;"
+				 "	vdup.32 d30, d23[0]	;"
+				 "	vdup.32 d29, d22[1]	;"
+				 "	vdup.32 d28, d22[0]	;"
+				 "	vdup.32 d27, d21[1]	;"
+				 "	vdup.32 d26, d21[0]	;"
+				 "	vdup.32 d25, d20[1]	;"
+				 "	vdup.32 d24, d20[0]	;"
+				 "	vdup.32 d23, d19[1]	;"
+				 "	vdup.32 d22, d19[0]	;"
+				 "	vdup.32 d21, d18[1]	;"
+				 "	vdup.32 d20, d18[0]	;"
+				 "	vdup.32 d19, d17[1]	;"
+				 "	vdup.32 d18, d17[0]	;"
+				 "	vdup.32 d17, d16[1]	;"
+				 "	vdup.32 d16, d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x2_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x2_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x64bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 16 pixels 64 bytes
-	"	vdup.32 d31, d23[1]	;"
-	"	vdup.32 d30, d23[0]	;"
-	"	vdup.32 d29, d22[1]	;"
-	"	vdup.32 d28, d22[0]	;"
-	"	vdup.32 d27, d21[1]	;"
-	"	vdup.32 d26, d21[0]	;"
-	"	vdup.32 d25, d20[1]	;"
-	"	vdup.32 d24, d20[0]	;"
-	"	vdup.32 d23, d19[1]	;"
-	"	vdup.32 d22, d19[0]	;"
-	"	vdup.32 d21, d18[1]	;"
-	"	vdup.32 d20, d18[0]	;"
-	"	vdup.32 d19, d17[1]	;"
-	"	vdup.32 d18, d17[0]	;"
-	"	vdup.32 d17, d16[1]	;"
-	"	vdup.32 d16, d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 16 pixels 64 bytes
+				 "	vdup.32 d31, d23[1]	;"
+				 "	vdup.32 d30, d23[0]	;"
+				 "	vdup.32 d29, d22[1]	;"
+				 "	vdup.32 d28, d22[0]	;"
+				 "	vdup.32 d27, d21[1]	;"
+				 "	vdup.32 d26, d21[0]	;"
+				 "	vdup.32 d25, d20[1]	;"
+				 "	vdup.32 d24, d20[0]	;"
+				 "	vdup.32 d23, d19[1]	;"
+				 "	vdup.32 d22, d19[0]	;"
+				 "	vdup.32 d21, d18[1]	;"
+				 "	vdup.32 d20, d18[0]	;"
+				 "	vdup.32 d19, d17[1]	;"
+				 "	vdup.32 d18, d17[0]	;"
+				 "	vdup.32 d17, d16[1]	;"
+				 "	vdup.32 d16, d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x3_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x3_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x64bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 16 pixels 64 bytes
-	"	vdup.32 d31, d23[1]	;"
-	"	vdup.32 d30, d23[0]	;"
-	"	vdup.32 d29, d22[1]	;"
-	"	vdup.32 d28, d22[0]	;"
-	"	vdup.32 d27, d21[1]	;"
-	"	vdup.32 d26, d21[0]	;"
-	"	vdup.32 d25, d20[1]	;"
-	"	vdup.32 d24, d20[0]	;"
-	"	vdup.32 d23, d19[1]	;"
-	"	vdup.32 d22, d19[0]	;"
-	"	vdup.32 d21, d18[1]	;"
-	"	vdup.32 d20, d18[0]	;"
-	"	vdup.32 d19, d17[1]	;"
-	"	vdup.32 d18, d17[0]	;"
-	"	vdup.32 d17, d16[1]	;"
-	"	vdup.32 d16, d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	vstmia r10!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 16 pixels 64 bytes
+				 "	vdup.32 d31, d23[1]	;"
+				 "	vdup.32 d30, d23[0]	;"
+				 "	vdup.32 d29, d22[1]	;"
+				 "	vdup.32 d28, d22[0]	;"
+				 "	vdup.32 d27, d21[1]	;"
+				 "	vdup.32 d26, d21[0]	;"
+				 "	vdup.32 d25, d20[1]	;"
+				 "	vdup.32 d24, d20[0]	;"
+				 "	vdup.32 d23, d19[1]	;"
+				 "	vdup.32 d22, d19[0]	;"
+				 "	vdup.32 d21, d18[1]	;"
+				 "	vdup.32 d20, d18[0]	;"
+				 "	vdup.32 d19, d17[1]	;"
+				 "	vdup.32 d18, d17[0]	;"
+				 "	vdup.32 d17, d16[1]	;"
+				 "	vdup.32 d16, d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	vstmia r10!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale2x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*2; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale2x4_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 2;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale2x4_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl64 = swl & ~63;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*2;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x64bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q11}	;"	// 16 pixels 64 bytes
-	"	vdup.32 d31, d23[1]	;"
-	"	vdup.32 d30, d23[0]	;"
-	"	vdup.32 d29, d22[1]	;"
-	"	vdup.32 d28, d22[0]	;"
-	"	vdup.32 d27, d21[1]	;"
-	"	vdup.32 d26, d21[0]	;"
-	"	vdup.32 d25, d20[1]	;"
-	"	vdup.32 d24, d20[0]	;"
-	"	vdup.32 d23, d19[1]	;"
-	"	vdup.32 d22, d19[0]	;"
-	"	vdup.32 d21, d18[1]	;"
-	"	vdup.32 d20, d18[0]	;"
-	"	vdup.32 d19, d17[1]	;"
-	"	vdup.32 d18, d17[0]	;"
-	"	vdup.32 d17, d16[1]	;"
-	"	vdup.32 d16, d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q15}	;"
-	"	vstmia r9!, {q8-q15}	;"
-	"	vstmia r10!, {q8-q15}	;"
-	"	vstmia r11!, {q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	vstmia r10!, {d16}	;"
-	"	vstmia r11!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale2x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale2x1_n32, &scale2x2_n32, &scale2x3_n32, &scale2x4_n32 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 2;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x64bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q11}	;" // 16 pixels 64 bytes
+				 "	vdup.32 d31, d23[1]	;"
+				 "	vdup.32 d30, d23[0]	;"
+				 "	vdup.32 d29, d22[1]	;"
+				 "	vdup.32 d28, d22[0]	;"
+				 "	vdup.32 d27, d21[1]	;"
+				 "	vdup.32 d26, d21[0]	;"
+				 "	vdup.32 d25, d20[1]	;"
+				 "	vdup.32 d24, d20[0]	;"
+				 "	vdup.32 d23, d19[1]	;"
+				 "	vdup.32 d22, d19[0]	;"
+				 "	vdup.32 d21, d18[1]	;"
+				 "	vdup.32 d20, d18[0]	;"
+				 "	vdup.32 d19, d17[1]	;"
+				 "	vdup.32 d18, d17[0]	;"
+				 "	vdup.32 d17, d16[1]	;"
+				 "	vdup.32 d16, d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q15}	;"
+				 "	vstmia r9!, {q8-q15}	;"
+				 "	vstmia r10!, {q8-q15}	;"
+				 "	vstmia r11!, {q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	vstmia r10!, {d16}	;"
+				 "	vstmia r11!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl64), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale2x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale2x1_n32, &scale2x2_n32, &scale2x3_n32, &scale2x4_n32};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale3x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale3x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x1_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x1_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31, d19[3]	;"	//  FFFF
-	"	vdup.16 d30, d19[2]	;"	//  EEEE
-	"	vdup.16 d29, d19[1]	;"	//  DDDD
-	"	vdup.16 d28, d19[0]	;"	//  CCCC
-	"	vext.16 d27, d30,d31,#3	;"	// EFFF
-	"	vext.16 d26, d29,d30,#2	;"	// DDEE
-	"	vext.16 d25, d28,d29,#1	;"	// CCCD
-	"	vdup.16 d31, d18[3]	;"	//  BBBB
-	"	vdup.16 d30, d18[2]	;"	//  AAAA
-	"	vdup.16 d29, d18[1]	;"	//  9999
-	"	vdup.16 d28, d18[0]	;"	//  8888
-	"	vext.16 d24, d30,d31,#3	;"	// ABBB
-	"	vext.16 d23, d29,d30,#2	;"	// 99AA
-	"	vext.16 d22, d28,d29,#1	;"	// 8889
-	"	vdup.16 d31, d17[3]	;"	//  7777
-	"	vdup.16 d30, d17[2]	;"	//  6666
-	"	vdup.16 d29, d17[1]	;"	//  5555
-	"	vdup.16 d28, d17[0]	;"	//  4444
-	"	vext.16 d21, d30,d31,#3	;"	// 6777
-	"	vext.16 d20, d29,d30,#2	;"	// 5566
-	"	vext.16 d19, d28,d29,#1	;"	// 4445
-	"	vdup.16 d31, d16[3]	;"	//  3333
-	"	vdup.16 d30, d16[2]	;"	//  2222
-	"	vdup.16 d29, d16[1]	;"	//  1111
-	"	vdup.16 d28, d16[0]	;"	//  0000
-	"	vext.16 d18, d30,d31,#3	;"	// 2333
-	"	vext.16 d17, d29,d30,#2	;"	// 1122
-	"	vext.16 d16, d28,d29,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	strh lr, [%1],#2	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31, d19[3]	;"	   //  FFFF
+				 "	vdup.16 d30, d19[2]	;"	   //  EEEE
+				 "	vdup.16 d29, d19[1]	;"	   //  DDDD
+				 "	vdup.16 d28, d19[0]	;"	   //  CCCC
+				 "	vext.16 d27, d30,d31,#3	;" // EFFF
+				 "	vext.16 d26, d29,d30,#2	;" // DDEE
+				 "	vext.16 d25, d28,d29,#1	;" // CCCD
+				 "	vdup.16 d31, d18[3]	;"	   //  BBBB
+				 "	vdup.16 d30, d18[2]	;"	   //  AAAA
+				 "	vdup.16 d29, d18[1]	;"	   //  9999
+				 "	vdup.16 d28, d18[0]	;"	   //  8888
+				 "	vext.16 d24, d30,d31,#3	;" // ABBB
+				 "	vext.16 d23, d29,d30,#2	;" // 99AA
+				 "	vext.16 d22, d28,d29,#1	;" // 8889
+				 "	vdup.16 d31, d17[3]	;"	   //  7777
+				 "	vdup.16 d30, d17[2]	;"	   //  6666
+				 "	vdup.16 d29, d17[1]	;"	   //  5555
+				 "	vdup.16 d28, d17[0]	;"	   //  4444
+				 "	vext.16 d21, d30,d31,#3	;" // 6777
+				 "	vext.16 d20, d29,d30,#2	;" // 5566
+				 "	vext.16 d19, d28,d29,#1	;" // 4445
+				 "	vdup.16 d31, d16[3]	;"	   //  3333
+				 "	vdup.16 d30, d16[2]	;"	   //  2222
+				 "	vdup.16 d29, d16[1]	;"	   //  1111
+				 "	vdup.16 d28, d16[0]	;"	   //  0000
+				 "	vext.16 d18, d30,d31,#3	;" // 2333
+				 "	vext.16 d17, d29,d30,#2	;" // 1122
+				 "	vext.16 d16, d28,d29,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	strh lr, [%1],#2	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x2_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x2_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31, d19[3]	;"	//  FFFF
-	"	vdup.16 d30, d19[2]	;"	//  EEEE
-	"	vdup.16 d29, d19[1]	;"	//  DDDD
-	"	vdup.16 d28, d19[0]	;"	//  CCCC
-	"	vext.16 d27, d30,d31,#3	;"	// EFFF
-	"	vext.16 d26, d29,d30,#2	;"	// DDEE
-	"	vext.16 d25, d28,d29,#1	;"	// CCCD
-	"	vdup.16 d31, d18[3]	;"	//  BBBB
-	"	vdup.16 d30, d18[2]	;"	//  AAAA
-	"	vdup.16 d29, d18[1]	;"	//  9999
-	"	vdup.16 d28, d18[0]	;"	//  8888
-	"	vext.16 d24, d30,d31,#3	;"	// ABBB
-	"	vext.16 d23, d29,d30,#2	;"	// 99AA
-	"	vext.16 d22, d28,d29,#1	;"	// 8889
-	"	vdup.16 d31, d17[3]	;"	//  7777
-	"	vdup.16 d30, d17[2]	;"	//  6666
-	"	vdup.16 d29, d17[1]	;"	//  5555
-	"	vdup.16 d28, d17[0]	;"	//  4444
-	"	vext.16 d21, d30,d31,#3	;"	// 6777
-	"	vext.16 d20, d29,d30,#2	;"	// 5566
-	"	vext.16 d19, d28,d29,#1	;"	// 4445
-	"	vdup.16 d31, d16[3]	;"	//  3333
-	"	vdup.16 d30, d16[2]	;"	//  2222
-	"	vdup.16 d29, d16[1]	;"	//  1111
-	"	vdup.16 d28, d16[0]	;"	//  0000
-	"	vext.16 d18, d30,d31,#3	;"	// 2333
-	"	vext.16 d17, d29,d30,#2	;"	// 1122
-	"	vext.16 d16, d28,d29,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q13}	;"
-	"	vstmia r9!, {q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	strh lr, [%1],#2	;"
-	"	str lr, [r9],#4		;"
-	"	strh lr, [r9],#2	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31, d19[3]	;"	   //  FFFF
+				 "	vdup.16 d30, d19[2]	;"	   //  EEEE
+				 "	vdup.16 d29, d19[1]	;"	   //  DDDD
+				 "	vdup.16 d28, d19[0]	;"	   //  CCCC
+				 "	vext.16 d27, d30,d31,#3	;" // EFFF
+				 "	vext.16 d26, d29,d30,#2	;" // DDEE
+				 "	vext.16 d25, d28,d29,#1	;" // CCCD
+				 "	vdup.16 d31, d18[3]	;"	   //  BBBB
+				 "	vdup.16 d30, d18[2]	;"	   //  AAAA
+				 "	vdup.16 d29, d18[1]	;"	   //  9999
+				 "	vdup.16 d28, d18[0]	;"	   //  8888
+				 "	vext.16 d24, d30,d31,#3	;" // ABBB
+				 "	vext.16 d23, d29,d30,#2	;" // 99AA
+				 "	vext.16 d22, d28,d29,#1	;" // 8889
+				 "	vdup.16 d31, d17[3]	;"	   //  7777
+				 "	vdup.16 d30, d17[2]	;"	   //  6666
+				 "	vdup.16 d29, d17[1]	;"	   //  5555
+				 "	vdup.16 d28, d17[0]	;"	   //  4444
+				 "	vext.16 d21, d30,d31,#3	;" // 6777
+				 "	vext.16 d20, d29,d30,#2	;" // 5566
+				 "	vext.16 d19, d28,d29,#1	;" // 4445
+				 "	vdup.16 d31, d16[3]	;"	   //  3333
+				 "	vdup.16 d30, d16[2]	;"	   //  2222
+				 "	vdup.16 d29, d16[1]	;"	   //  1111
+				 "	vdup.16 d28, d16[0]	;"	   //  0000
+				 "	vext.16 d18, d30,d31,#3	;" // 2333
+				 "	vext.16 d17, d29,d30,#2	;" // 1122
+				 "	vext.16 d16, d28,d29,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q13}	;"
+				 "	vstmia r9!, {q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	strh lr, [%1],#2	;"
+				 "	str lr, [r9],#4		;"
+				 "	strh lr, [r9],#2	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x3_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x3_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31, d19[3]	;"	//  FFFF
-	"	vdup.16 d30, d19[2]	;"	//  EEEE
-	"	vdup.16 d29, d19[1]	;"	//  DDDD
-	"	vdup.16 d28, d19[0]	;"	//  CCCC
-	"	vext.16 d27, d30,d31,#3	;"	// EFFF
-	"	vext.16 d26, d29,d30,#2	;"	// DDEE
-	"	vext.16 d25, d28,d29,#1	;"	// CCCD
-	"	vdup.16 d31, d18[3]	;"	//  BBBB
-	"	vdup.16 d30, d18[2]	;"	//  AAAA
-	"	vdup.16 d29, d18[1]	;"	//  9999
-	"	vdup.16 d28, d18[0]	;"	//  8888
-	"	vext.16 d24, d30,d31,#3	;"	// ABBB
-	"	vext.16 d23, d29,d30,#2	;"	// 99AA
-	"	vext.16 d22, d28,d29,#1	;"	// 8889
-	"	vdup.16 d31, d17[3]	;"	//  7777
-	"	vdup.16 d30, d17[2]	;"	//  6666
-	"	vdup.16 d29, d17[1]	;"	//  5555
-	"	vdup.16 d28, d17[0]	;"	//  4444
-	"	vext.16 d21, d30,d31,#3	;"	// 6777
-	"	vext.16 d20, d29,d30,#2	;"	// 5566
-	"	vext.16 d19, d28,d29,#1	;"	// 4445
-	"	vdup.16 d31, d16[3]	;"	//  3333
-	"	vdup.16 d30, d16[2]	;"	//  2222
-	"	vdup.16 d29, d16[1]	;"	//  1111
-	"	vdup.16 d28, d16[0]	;"	//  0000
-	"	vext.16 d18, d30,d31,#3	;"	// 2333
-	"	vext.16 d17, d29,d30,#2	;"	// 1122
-	"	vext.16 d16, d28,d29,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q13}	;"
-	"	vstmia r9!, {q8-q13}	;"
-	"	vstmia r10!, {q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	strh lr, [%1],#2	;"
-	"	str lr, [r9],#4		;"
-	"	strh lr, [r9],#2	;"
-	"	str lr, [r10],#4	;"
-	"	strh lr, [r10],#2	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31, d19[3]	;"	   //  FFFF
+				 "	vdup.16 d30, d19[2]	;"	   //  EEEE
+				 "	vdup.16 d29, d19[1]	;"	   //  DDDD
+				 "	vdup.16 d28, d19[0]	;"	   //  CCCC
+				 "	vext.16 d27, d30,d31,#3	;" // EFFF
+				 "	vext.16 d26, d29,d30,#2	;" // DDEE
+				 "	vext.16 d25, d28,d29,#1	;" // CCCD
+				 "	vdup.16 d31, d18[3]	;"	   //  BBBB
+				 "	vdup.16 d30, d18[2]	;"	   //  AAAA
+				 "	vdup.16 d29, d18[1]	;"	   //  9999
+				 "	vdup.16 d28, d18[0]	;"	   //  8888
+				 "	vext.16 d24, d30,d31,#3	;" // ABBB
+				 "	vext.16 d23, d29,d30,#2	;" // 99AA
+				 "	vext.16 d22, d28,d29,#1	;" // 8889
+				 "	vdup.16 d31, d17[3]	;"	   //  7777
+				 "	vdup.16 d30, d17[2]	;"	   //  6666
+				 "	vdup.16 d29, d17[1]	;"	   //  5555
+				 "	vdup.16 d28, d17[0]	;"	   //  4444
+				 "	vext.16 d21, d30,d31,#3	;" // 6777
+				 "	vext.16 d20, d29,d30,#2	;" // 5566
+				 "	vext.16 d19, d28,d29,#1	;" // 4445
+				 "	vdup.16 d31, d16[3]	;"	   //  3333
+				 "	vdup.16 d30, d16[2]	;"	   //  2222
+				 "	vdup.16 d29, d16[1]	;"	   //  1111
+				 "	vdup.16 d28, d16[0]	;"	   //  0000
+				 "	vext.16 d18, d30,d31,#3	;" // 2333
+				 "	vext.16 d17, d29,d30,#2	;" // 1122
+				 "	vext.16 d16, d28,d29,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q13}	;"
+				 "	vstmia r9!, {q8-q13}	;"
+				 "	vstmia r10!, {q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	strh lr, [%1],#2	;"
+				 "	str lr, [r9],#4		;"
+				 "	strh lr, [r9],#2	;"
+				 "	str lr, [r10],#4	;"
+				 "	strh lr, [r10],#2	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x4_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x4_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!, {q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31, d19[3]	;"	//  FFFF
-	"	vdup.16 d30, d19[2]	;"	//  EEEE
-	"	vdup.16 d29, d19[1]	;"	//  DDDD
-	"	vdup.16 d28, d19[0]	;"	//  CCCC
-	"	vext.16 d27, d30,d31,#3	;"	// EFFF
-	"	vext.16 d26, d29,d30,#2	;"	// DDEE
-	"	vext.16 d25, d28,d29,#1	;"	// CCCD
-	"	vdup.16 d31, d18[3]	;"	//  BBBB
-	"	vdup.16 d30, d18[2]	;"	//  AAAA
-	"	vdup.16 d29, d18[1]	;"	//  9999
-	"	vdup.16 d28, d18[0]	;"	//  8888
-	"	vext.16 d24, d30,d31,#3	;"	// ABBB
-	"	vext.16 d23, d29,d30,#2	;"	// 99AA
-	"	vext.16 d22, d28,d29,#1	;"	// 8889
-	"	vdup.16 d31, d17[3]	;"	//  7777
-	"	vdup.16 d30, d17[2]	;"	//  6666
-	"	vdup.16 d29, d17[1]	;"	//  5555
-	"	vdup.16 d28, d17[0]	;"	//  4444
-	"	vext.16 d21, d30,d31,#3	;"	// 6777
-	"	vext.16 d20, d29,d30,#2	;"	// 5566
-	"	vext.16 d19, d28,d29,#1	;"	// 4445
-	"	vdup.16 d31, d16[3]	;"	//  3333
-	"	vdup.16 d30, d16[2]	;"	//  2222
-	"	vdup.16 d29, d16[1]	;"	//  1111
-	"	vdup.16 d28, d16[0]	;"	//  0000
-	"	vext.16 d18, d30,d31,#3	;"	// 2333
-	"	vext.16 d17, d29,d30,#2	;"	// 1122
-	"	vext.16 d16, d28,d29,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!, {q8-q13}	;"
-	"	vstmia r9!, {q8-q13}	;"
-	"	vstmia r10!, {q8-q13}	;"
-	"	vstmia r11!, {q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	orr lr, lr, lsl #16	;"
-	"	cmp %0, r8		;"
-	"	str lr, [%1],#4		;"
-	"	strh lr, [%1],#2	;"
-	"	str lr, [r9],#4		;"
-	"	strh lr, [r9],#2	;"
-	"	str lr, [r10],#4	;"
-	"	strh lr, [r10],#2	;"
-	"	str lr, [r11],#4	;"
-	"	strh lr, [r11],#2	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale3x1_n16, &scale3x2_n16, &scale3x3_n16, &scale3x4_n16 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!, {q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31, d19[3]	;"	   //  FFFF
+				 "	vdup.16 d30, d19[2]	;"	   //  EEEE
+				 "	vdup.16 d29, d19[1]	;"	   //  DDDD
+				 "	vdup.16 d28, d19[0]	;"	   //  CCCC
+				 "	vext.16 d27, d30,d31,#3	;" // EFFF
+				 "	vext.16 d26, d29,d30,#2	;" // DDEE
+				 "	vext.16 d25, d28,d29,#1	;" // CCCD
+				 "	vdup.16 d31, d18[3]	;"	   //  BBBB
+				 "	vdup.16 d30, d18[2]	;"	   //  AAAA
+				 "	vdup.16 d29, d18[1]	;"	   //  9999
+				 "	vdup.16 d28, d18[0]	;"	   //  8888
+				 "	vext.16 d24, d30,d31,#3	;" // ABBB
+				 "	vext.16 d23, d29,d30,#2	;" // 99AA
+				 "	vext.16 d22, d28,d29,#1	;" // 8889
+				 "	vdup.16 d31, d17[3]	;"	   //  7777
+				 "	vdup.16 d30, d17[2]	;"	   //  6666
+				 "	vdup.16 d29, d17[1]	;"	   //  5555
+				 "	vdup.16 d28, d17[0]	;"	   //  4444
+				 "	vext.16 d21, d30,d31,#3	;" // 6777
+				 "	vext.16 d20, d29,d30,#2	;" // 5566
+				 "	vext.16 d19, d28,d29,#1	;" // 4445
+				 "	vdup.16 d31, d16[3]	;"	   //  3333
+				 "	vdup.16 d30, d16[2]	;"	   //  2222
+				 "	vdup.16 d29, d16[1]	;"	   //  1111
+				 "	vdup.16 d28, d16[0]	;"	   //  0000
+				 "	vext.16 d18, d30,d31,#3	;" // 2333
+				 "	vext.16 d17, d29,d30,#2	;" // 1122
+				 "	vext.16 d16, d28,d29,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!, {q8-q13}	;"
+				 "	vstmia r9!, {q8-q13}	;"
+				 "	vstmia r10!, {q8-q13}	;"
+				 "	vstmia r11!, {q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	orr lr, lr, lsl #16	;"
+				 "	cmp %0, r8		;"
+				 "	str lr, [%1],#4		;"
+				 "	strh lr, [%1],#2	;"
+				 "	str lr, [r9],#4		;"
+				 "	strh lr, [r9],#2	;"
+				 "	str lr, [r10],#4	;"
+				 "	strh lr, [r10],#2	;"
+				 "	str lr, [r11],#4	;"
+				 "	strh lr, [r11],#2	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale3x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale3x1_n16, &scale3x2_n16, &scale3x3_n16, &scale3x4_n16};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale3x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale3x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x1_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x1_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15, d19[1]	;"	//  7777
-	"	vdup.32 q14, d19[0]	;"	//  6666
-	"	vdup.32 q1, d18[1]	;"	//  5555
-	"	vdup.32 q0, d18[0]	;"	//  4444
-	"	vext.32 q13, q14,q15,#3	;"	// 6777
-	"	vext.32 q12, q1,q14,#2	;"	// 5566
-	"	vext.32 q11, q0,q1,#1	;"	// 4445
-	"	vdup.32 q15, d17[1]	;"	//  3333
-	"	vdup.32 q14, d17[0]	;"	//  2222
-	"	vdup.32 q1, d16[1]	;"	//  1111
-	"	vdup.32 q0, d16[0]	;"	//  0000
-	"	vext.32 q10, q14,q15,#3	;"	// 2333
-	"	vext.32 q9, q1,q14,#2	;"	// 1122
-	"	vext.32 q8, q0,q1,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	str lr, [%1],#4		;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15, d19[1]	;"	   //  7777
+				 "	vdup.32 q14, d19[0]	;"	   //  6666
+				 "	vdup.32 q1, d18[1]	;"	   //  5555
+				 "	vdup.32 q0, d18[0]	;"	   //  4444
+				 "	vext.32 q13, q14,q15,#3	;" // 6777
+				 "	vext.32 q12, q1,q14,#2	;" // 5566
+				 "	vext.32 q11, q0,q1,#1	;" // 4445
+				 "	vdup.32 q15, d17[1]	;"	   //  3333
+				 "	vdup.32 q14, d17[0]	;"	   //  2222
+				 "	vdup.32 q1, d16[1]	;"	   //  1111
+				 "	vdup.32 q0, d16[0]	;"	   //  0000
+				 "	vext.32 q10, q14,q15,#3	;" // 2333
+				 "	vext.32 q9, q1,q14,#2	;" // 1122
+				 "	vext.32 q8, q0,q1,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	str lr, [%1],#4		;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x2_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x2_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15, d19[1]	;"	//  7777
-	"	vdup.32 q14, d19[0]	;"	//  6666
-	"	vdup.32 q1, d18[1]	;"	//  5555
-	"	vdup.32 q0, d18[0]	;"	//  4444
-	"	vext.32 q13, q14,q15,#3	;"	// 6777
-	"	vext.32 q12, q1,q14,#2	;"	// 5566
-	"	vext.32 q11, q0,q1,#1	;"	// 4445
-	"	vdup.32 q15, d17[1]	;"	//  3333
-	"	vdup.32 q14, d17[0]	;"	//  2222
-	"	vdup.32 q1, d16[1]	;"	//  1111
-	"	vdup.32 q0, d16[0]	;"	//  0000
-	"	vext.32 q10, q14,q15,#3	;"	// 2333
-	"	vext.32 q9, q1,q14,#2	;"	// 1122
-	"	vext.32 q8, q0,q1,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q13}	;"
-	"	vstmia r9!,{q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	str lr, [%1],#4		;"
-	"	vstmia r9!, {d16}	;"
-	"	str lr, [r9],#4		;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15, d19[1]	;"	   //  7777
+				 "	vdup.32 q14, d19[0]	;"	   //  6666
+				 "	vdup.32 q1, d18[1]	;"	   //  5555
+				 "	vdup.32 q0, d18[0]	;"	   //  4444
+				 "	vext.32 q13, q14,q15,#3	;" // 6777
+				 "	vext.32 q12, q1,q14,#2	;" // 5566
+				 "	vext.32 q11, q0,q1,#1	;" // 4445
+				 "	vdup.32 q15, d17[1]	;"	   //  3333
+				 "	vdup.32 q14, d17[0]	;"	   //  2222
+				 "	vdup.32 q1, d16[1]	;"	   //  1111
+				 "	vdup.32 q0, d16[0]	;"	   //  0000
+				 "	vext.32 q10, q14,q15,#3	;" // 2333
+				 "	vext.32 q9, q1,q14,#2	;" // 1122
+				 "	vext.32 q8, q0,q1,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q13}	;"
+				 "	vstmia r9!,{q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	str lr, [%1],#4		;"
+				 "	vstmia r9!, {d16}	;"
+				 "	str lr, [r9],#4		;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x3_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x3_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15, d19[1]	;"	//  7777
-	"	vdup.32 q14, d19[0]	;"	//  6666
-	"	vdup.32 q1, d18[1]	;"	//  5555
-	"	vdup.32 q0, d18[0]	;"	//  4444
-	"	vext.32 q13, q14,q15,#3	;"	// 6777
-	"	vext.32 q12, q1,q14,#2	;"	// 5566
-	"	vext.32 q11, q0,q1,#1	;"	// 4445
-	"	vdup.32 q15, d17[1]	;"	//  3333
-	"	vdup.32 q14, d17[0]	;"	//  2222
-	"	vdup.32 q1, d16[1]	;"	//  1111
-	"	vdup.32 q0, d16[0]	;"	//  0000
-	"	vext.32 q10, q14,q15,#3	;"	// 2333
-	"	vext.32 q9, q1,q14,#2	;"	// 1122
-	"	vext.32 q8, q0,q1,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q13}	;"
-	"	vstmia r9!,{q8-q13}	;"
-	"	vstmia r10!,{q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	str lr, [%1],#4		;"
-	"	vstmia r9!, {d16}	;"
-	"	str lr, [r9],#4		;"
-	"	vstmia r10!, {d16}	;"
-	"	str lr, [r10],#4	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15, d19[1]	;"	   //  7777
+				 "	vdup.32 q14, d19[0]	;"	   //  6666
+				 "	vdup.32 q1, d18[1]	;"	   //  5555
+				 "	vdup.32 q0, d18[0]	;"	   //  4444
+				 "	vext.32 q13, q14,q15,#3	;" // 6777
+				 "	vext.32 q12, q1,q14,#2	;" // 5566
+				 "	vext.32 q11, q0,q1,#1	;" // 4445
+				 "	vdup.32 q15, d17[1]	;"	   //  3333
+				 "	vdup.32 q14, d17[0]	;"	   //  2222
+				 "	vdup.32 q1, d16[1]	;"	   //  1111
+				 "	vdup.32 q0, d16[0]	;"	   //  0000
+				 "	vext.32 q10, q14,q15,#3	;" // 2333
+				 "	vext.32 q9, q1,q14,#2	;" // 1122
+				 "	vext.32 q8, q0,q1,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q13}	;"
+				 "	vstmia r9!,{q8-q13}	;"
+				 "	vstmia r10!,{q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	str lr, [%1],#4		;"
+				 "	vstmia r9!, {d16}	;"
+				 "	str lr, [r9],#4		;"
+				 "	vstmia r10!, {d16}	;"
+				 "	str lr, [r10],#4	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale3x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*3; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale3x4_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 3;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale3x4_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*3;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15, d19[1]	;"	//  7777
-	"	vdup.32 q14, d19[0]	;"	//  6666
-	"	vdup.32 q1, d18[1]	;"	//  5555
-	"	vdup.32 q0, d18[0]	;"	//  4444
-	"	vext.32 q13, q14,q15,#3	;"	// 6777
-	"	vext.32 q12, q1,q14,#2	;"	// 5566
-	"	vext.32 q11, q0,q1,#1	;"	// 4445
-	"	vdup.32 q15, d17[1]	;"	//  3333
-	"	vdup.32 q14, d17[0]	;"	//  2222
-	"	vdup.32 q1, d16[1]	;"	//  1111
-	"	vdup.32 q0, d16[0]	;"	//  0000
-	"	vext.32 q10, q14,q15,#3	;"	// 2333
-	"	vext.32 q9, q1,q14,#2	;"	// 1122
-	"	vext.32 q8, q0,q1,#1	;"	// 0001
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q13}	;"
-	"	vstmia r9!,{q8-q13}	;"
-	"	vstmia r10!,{q8-q13}	;"
-	"	vstmia r11!,{q8-q13}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	str lr, [%1],#4		;"
-	"	vstmia r9!, {d16}	;"
-	"	str lr, [r9],#4		;"
-	"	vstmia r10!, {d16}	;"
-	"	str lr, [r10],#4	;"
-	"	vstmia r11!, {d16}	;"
-	"	str lr, [r11],#4	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale3x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale3x1_n32, &scale3x2_n32, &scale3x3_n32, &scale3x4_n32 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 3;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15, d19[1]	;"	   //  7777
+				 "	vdup.32 q14, d19[0]	;"	   //  6666
+				 "	vdup.32 q1, d18[1]	;"	   //  5555
+				 "	vdup.32 q0, d18[0]	;"	   //  4444
+				 "	vext.32 q13, q14,q15,#3	;" // 6777
+				 "	vext.32 q12, q1,q14,#2	;" // 5566
+				 "	vext.32 q11, q0,q1,#1	;" // 4445
+				 "	vdup.32 q15, d17[1]	;"	   //  3333
+				 "	vdup.32 q14, d17[0]	;"	   //  2222
+				 "	vdup.32 q1, d16[1]	;"	   //  1111
+				 "	vdup.32 q0, d16[0]	;"	   //  0000
+				 "	vext.32 q10, q14,q15,#3	;" // 2333
+				 "	vext.32 q9, q1,q14,#2	;" // 1122
+				 "	vext.32 q8, q0,q1,#1	;" // 0001
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q13}	;"
+				 "	vstmia r9!,{q8-q13}	;"
+				 "	vstmia r10!,{q8-q13}	;"
+				 "	vstmia r11!,{q8-q13}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	str lr, [%1],#4		;"
+				 "	vstmia r9!, {d16}	;"
+				 "	str lr, [r9],#4		;"
+				 "	vstmia r10!, {d16}	;"
+				 "	str lr, [r10],#4	;"
+				 "	vstmia r11!, {d16}	;"
+				 "	str lr, [r11],#4	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale3x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale3x1_n32, &scale3x2_n32, &scale3x3_n32, &scale3x4_n32};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale4x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale4x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x1_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x1_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31,d19[3]	;"
-	"	vdup.16 d30,d19[2]	;"
-	"	vdup.16 d29,d19[1]	;"
-	"	vdup.16 d28,d19[0]	;"
-	"	vdup.16 d27,d18[3]	;"
-	"	vdup.16 d26,d18[2]	;"
-	"	vdup.16 d25,d18[1]	;"
-	"	vdup.16 d24,d18[0]	;"
-	"	vdup.16 d23,d17[3]	;"
-	"	vdup.16 d22,d17[2]	;"
-	"	vdup.16 d21,d17[1]	;"
-	"	vdup.16 d20,d17[0]	;"
-	"	vdup.16 d19,d16[3]	;"
-	"	vdup.16 d18,d16[2]	;"
-	"	vdup.16 d17,d16[1]	;"
-	"	vdup.16 d16,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	vdup.16 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31,d19[3]	;"
+				 "	vdup.16 d30,d19[2]	;"
+				 "	vdup.16 d29,d19[1]	;"
+				 "	vdup.16 d28,d19[0]	;"
+				 "	vdup.16 d27,d18[3]	;"
+				 "	vdup.16 d26,d18[2]	;"
+				 "	vdup.16 d25,d18[1]	;"
+				 "	vdup.16 d24,d18[0]	;"
+				 "	vdup.16 d23,d17[3]	;"
+				 "	vdup.16 d22,d17[2]	;"
+				 "	vdup.16 d21,d17[1]	;"
+				 "	vdup.16 d20,d17[0]	;"
+				 "	vdup.16 d19,d16[3]	;"
+				 "	vdup.16 d18,d16[2]	;"
+				 "	vdup.16 d17,d16[1]	;"
+				 "	vdup.16 d16,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	vdup.16 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x2_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x2_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31,d19[3]	;"
-	"	vdup.16 d30,d19[2]	;"
-	"	vdup.16 d29,d19[1]	;"
-	"	vdup.16 d28,d19[0]	;"
-	"	vdup.16 d27,d18[3]	;"
-	"	vdup.16 d26,d18[2]	;"
-	"	vdup.16 d25,d18[1]	;"
-	"	vdup.16 d24,d18[0]	;"
-	"	vdup.16 d23,d17[3]	;"
-	"	vdup.16 d22,d17[2]	;"
-	"	vdup.16 d21,d17[1]	;"
-	"	vdup.16 d20,d17[0]	;"
-	"	vdup.16 d19,d16[3]	;"
-	"	vdup.16 d18,d16[2]	;"
-	"	vdup.16 d17,d16[1]	;"
-	"	vdup.16 d16,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	vdup.16 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31,d19[3]	;"
+				 "	vdup.16 d30,d19[2]	;"
+				 "	vdup.16 d29,d19[1]	;"
+				 "	vdup.16 d28,d19[0]	;"
+				 "	vdup.16 d27,d18[3]	;"
+				 "	vdup.16 d26,d18[2]	;"
+				 "	vdup.16 d25,d18[1]	;"
+				 "	vdup.16 d24,d18[0]	;"
+				 "	vdup.16 d23,d17[3]	;"
+				 "	vdup.16 d22,d17[2]	;"
+				 "	vdup.16 d21,d17[1]	;"
+				 "	vdup.16 d20,d17[0]	;"
+				 "	vdup.16 d19,d16[3]	;"
+				 "	vdup.16 d18,d16[2]	;"
+				 "	vdup.16 d17,d16[1]	;"
+				 "	vdup.16 d16,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	vdup.16 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x3_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x3_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31,d19[3]	;"
-	"	vdup.16 d30,d19[2]	;"
-	"	vdup.16 d29,d19[1]	;"
-	"	vdup.16 d28,d19[0]	;"
-	"	vdup.16 d27,d18[3]	;"
-	"	vdup.16 d26,d18[2]	;"
-	"	vdup.16 d25,d18[1]	;"
-	"	vdup.16 d24,d18[0]	;"
-	"	vdup.16 d23,d17[3]	;"
-	"	vdup.16 d22,d17[2]	;"
-	"	vdup.16 d21,d17[1]	;"
-	"	vdup.16 d20,d17[0]	;"
-	"	vdup.16 d19,d16[3]	;"
-	"	vdup.16 d18,d16[2]	;"
-	"	vdup.16 d17,d16[1]	;"
-	"	vdup.16 d16,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	vstmia r10!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	vdup.16 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	vstmia r10!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31,d19[3]	;"
+				 "	vdup.16 d30,d19[2]	;"
+				 "	vdup.16 d29,d19[1]	;"
+				 "	vdup.16 d28,d19[0]	;"
+				 "	vdup.16 d27,d18[3]	;"
+				 "	vdup.16 d26,d18[2]	;"
+				 "	vdup.16 d25,d18[1]	;"
+				 "	vdup.16 d24,d18[0]	;"
+				 "	vdup.16 d23,d17[3]	;"
+				 "	vdup.16 d22,d17[2]	;"
+				 "	vdup.16 d21,d17[1]	;"
+				 "	vdup.16 d20,d17[0]	;"
+				 "	vdup.16 d19,d16[3]	;"
+				 "	vdup.16 d18,d16[2]	;"
+				 "	vdup.16 d17,d16[1]	;"
+				 "	vdup.16 d16,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	vstmia r10!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	vdup.16 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	vstmia r10!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x4_c16(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x4_c16(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr  = x32bytes offset
-	"	add r8, %0, %3		;"	// r8  = lineend offset
-	"	add r9, %1, %7		;"	// r9  = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 16 pixels 32 bytes
-	"	vdup.16 d31,d19[3]	;"
-	"	vdup.16 d30,d19[2]	;"
-	"	vdup.16 d29,d19[1]	;"
-	"	vdup.16 d28,d19[0]	;"
-	"	vdup.16 d27,d18[3]	;"
-	"	vdup.16 d26,d18[2]	;"
-	"	vdup.16 d25,d18[1]	;"
-	"	vdup.16 d24,d18[0]	;"
-	"	vdup.16 d23,d17[3]	;"
-	"	vdup.16 d22,d17[2]	;"
-	"	vdup.16 d21,d17[1]	;"
-	"	vdup.16 d20,d17[0]	;"
-	"	vdup.16 d19,d16[3]	;"
-	"	vdup.16 d18,d16[2]	;"
-	"	vdup.16 d17,d16[1]	;"
-	"	vdup.16 d16,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	vstmia r10!,{q8-q15}	;"
-	"	vstmia r11!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldrh lr, [%0],#2	;"	// rest
-	"	vdup.16 d16, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {d16}	;"
-	"	vstmia r9!, {d16}	;"
-	"	vstmia r10!, {d16}	;"
-	"	vstmia r11!, {d16}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale4x1_n16, &scale4x2_n16, &scale4x3_n16, &scale4x4_n16 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr  = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8  = lineend offset
+				 "	add r9, %1, %7		;"	   // r9  = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 16 pixels 32 bytes
+				 "	vdup.16 d31,d19[3]	;"
+				 "	vdup.16 d30,d19[2]	;"
+				 "	vdup.16 d29,d19[1]	;"
+				 "	vdup.16 d28,d19[0]	;"
+				 "	vdup.16 d27,d18[3]	;"
+				 "	vdup.16 d26,d18[2]	;"
+				 "	vdup.16 d25,d18[1]	;"
+				 "	vdup.16 d24,d18[0]	;"
+				 "	vdup.16 d23,d17[3]	;"
+				 "	vdup.16 d22,d17[2]	;"
+				 "	vdup.16 d21,d17[1]	;"
+				 "	vdup.16 d20,d17[0]	;"
+				 "	vdup.16 d19,d16[3]	;"
+				 "	vdup.16 d18,d16[2]	;"
+				 "	vdup.16 d17,d16[1]	;"
+				 "	vdup.16 d16,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	vstmia r10!,{q8-q15}	;"
+				 "	vstmia r11!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldrh lr, [%0],#2	;" // rest
+				 "	vdup.16 d16, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	vstmia r9!, {d16}	;"
+				 "	vstmia r10!, {d16}	;"
+				 "	vstmia r11!, {d16}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale4x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale4x1_n16, &scale4x2_n16, &scale4x3_n16, &scale4x4_n16};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale4x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+void scale4x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x1_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x1_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15,d19[1]	;"
-	"	vdup.32 q14,d19[0]	;"
-	"	vdup.32 q13,d18[1]	;"
-	"	vdup.32 q12,d18[0]	;"
-	"	vdup.32 q11,d17[1]	;"
-	"	vdup.32 q10,d17[0]	;"
-	"	vdup.32 q9,d16[1]	;"
-	"	vdup.32 q8,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 q8, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15,d19[1]	;"
+				 "	vdup.32 q14,d19[0]	;"
+				 "	vdup.32 q13,d18[1]	;"
+				 "	vdup.32 q12,d18[0]	;"
+				 "	vdup.32 q11,d17[1]	;"
+				 "	vdup.32 q10,d17[0]	;"
+				 "	vdup.32 q9,d16[1]	;"
+				 "	vdup.32 q8,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 q8, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x2_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x2_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*2 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15,d19[1]	;"
-	"	vdup.32 q14,d19[0]	;"
-	"	vdup.32 q13,d18[1]	;"
-	"	vdup.32 q12,d18[0]	;"
-	"	vdup.32 q11,d17[1]	;"
-	"	vdup.32 q10,d17[0]	;"
-	"	vdup.32 q9,d16[1]	;"
-	"	vdup.32 q8,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 q8, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8}	;"
-	"	vstmia r9!, {q8}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 2 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15,d19[1]	;"
+				 "	vdup.32 q14,d19[0]	;"
+				 "	vdup.32 q13,d18[1]	;"
+				 "	vdup.32 q12,d18[0]	;"
+				 "	vdup.32 q11,d17[1]	;"
+				 "	vdup.32 q10,d17[0]	;"
+				 "	vdup.32 q9,d16[1]	;"
+				 "	vdup.32 q8,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 q8, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8}	;"
+				 "	vstmia r9!, {q8}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x3_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x3_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*3 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15,d19[1]	;"
-	"	vdup.32 q14,d19[0]	;"
-	"	vdup.32 q13,d18[1]	;"
-	"	vdup.32 q12,d18[0]	;"
-	"	vdup.32 q11,d17[1]	;"
-	"	vdup.32 q10,d17[0]	;"
-	"	vdup.32 q9,d16[1]	;"
-	"	vdup.32 q8,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	vstmia r10!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 q8, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8}	;"
-	"	vstmia r9!, {q8}	;"
-	"	vstmia r10!, {q8}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	if (!sw||!sh) return;
+	uint32_t dadd = dp * 3 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15,d19[1]	;"
+				 "	vdup.32 q14,d19[0]	;"
+				 "	vdup.32 q13,d18[1]	;"
+				 "	vdup.32 q12,d18[0]	;"
+				 "	vdup.32 q11,d17[1]	;"
+				 "	vdup.32 q10,d17[0]	;"
+				 "	vdup.32 q9,d16[1]	;"
+				 "	vdup.32 q8,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	vstmia r10!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 q8, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8}	;"
+				 "	vstmia r9!, {q8}	;"
+				 "	vstmia r10!, {q8}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory", "cc");
+}
+
+void scale4x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	if (!sw || !sh)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	if (!sp) { sp = swl; } if (!dp) { dp = swl*4; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale4x4_c32(src,dst,sw,sh,sp,dw,dh,dp); return; }
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = swl * 4;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale4x4_c32(src, dst, sw, sh, sp, dw, dh, dp);
+		return;
+	}
 	uint32_t swl32 = swl & ~31;
 	uint32_t sadd = sp - swl;
-	uint32_t dadd = dp*4 - swl*4;
-	uint8_t* finofs = (uint8_t*)src + (sp*sh);
-	asm volatile (
-	"1:	add lr, %0, %2		;"	// lr = x32bytes offset
-	"	add r8, %0, %3		;"	// r8 = lineend offset
-	"	add r9, %1, %7		;"	// r9 = 2x line offset
-	"	add r10, r9, %7		;"	// r10 = 3x line offset
-	"	add r11, r10, %7	;"	// r11 = 4x line offset
-	"	cmp %0, lr		;"
-	"	beq 3f			;"
-	"2:	vldmia %0!,{q8-q9}	;"	// 8 pixels 32 bytes
-	"	vdup.32 q15,d19[1]	;"
-	"	vdup.32 q14,d19[0]	;"
-	"	vdup.32 q13,d18[1]	;"
-	"	vdup.32 q12,d18[0]	;"
-	"	vdup.32 q11,d17[1]	;"
-	"	vdup.32 q10,d17[0]	;"
-	"	vdup.32 q9,d16[1]	;"
-	"	vdup.32 q8,d16[0]	;"
-	"	cmp %0, lr		;"
-	"	vstmia %1!,{q8-q15}	;"
-	"	vstmia r9!,{q8-q15}	;"
-	"	vstmia r10!,{q8-q15}	;"
-	"	vstmia r11!,{q8-q15}	;"
-	"	bne 2b			;"
-	"3:	cmp %0, r8		;"
-	"	beq 5f			;"
-	"4:	ldr lr, [%0],#4		;"	// rest
-	"	vdup.32 q8, lr		;"
-	"	cmp %0, r8		;"
-	"	vstmia %1!, {q8}	;"
-	"	vstmia r9!, {q8}	;"
-	"	vstmia r10!, {q8}	;"
-	"	vstmia r11!, {q8}	;"
-	"	bne 4b			;"
-	"5:	add %0, %0, %4		;"
-	"	add %1, %1, %5		;"
-	"	cmp %0, %6		;"
-	"	bne 1b			"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
-	: "r8","r9","r10","r11","lr","q8","q9","q10","q11","q12","q13","q14","q15","memory","cc"
-	);
-}
-
-void scale4x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	void (* const func[4])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t)
-		 = { &scale4x1_n32, &scale4x2_n32, &scale4x3_n32, &scale4x4_n32 };
-	if (--ymul < 4) func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
+	uint32_t dadd = dp * 4 - swl * 4;
+	uint8_t *finofs = (uint8_t *)src + (sp * sh);
+	asm volatile("1:	add lr, %0, %2		;" // lr = x32bytes offset
+				 "	add r8, %0, %3		;"	   // r8 = lineend offset
+				 "	add r9, %1, %7		;"	   // r9 = 2x line offset
+				 "	add r10, r9, %7		;"	   // r10 = 3x line offset
+				 "	add r11, r10, %7	;"	   // r11 = 4x line offset
+				 "	cmp %0, lr		;"
+				 "	beq 3f			;"
+				 "2:	vldmia %0!,{q8-q9}	;" // 8 pixels 32 bytes
+				 "	vdup.32 q15,d19[1]	;"
+				 "	vdup.32 q14,d19[0]	;"
+				 "	vdup.32 q13,d18[1]	;"
+				 "	vdup.32 q12,d18[0]	;"
+				 "	vdup.32 q11,d17[1]	;"
+				 "	vdup.32 q10,d17[0]	;"
+				 "	vdup.32 q9,d16[1]	;"
+				 "	vdup.32 q8,d16[0]	;"
+				 "	cmp %0, lr		;"
+				 "	vstmia %1!,{q8-q15}	;"
+				 "	vstmia r9!,{q8-q15}	;"
+				 "	vstmia r10!,{q8-q15}	;"
+				 "	vstmia r11!,{q8-q15}	;"
+				 "	bne 2b			;"
+				 "3:	cmp %0, r8		;"
+				 "	beq 5f			;"
+				 "4:	ldr lr, [%0],#4		;" // rest
+				 "	vdup.32 q8, lr		;"
+				 "	cmp %0, r8		;"
+				 "	vstmia %1!, {q8}	;"
+				 "	vstmia r9!, {q8}	;"
+				 "	vstmia r10!, {q8}	;"
+				 "	vstmia r11!, {q8}	;"
+				 "	bne 4b			;"
+				 "5:	add %0, %0, %4		;"
+				 "	add %1, %1, %5		;"
+				 "	cmp %0, %6		;"
+				 "	bne 1b			"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl32), "r"(swl), "r"(sadd), "r"(dadd), "r"(finofs), "r"(dp)
+				 : "r8", "r9", "r10", "r11", "lr", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15", "memory",
+				   "cc");
+}
+
+void scale4x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	void (*const func[4])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+						  uint32_t) = {&scale4x1_n32, &scale4x2_n32, &scale4x3_n32, &scale4x4_n32};
+	if (--ymul < 4)
+		func[ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scale5x_n16line(void* src, void* dst, uint32_t swl) {
-	asm volatile (
-	"	bic r4, %2, #15		;"	// r4 = swl16
-	"	add r3, %0, %2		;"	// r3 = lineend offset
-	"	add r4, %0, r4		;"	// r4 = x16bytes offset
-	"	cmp %0, r4		;"
-	"	beq 2f			;"
-	"1:	vldmia %0!, {q8}	;"	// 8 pixels 16 bytes
-	"	vdup.16 d25, d17[3]	;"	//  7777
-	"	vdup.16 d27, d17[2]	;"	//  6666
-	"	vdup.16 d26, d17[1]	;"	//  5555
-	"	vdup.16 d21, d17[0]	;"	//  4444
-	"	vext.16 d24, d27,d25,#1	;"	// 6667
-	"	vext.16 d23, d26,d27,#2	;"	// 5566
-	"	vext.16 d22, d21,d26,#3	;"	// 4555
-	"	vdup.16 d20, d16[3]	;"	//  3333
-	"	vdup.16 d27, d16[2]	;"	//  2222
-	"	vdup.16 d26, d16[1]	;"	//  1111
-	"	vdup.16 d16, d16[0]	;"	//  0000
-	"	vext.16 d19, d27,d20,#1	;"	// 2223
-	"	vext.16 d18, d26,d27,#2	;"	// 1122
-	"	vext.16 d17, d16,d26,#3	;"	// 0111
-	"	cmp %0, r4		;"
-	"	vstmia %1!, {q8-q12}	;"
-	"	bne 1b			;"
-	"2:	cmp %0, r3		;"
-	"	beq 4f			;"
-	"3:	ldrh r4, [%0],#2	;"	// rest
-	"	orr r4, r4, lsl #16	;"
-	"	cmp %0, r3		;"
-	"	str r4, [%1],#4		;"
-	"	str r4, [%1],#4		;"
-	"	strh r4, [%1],#2	;"
-	"	bne 3b			;"
-	"4:				"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl)
-	: "r3","r4","q8","q9","q10","q11","q12","q13","memory","cc"
-	);
-}
-
-void scale5x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
+void scale5x_n16line(void *src, void *dst, uint32_t swl)
+{
+	asm volatile("	bic r4, %2, #15		;" // r4 = swl16
+				 "	add r3, %0, %2		;" // r3 = lineend offset
+				 "	add r4, %0, r4		;" // r4 = x16bytes offset
+				 "	cmp %0, r4		;"
+				 "	beq 2f			;"
+				 "1:	vldmia %0!, {q8}	;" // 8 pixels 16 bytes
+				 "	vdup.16 d25, d17[3]	;"	   //  7777
+				 "	vdup.16 d27, d17[2]	;"	   //  6666
+				 "	vdup.16 d26, d17[1]	;"	   //  5555
+				 "	vdup.16 d21, d17[0]	;"	   //  4444
+				 "	vext.16 d24, d27,d25,#1	;" // 6667
+				 "	vext.16 d23, d26,d27,#2	;" // 5566
+				 "	vext.16 d22, d21,d26,#3	;" // 4555
+				 "	vdup.16 d20, d16[3]	;"	   //  3333
+				 "	vdup.16 d27, d16[2]	;"	   //  2222
+				 "	vdup.16 d26, d16[1]	;"	   //  1111
+				 "	vdup.16 d16, d16[0]	;"	   //  0000
+				 "	vext.16 d19, d27,d20,#1	;" // 2223
+				 "	vext.16 d18, d26,d27,#2	;" // 1122
+				 "	vext.16 d17, d16,d26,#3	;" // 0111
+				 "	cmp %0, r4		;"
+				 "	vstmia %1!, {q8-q12}	;"
+				 "	bne 1b			;"
+				 "2:	cmp %0, r3		;"
+				 "	beq 4f			;"
+				 "3:	ldrh r4, [%0],#2	;" // rest
+				 "	orr r4, r4, lsl #16	;"
+				 "	cmp %0, r3		;"
+				 "	str r4, [%1],#4		;"
+				 "	str r4, [%1],#4		;"
+				 "	strh r4, [%1],#2	;"
+				 "	bne 3b			;"
+				 "4:				"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl)
+				 : "r3", "r4", "q8", "q9", "q10", "q11", "q12", "q13", "memory", "cc");
+}
+
+void scale5x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	uint32_t dwl = swl*5;
-	if (!sp) { sp = swl; } if (!dp) { dp = dwl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale5x_c16(src,dst,sw,sh,sp,dw,dh,dp,ymul); return; }
-	void* __restrict dstsrc;
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
+	uint32_t dwl = swl * 5;
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = dwl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale5x_c16(src, dst, sw, sh, sp, dw, dh, dp, ymul);
+		return;
+	}
+	void *__restrict dstsrc;
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
 		scale5x_n16line(src, dst, swl);
-		dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy_neon(dst, dstsrc, dwl);
-	}
-}
-
-void scale5x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale5x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale5x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale5x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale5x5_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-
-void scale5x_n32line(void* src, void* dst, uint32_t swl) {
-	asm volatile (
-	"	bic r4, %2, #15		;"	// r4 = swl16
-	"	add r3, %0, %2		;"	// r3 = lineend offset
-	"	add r4, %0, r4		;"	// r4 = x16bytes offset
-	"	cmp %0, r4		;"
-	"	beq 2f			;"
-	"1:	vldmia %0!,{q8}		;"	// 4 pixels 16 bytes
-	"	vdup.32 q12, d17[1]	;"	// 3333
-	"	vdup.32 q14, d17[0]	;"	//  2222
-	"	vdup.32 q13, d16[1]	;"	//  1111
-	"	vdup.32 q8, d16[0]	;"	// 0000
-	"	vext.32 q11, q14,q12,#1	;"	// 2223
-	"	vext.32 q10, q13,q14,#2	;"	// 1122
-	"	vext.32 q9, q8,q13,#3	;"	// 0111
-	"	cmp %0, r4		;"
-	"	vstmia %1!,{q8-q12}	;"
-	"	bne 1b			;"
-	"2:	cmp %0, r3		;"
-	"	beq 4f			;"
-	"3:	ldr r4, [%0],#4		;"	// rest
-	"	vdup.32 q8, r4		;"
-	"	cmp %0, r3		;"
-	"	vstmia %1!, {q8}	;"
-	"	str r4, [%1],#4		;"
-	"	bne 3b			;"
-	"4:				"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl)
-	: "r3","r4","q8","q9","q10","q11","q12","q13","q14","memory","cc"
-	);
-}
-
-void scale5x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
+		dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, dstsrc, dwl);
+	}
+}
+
+void scale5x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale5x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale5x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale5x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale5x5_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n16(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+
+void scale5x_n32line(void *src, void *dst, uint32_t swl)
+{
+	asm volatile("	bic r4, %2, #15		;" // r4 = swl16
+				 "	add r3, %0, %2		;" // r3 = lineend offset
+				 "	add r4, %0, r4		;" // r4 = x16bytes offset
+				 "	cmp %0, r4		;"
+				 "	beq 2f			;"
+				 "1:	vldmia %0!,{q8}		;" // 4 pixels 16 bytes
+				 "	vdup.32 q12, d17[1]	;"	   // 3333
+				 "	vdup.32 q14, d17[0]	;"	   //  2222
+				 "	vdup.32 q13, d16[1]	;"	   //  1111
+				 "	vdup.32 q8, d16[0]	;"	   // 0000
+				 "	vext.32 q11, q14,q12,#1	;" // 2223
+				 "	vext.32 q10, q13,q14,#2	;" // 1122
+				 "	vext.32 q9, q8,q13,#3	;" // 0111
+				 "	cmp %0, r4		;"
+				 "	vstmia %1!,{q8-q12}	;"
+				 "	bne 1b			;"
+				 "2:	cmp %0, r3		;"
+				 "	beq 4f			;"
+				 "3:	ldr r4, [%0],#4		;" // rest
+				 "	vdup.32 q8, r4		;"
+				 "	cmp %0, r3		;"
+				 "	vstmia %1!, {q8}	;"
+				 "	str r4, [%1],#4		;"
+				 "	bne 3b			;"
+				 "4:				"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl)
+				 : "r3", "r4", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "memory", "cc");
+}
+
+void scale5x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	uint32_t dwl = swl*5;
-	if (!sp) { sp = swl; } if (!dp) { dp = dwl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale5x_c32(src,dst,sw,sh,sp,dw,dh,dp,ymul); return; }
-	void* __restrict dstsrc;
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
+	uint32_t dwl = swl * 5;
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = dwl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale5x_c32(src, dst, sw, sh, sp, dw, dh, dp, ymul);
+		return;
+	}
+	void *__restrict dstsrc;
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
 		scale5x_n32line(src, dst, swl);
-		dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy_neon(dst, dstsrc, dwl);
-	}
-}
-
-void scale5x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale5x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale5x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale5x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale5x5_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-
-void scale6x_n16line(void* src, void* dst, uint32_t swl) {
-	asm volatile (
-	"	bic r4, %2, #15		;"	// r4 = swl16
-	"	add r3, %0, %2		;"	// r3 = lineend offset
-	"	add r4, %0, r4		;"	// r4 = x16bytes offset
-	"	cmp %0, r4		;"
-	"	beq 2f			;"
-	"1:	vldmia %0!, {q8}	;"	// 8 pixels 16 bytes
-	"	vdup.16 d27, d17[3]	;"	//  7777
-	"	vdup.16 d25, d17[2]	;"	//  6666
-	"	vdup.16 d24, d17[1]	;"	//  5555
-	"	vdup.16 d22, d17[0]	;"	//  4444
-	"	vext.16 d26, d25,d27,#2	;"	// 6677
-	"	vext.16 d23, d22,d24,#2	;"	// 4455
-	"	vdup.16 d21, d16[3]	;"	//  3333
-	"	vdup.16 d19, d16[2]	;"	//  2222
-	"	vdup.16 d18, d16[1]	;"	//  1111
-	"	vdup.16 d16, d16[0]	;"	//  0000
-	"	vext.16 d20, d19,d21,#2	;"	// 2233
-	"	vext.16 d17, d16,d18,#2	;"	// 0011
-	"	cmp %0, r4		;"
-	"	vstmia %1!, {q8-q13}	;"
-	"	bne 1b			;"
-	"2:	cmp %0, r3		;"
-	"	beq 4f			;"
-	"3:	ldrh r4, [%0],#2	;"	// rest
-	"	orr r4, r4, lsl #16	;"
-	"	vdup.32 d16, r4		;"
-	"	cmp %0, r3		;"
-	"	vstmia %1!, {d16}	;"
-	"	str r4, [%1],#4		;"
-	"	bne 3b			;"
-	"4:				"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl)
-	: "r3","r4","q8","q9","q10","q11","q12","q13","memory","cc"
-	);
-}
-
-void scale6x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
+		dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, dstsrc, dwl);
+	}
+}
+
+void scale5x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale5x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale5x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale5x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale5x5_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale5x_n32(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+
+void scale6x_n16line(void *src, void *dst, uint32_t swl)
+{
+	asm volatile("	bic r4, %2, #15		;" // r4 = swl16
+				 "	add r3, %0, %2		;" // r3 = lineend offset
+				 "	add r4, %0, r4		;" // r4 = x16bytes offset
+				 "	cmp %0, r4		;"
+				 "	beq 2f			;"
+				 "1:	vldmia %0!, {q8}	;" // 8 pixels 16 bytes
+				 "	vdup.16 d27, d17[3]	;"	   //  7777
+				 "	vdup.16 d25, d17[2]	;"	   //  6666
+				 "	vdup.16 d24, d17[1]	;"	   //  5555
+				 "	vdup.16 d22, d17[0]	;"	   //  4444
+				 "	vext.16 d26, d25,d27,#2	;" // 6677
+				 "	vext.16 d23, d22,d24,#2	;" // 4455
+				 "	vdup.16 d21, d16[3]	;"	   //  3333
+				 "	vdup.16 d19, d16[2]	;"	   //  2222
+				 "	vdup.16 d18, d16[1]	;"	   //  1111
+				 "	vdup.16 d16, d16[0]	;"	   //  0000
+				 "	vext.16 d20, d19,d21,#2	;" // 2233
+				 "	vext.16 d17, d16,d18,#2	;" // 0011
+				 "	cmp %0, r4		;"
+				 "	vstmia %1!, {q8-q13}	;"
+				 "	bne 1b			;"
+				 "2:	cmp %0, r3		;"
+				 "	beq 4f			;"
+				 "3:	ldrh r4, [%0],#2	;" // rest
+				 "	orr r4, r4, lsl #16	;"
+				 "	vdup.32 d16, r4		;"
+				 "	cmp %0, r3		;"
+				 "	vstmia %1!, {d16}	;"
+				 "	str r4, [%1],#4		;"
+				 "	bne 3b			;"
+				 "4:				"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl)
+				 : "r3", "r4", "q8", "q9", "q10", "q11", "q12", "q13", "memory", "cc");
+}
+
+void scale6x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
 	uint32_t swl = sw * sizeof(uint16_t);
-	uint32_t dwl = swl*6;
-	if (!sp) { sp = swl; } if (!dp) { dp = dwl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale6x_c16(src,dst,sw,sh,sp,dw,dh,dp,ymul); return; }
-	void* __restrict dstsrc;
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
+	uint32_t dwl = swl * 6;
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = dwl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale6x_c16(src, dst, sw, sh, sp, dw, dh, dp, ymul);
+		return;
+	}
+	void *__restrict dstsrc;
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
 		scale6x_n16line(src, dst, swl);
-		dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy_neon(dst, dstsrc, dwl);
-	}
-}
-
-void scale6x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale6x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale6x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale6x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale6x5_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-void scale6x6_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 6); }
-
-void scale6x_n32line(void* src, void* dst, uint32_t swl) {
-	asm volatile (
-	"	bic r4, %2, #15		;"	// r4 = swl16
-	"	add r3, %0, %2		;"	// r3 = lineend offset
-	"	add r4, %0, r4		;"	// r4 = x16bytes offset
-	"	cmp %0, r4		;"
-	"	beq 2f			;"
-	"1:	vldmia %0!,{q8}		;"	// 4 pixels 16 bytes
-	"	vdup.32 q13, d17[1]	;"	// 3333
-	"	vdup.32 q11, d17[0]	;"	// 2222
-	"	vdup.32 q10, d16[1]	;"	// 1111
-	"	vdup.32 q8, d16[0]	;"	// 0000
-	"	vext.32 q12, q11,q13,#2	;"	// 2233
-	"	vext.32 q9, q8,q10,#2	;"	// 0011
-	"	cmp %0, r4		;"
-	"	vstmia %1!,{q8-q13}	;"
-	"	bne 1b			;"
-	"2:	cmp %0, r3		;"
-	"	beq 4f			;"
-	"3:	ldr r4, [%0],#4		;"	// rest
-	"	vdup.32 q8, r4		;"
-	"	vmov d18, d16		;"
-	"	cmp %0, r3		;"
-	"	vstmia %1!, {d16-d18}	;"
-	"	bne 3b			;"
-	"4:				"
-	: "+r"(src), "+r"(dst)
-	: "r"(swl)
-	: "r3","r4","q8","q9","q10","q11","q12","q13","memory","cc"
-	);
-}
-
-void scale6x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul) {
-	if (!sw||!sh||!ymul) return;
+		dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, dstsrc, dwl);
+	}
+}
+
+void scale6x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale6x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale6x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale6x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale6x5_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+void scale6x6_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n16(src, dst, sw, sh, sp, dw, dh, dp, 6);
+}
+
+void scale6x_n32line(void *src, void *dst, uint32_t swl)
+{
+	asm volatile("	bic r4, %2, #15		;" // r4 = swl16
+				 "	add r3, %0, %2		;" // r3 = lineend offset
+				 "	add r4, %0, r4		;" // r4 = x16bytes offset
+				 "	cmp %0, r4		;"
+				 "	beq 2f			;"
+				 "1:	vldmia %0!,{q8}		;" // 4 pixels 16 bytes
+				 "	vdup.32 q13, d17[1]	;"	   // 3333
+				 "	vdup.32 q11, d17[0]	;"	   // 2222
+				 "	vdup.32 q10, d16[1]	;"	   // 1111
+				 "	vdup.32 q8, d16[0]	;"	   // 0000
+				 "	vext.32 q12, q11,q13,#2	;" // 2233
+				 "	vext.32 q9, q8,q10,#2	;" // 0011
+				 "	cmp %0, r4		;"
+				 "	vstmia %1!,{q8-q13}	;"
+				 "	bne 1b			;"
+				 "2:	cmp %0, r3		;"
+				 "	beq 4f			;"
+				 "3:	ldr r4, [%0],#4		;" // rest
+				 "	vdup.32 q8, r4		;"
+				 "	vmov d18, d16		;"
+				 "	cmp %0, r3		;"
+				 "	vstmia %1!, {d16-d18}	;"
+				 "	bne 3b			;"
+				 "4:				"
+				 : "+r"(src), "+r"(dst)
+				 : "r"(swl)
+				 : "r3", "r4", "q8", "q9", "q10", "q11", "q12", "q13", "memory", "cc");
+}
+
+void scale6x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul)
+{
+	if (!sw || !sh || !ymul)
+		return;
 	uint32_t swl = sw * sizeof(uint32_t);
-	uint32_t dwl = swl*6;
-	if (!sp) { sp = swl; } if (!dp) { dp = dwl; }
-	if ( ((uintptr_t)src&3)||((uintptr_t)dst&3)||(sp&3)||(dp&3) ) { scale6x_c32(src,dst,sw,sh,sp,dw,dh,dp,ymul); return; }
-	void* __restrict dstsrc;
-	for (; sh>0; sh--, src=(uint8_t*)src+sp) {
+	uint32_t dwl = swl * 6;
+	if (!sp) {
+		sp = swl;
+	}
+	if (!dp) {
+		dp = dwl;
+	}
+	if (((uintptr_t)src & 3) || ((uintptr_t)dst & 3) || (sp & 3) || (dp & 3)) {
+		scale6x_c32(src, dst, sw, sh, sp, dw, dh, dp, ymul);
+		return;
+	}
+	void *__restrict dstsrc;
+	for (; sh > 0; sh--, src = (uint8_t *)src + sp) {
 		scale6x_n32line(src, dst, swl);
-		dstsrc = dst; dst = (uint8_t*)dst+dp;
-		for (uint32_t i=ymul-1; i>0; i--, dst=(uint8_t*)dst+dp) memcpy_neon(dst, dstsrc, dwl);
-	}
-}
-
-void scale6x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 1); }
-void scale6x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 2); }
-void scale6x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 3); }
-void scale6x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 4); }
-void scale6x5_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 5); }
-void scale6x6_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 6); }
-
-void scaler_n16(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	void (* const func[6][8])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t) = {
-			{ &scale1x1_n16, &scale1x2_n16, &scale1x3_n16, &scale1x4_n16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale2x1_n16, &scale2x2_n16, &scale2x3_n16, &scale2x4_n16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale3x1_n16, &scale3x2_n16, &scale3x3_n16, &scale3x4_n16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale4x1_n16, &scale4x2_n16, &scale4x3_n16, &scale4x4_n16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale5x1_n16, &scale5x2_n16, &scale5x3_n16, &scale5x4_n16, &scale5x5_n16, &dummy, &dummy, &dummy },
-			{ &scale6x1_n16, &scale6x2_n16, &scale6x3_n16, &scale6x4_n16, &scale6x5_n16, &scale6x6_n16, &dummy, &dummy }
-		   };
-	if ((--xmul < 6)&&(--ymul < 6)) func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
+		dstsrc = dst;
+		dst = (uint8_t *)dst + dp;
+		for (uint32_t i = ymul - 1; i > 0; i--, dst = (uint8_t *)dst + dp)
+			memcpy_neon(dst, dstsrc, dwl);
+	}
+}
+
+void scale6x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 1);
+}
+void scale6x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 2);
+}
+void scale6x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 3);
+}
+void scale6x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 4);
+}
+void scale6x5_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 5);
+}
+void scale6x6_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
+	scale6x_n32(src, dst, sw, sh, sp, dw, dh, dp, 6);
+}
+
+void scaler_n16(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp)
+{
+	void (*const func[6][8])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+							 uint32_t) = {
+		{&scale1x1_n16, &scale1x2_n16, &scale1x3_n16, &scale1x4_n16, &dummy, &dummy, &dummy, &dummy},
+		{&scale2x1_n16, &scale2x2_n16, &scale2x3_n16, &scale2x4_n16, &dummy, &dummy, &dummy, &dummy},
+		{&scale3x1_n16, &scale3x2_n16, &scale3x3_n16, &scale3x4_n16, &dummy, &dummy, &dummy, &dummy},
+		{&scale4x1_n16, &scale4x2_n16, &scale4x3_n16, &scale4x4_n16, &dummy, &dummy, &dummy, &dummy},
+		{&scale5x1_n16, &scale5x2_n16, &scale5x3_n16, &scale5x4_n16, &scale5x5_n16, &dummy, &dummy, &dummy},
+		{&scale6x1_n16, &scale6x2_n16, &scale6x3_n16, &scale6x4_n16, &scale6x5_n16, &scale6x6_n16, &dummy, &dummy}};
+	if ((--xmul < 6) && (--ymul < 6))
+		func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scaler_n32(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	void (* const func[6][8])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t) = {
-			{ &scale1x1_n32, &scale1x2_n32, &scale1x3_n32, &scale1x4_n32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale2x1_n32, &scale2x2_n32, &scale2x3_n32, &scale2x4_n32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale3x1_n32, &scale3x2_n32, &scale3x3_n32, &scale3x4_n32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale4x1_n32, &scale4x2_n32, &scale4x3_n32, &scale4x4_n32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale5x1_n32, &scale5x2_n32, &scale5x3_n32, &scale5x4_n32, &scale5x5_n32, &dummy, &dummy, &dummy },
-			{ &scale6x1_n32, &scale6x2_n32, &scale6x3_n32, &scale6x4_n32, &scale6x5_n32, &scale6x6_n32, &dummy, &dummy }
-		   };
-	if ((--xmul < 6)&&(--ymul < 6)) func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
+void scaler_n32(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp)
+{
+	void (*const func[6][8])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+							 uint32_t) = {
+		{&scale1x1_n32, &scale1x2_n32, &scale1x3_n32, &scale1x4_n32, &dummy, &dummy, &dummy, &dummy},
+		{&scale2x1_n32, &scale2x2_n32, &scale2x3_n32, &scale2x4_n32, &dummy, &dummy, &dummy, &dummy},
+		{&scale3x1_n32, &scale3x2_n32, &scale3x3_n32, &scale3x4_n32, &dummy, &dummy, &dummy, &dummy},
+		{&scale4x1_n32, &scale4x2_n32, &scale4x3_n32, &scale4x4_n32, &dummy, &dummy, &dummy, &dummy},
+		{&scale5x1_n32, &scale5x2_n32, &scale5x3_n32, &scale5x4_n32, &scale5x5_n32, &dummy, &dummy, &dummy},
+		{&scale6x1_n32, &scale6x2_n32, &scale6x3_n32, &scale6x4_n32, &scale6x5_n32, &scale6x6_n32, &dummy, &dummy}};
+	if ((--xmul < 6) && (--ymul < 6))
+		func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
 #endif
 
-void scaler_c16(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	void (* const func[6][8])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t) = {
-			{ &scale1x1_c16, &scale1x2_c16, &scale1x3_c16, &scale1x4_c16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale2x1_c16, &scale2x2_c16, &scale2x3_c16, &scale2x4_c16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale3x1_c16, &scale3x2_c16, &scale3x3_c16, &scale3x4_c16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale4x1_c16, &scale4x2_c16, &scale4x3_c16, &scale4x4_c16, &dummy, &dummy, &dummy, &dummy },
-			{ &scale5x1_c16, &scale5x2_c16, &scale5x3_c16, &scale5x4_c16, &scale5x5_c16, &dummy, &dummy, &dummy },
-			{ &scale6x1_c16, &scale6x2_c16, &scale6x3_c16, &scale6x4_c16, &scale6x5_c16, &scale6x6_c16, &dummy, &dummy }
-		   };
-	if ((--xmul < 6)&&(--ymul < 6)) func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
+void scaler_c16(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp)
+{
+	void (*const func[6][8])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+							 uint32_t) = {
+		{&scale1x1_c16, &scale1x2_c16, &scale1x3_c16, &scale1x4_c16, &dummy, &dummy, &dummy, &dummy},
+		{&scale2x1_c16, &scale2x2_c16, &scale2x3_c16, &scale2x4_c16, &dummy, &dummy, &dummy, &dummy},
+		{&scale3x1_c16, &scale3x2_c16, &scale3x3_c16, &scale3x4_c16, &dummy, &dummy, &dummy, &dummy},
+		{&scale4x1_c16, &scale4x2_c16, &scale4x3_c16, &scale4x4_c16, &dummy, &dummy, &dummy, &dummy},
+		{&scale5x1_c16, &scale5x2_c16, &scale5x3_c16, &scale5x4_c16, &scale5x5_c16, &dummy, &dummy, &dummy},
+		{&scale6x1_c16, &scale6x2_c16, &scale6x3_c16, &scale6x4_c16, &scale6x5_c16, &scale6x6_c16, &dummy, &dummy}};
+	if ((--xmul < 6) && (--ymul < 6))
+		func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
-void scaler_c32(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
-	void (* const func[6][8])(void* __restrict, void* __restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t) = {
-			{ &scale1x1_c32, &scale1x2_c32, &scale1x3_c32, &scale1x4_c32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale2x1_c32, &scale2x2_c32, &scale2x3_c32, &scale2x4_c32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale3x1_c32, &scale3x2_c32, &scale3x3_c32, &scale3x4_c32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale4x1_c32, &scale4x2_c32, &scale4x3_c32, &scale4x4_c32, &dummy, &dummy, &dummy, &dummy },
-			{ &scale5x1_c32, &scale5x2_c32, &scale5x3_c32, &scale5x4_c32, &scale5x5_c32, &dummy, &dummy, &dummy },
-			{ &scale6x1_c32, &scale6x2_c32, &scale6x3_c32, &scale6x4_c32, &scale6x5_c32, &scale6x6_c32, &dummy, &dummy }
-		   };
-	if ((--xmul < 6)&&(--ymul < 6)) func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
+void scaler_c32(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp)
+{
+	void (*const func[6][8])(void *__restrict, void *__restrict, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t,
+							 uint32_t) = {
+		{&scale1x1_c32, &scale1x2_c32, &scale1x3_c32, &scale1x4_c32, &dummy, &dummy, &dummy, &dummy},
+		{&scale2x1_c32, &scale2x2_c32, &scale2x3_c32, &scale2x4_c32, &dummy, &dummy, &dummy, &dummy},
+		{&scale3x1_c32, &scale3x2_c32, &scale3x3_c32, &scale3x4_c32, &dummy, &dummy, &dummy, &dummy},
+		{&scale4x1_c32, &scale4x2_c32, &scale4x3_c32, &scale4x4_c32, &dummy, &dummy, &dummy, &dummy},
+		{&scale5x1_c32, &scale5x2_c32, &scale5x3_c32, &scale5x4_c32, &scale5x5_c32, &dummy, &dummy, &dummy},
+		{&scale6x1_c32, &scale6x2_c32, &scale6x3_c32, &scale6x4_c32, &scale6x5_c32, &scale6x6_c32, &dummy, &dummy}};
+	if ((--xmul < 6) && (--ymul < 6))
+		func[xmul][ymul](src, dst, sw, sh, sp, dw, dh, dp);
 	return;
 }
 
 
 // from gambatte-dms
-//from RGB565
+// from RGB565
 #define cR(A) (((A) & 0xf800) >> 11)
 #define cG(A) (((A) & 0x7e0) >> 5)
 #define cB(A) ((A) & 0x1f)
-//to RGB565
-#define Weight2_3(A, B)  (((((cR(A) << 1) + (cR(B) * 3)) / 5) & 0x1f) << 11 | ((((cG(A) << 1) + (cG(B) * 3)) / 5) & 0x3f) << 5 | ((((cB(A) << 1) + (cB(B) * 3)) / 5) & 0x1f))
-#define Weight3_1(A, B)  ((((cR(B) + (cR(A) * 3)) >> 2) & 0x1f) << 11 | (((cG(B) + (cG(A) * 3)) >> 2) & 0x3f) << 5 | (((cB(B) + (cB(A) * 3)) >> 2) & 0x1f))
-#define Weight3_2(A, B)  (((((cR(B) << 1) + (cR(A) * 3)) / 5) & 0x1f) << 11 | ((((cG(B) << 1) + (cG(A) * 3)) / 5) & 0x3f) << 5 | ((((cB(B) << 1) + (cB(A) * 3)) / 5) & 0x1f))
+// to RGB565
+#define Weight2_3(A, B)                                                                                                \
+	(((((cR(A) << 1) + (cR(B) * 3)) / 5) & 0x1f) << 11 | ((((cG(A) << 1) + (cG(B) * 3)) / 5) & 0x3f) << 5 |            \
+	 ((((cB(A) << 1) + (cB(B) * 3)) / 5) & 0x1f))
+#define Weight3_1(A, B)                                                                                                \
+	((((cR(B) + (cR(A) * 3)) >> 2) & 0x1f) << 11 | (((cG(B) + (cG(A) * 3)) >> 2) & 0x3f) << 5 |                        \
+	 (((cB(B) + (cB(A) * 3)) >> 2) & 0x1f))
+#define Weight3_2(A, B)                                                                                                \
+	(((((cR(B) << 1) + (cR(A) * 3)) / 5) & 0x1f) << 11 | ((((cG(B) << 1) + (cG(A) * 3)) / 5) & 0x3f) << 5 |            \
+	 ((((cB(B) << 1) + (cB(A) * 3)) / 5) & 0x1f))
 
 #define MIN(a, b) (a) < (b) ? (a) : (b)
-void scale1x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale1x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	// pitch of src image not src buffer!
-	// eg. gb has a 160 pixel wide image but 
+	// eg. gb has a 160 pixel wide image but
 	// gambatte uses a 256 pixel wide buffer
-	// (only matters when using memcpy) 
-	int ip = sw * FIXED_BPP; 
+	// (only matters when using memcpy)
+	int ip = sw * FIXED_BPP;
 	int src_stride = 2 * sp / FIXED_BPP;
 	int dst_stride = 2 * dp / FIXED_BPP;
 	int cpy_pitch = MIN(ip, dp);
-	
+
 	uint16_t k = 0x0000;
-	uint16_t* restrict src_row = (uint16_t*)src;
-	uint16_t* restrict dst_row = (uint16_t*)dst;
-	for (int y=0; y<sh; y+=2) {
+	uint16_t *restrict src_row = (uint16_t *)src;
+	uint16_t *restrict dst_row = (uint16_t *)dst;
+	for (int y = 0; y < sh; y += 2) {
 		memcpy(dst_row, src_row, cpy_pitch);
 		dst_row += dst_stride;
 		src_row += src_stride;
-		for (unsigned x=0; x<sw; x++) {
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t s = *(src_row + x);
 			*(dst_row + x) = Weight3_1(s, k);
 		}
 	}
 }
-void scale2x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale2x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	dw = dp / 2;
 	uint16_t k = 0x0000;
-	for (unsigned y=0; y<sh; y++) {
-		uint16_t* restrict src_row = (void*)src + y * sp;
-		uint16_t* restrict dst_row = (void*)dst + y * dp * 2;
-		for (unsigned x=0; x<sw; x++) {
+	for (unsigned y = 0; y < sh; y++) {
+		uint16_t *restrict src_row = (void *)src + y * sp;
+		uint16_t *restrict dst_row = (void *)dst + y * dp * 2;
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t c1 = *src_row;
-			uint16_t c2 = Weight3_2( c1, k);
-			
-			*(dst_row     ) = c1;
-			*(dst_row + 1 ) = c1;
-			
-			*(dst_row + dw    ) = c2;
+			uint16_t c2 = Weight3_2(c1, k);
+
+			*(dst_row) = c1;
+			*(dst_row + 1) = c1;
+
+			*(dst_row + dw) = c2;
 			*(dst_row + dw + 1) = c2;
-			
+
 			src_row += 1;
 			dst_row += 2;
 		}
 	}
 }
-void scale3x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale3x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	dw = dp / 2;
 	uint16_t k = 0x0000;
-	for (unsigned y=0; y<sh; y++) {
-		uint16_t* restrict src_row = (void*)src + y * sp;
-		uint16_t* restrict dst_row = (void*)dst + y * dp * 3;
-		for (unsigned x=0; x<sw; x++) {
+	for (unsigned y = 0; y < sh; y++) {
+		uint16_t *restrict src_row = (void *)src + y * sp;
+		uint16_t *restrict dst_row = (void *)dst + y * dp * 3;
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t c1 = *src_row;
-			uint16_t c2 = Weight3_2( c1, k);
-			
+			uint16_t c2 = Weight3_2(c1, k);
+
 			// row 1
-			*(dst_row             ) = c2;
-			*(dst_row          + 1) = c2;
-			*(dst_row          + 2) = c2;
+			*(dst_row) = c2;
+			*(dst_row + 1) = c2;
+			*(dst_row + 2) = c2;
 
 			// row 2
-			*(dst_row + dw * 1    ) = c1;
+			*(dst_row + dw * 1) = c1;
 			*(dst_row + dw * 1 + 1) = c1;
 			*(dst_row + dw * 1 + 2) = c1;
 
 			// row 3
-			*(dst_row + dw * 2    ) = c1;
+			*(dst_row + dw * 2) = c1;
 			*(dst_row + dw * 2 + 1) = c1;
 			*(dst_row + dw * 2 + 2) = c1;
 
@@ -2977,38 +3804,40 @@ void scale3x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint3
 		}
 	}
 }
-void scale4x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale4x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	dw = dp / 2;
 	int row3 = dw * 2;
 	int row4 = dw * 3;
 	uint16_t k = 0x0000;
-	for (unsigned y=0; y<sh; y++) {
-		uint16_t* restrict src_row = (void*)src + y * sp;
-		uint16_t* restrict dst_row = (void*)dst + y * dp * 4;
-		for (unsigned x=0; x<sw; x++) {
+	for (unsigned y = 0; y < sh; y++) {
+		uint16_t *restrict src_row = (void *)src + y * sp;
+		uint16_t *restrict dst_row = (void *)dst + y * dp * 4;
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t c1 = *src_row;
-			uint16_t c2 = Weight3_2( c1, k);
-			
+			uint16_t c2 = Weight3_2(c1, k);
+
 			// row 1
-			*(dst_row    ) = c1;
+			*(dst_row) = c1;
 			*(dst_row + 1) = c1;
 			*(dst_row + 2) = c1;
 			*(dst_row + 3) = c1;
-			
+
 			// row 2
-			*(dst_row + dw    ) = c2;
+			*(dst_row + dw) = c2;
 			*(dst_row + dw + 1) = c2;
 			*(dst_row + dw + 2) = c2;
 			*(dst_row + dw + 3) = c2;
 
 			// row 3
-			*(dst_row + row3    ) = c1;
+			*(dst_row + row3) = c1;
 			*(dst_row + row3 + 1) = c1;
 			*(dst_row + row3 + 2) = c1;
 			*(dst_row + row3 + 3) = c1;
 
 			// row 4
-			*(dst_row + row4    ) = c2;
+			*(dst_row + row4) = c2;
 			*(dst_row + row4 + 1) = c2;
 			*(dst_row + row4 + 2) = c2;
 			*(dst_row + row4 + 3) = c2;
@@ -3019,50 +3848,54 @@ void scale4x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint3
 	}
 }
 
-void scale2x_grid(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale2x_grid(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	dw = dp / 2;
 	uint16_t k = 0x0000;
-	for (unsigned y=0; y<sh; y++) {
-		uint16_t* restrict src_row = (void*)src + y * sp;
-		uint16_t* restrict dst_row = (void*)dst + y * dp * 2;
-		for (unsigned x=0; x<sw; x++) {
+	for (unsigned y = 0; y < sh; y++) {
+		uint16_t *restrict src_row = (void *)src + y * sp;
+		uint16_t *restrict dst_row = (void *)dst + y * dp * 2;
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t c1 = *src_row;
-			uint16_t c2 = Weight3_1( c1, k);
-			
-			*(dst_row     ) = c2;
-			*(dst_row + 1 ) = c2;
-			
-			*(dst_row + dw    ) = c2;
+			uint16_t c2 = Weight3_1(c1, k);
+
+			*(dst_row) = c2;
+			*(dst_row + 1) = c2;
+
+			*(dst_row + dw) = c2;
 			*(dst_row + dw + 1) = c1;
-			
+
 			src_row += 1;
 			dst_row += 2;
 		}
 	}
 }
-void scale3x_grid(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp) {
+void scale3x_grid(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp)
+{
 	dw = dp / 2;
 	uint16_t k = 0x0000;
-	for (unsigned y=0; y<sh; y++) {
-		uint16_t* restrict src_row = (void*)src + y * sp;
-		uint16_t* restrict dst_row = (void*)dst + y * dp * 3;
-		for (unsigned x=0; x<sw; x++) {
+	for (unsigned y = 0; y < sh; y++) {
+		uint16_t *restrict src_row = (void *)src + y * sp;
+		uint16_t *restrict dst_row = (void *)dst + y * dp * 3;
+		for (unsigned x = 0; x < sw; x++) {
 			uint16_t c1 = *src_row;
-			uint16_t c2 = Weight3_2( c1, k);
-			uint16_t c3 = Weight2_3( c1, k);
-			
+			uint16_t c2 = Weight3_2(c1, k);
+			uint16_t c3 = Weight2_3(c1, k);
+
 			// row 1
-			*(dst_row                       ) = c2;
-			*(dst_row                    + 1) = c1;
-			*(dst_row                    + 2) = c1;
+			*(dst_row) = c2;
+			*(dst_row + 1) = c1;
+			*(dst_row + 2) = c1;
 
 			// row 2
-			*(dst_row + dw * 1    ) = c2;
+			*(dst_row + dw * 1) = c2;
 			*(dst_row + dw * 1 + 1) = c1;
 			*(dst_row + dw * 1 + 2) = c1;
 
 			// row 3
-			*(dst_row + dw * 2    ) = c3;
+			*(dst_row + dw * 2) = c3;
 			*(dst_row + dw * 2 + 1) = c2;
 			*(dst_row + dw * 2 + 2) = c2;
 
diff --git a/workspace/all/common/scaler.h b/workspace/all/common/scaler.h
index 2f1501a3c..564ec5e96 100644
--- a/workspace/all/common/scaler.h
+++ b/workspace/all/common/scaler.h
@@ -19,7 +19,8 @@
 //	if odd#, then handled by the C scaler
 //
 
-typedef void (*scaler_t)(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+typedef void (*scaler_t)(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+						 uint32_t dh, uint32_t dp);
 
 //	Functions for generic call
 //		n/c	= neon or c
@@ -27,164 +28,308 @@ typedef void (*scaler_t)(void* __restrict src, void* __restrict dst, uint32_t sw
 //		xmul	= 1,2,3,4,5,6
 //		ymul	= 1,2,3,4(xmul < 5) / 1,2,3,4,5(xmul == 5) / 1,2,3,4,5,6(xmul == 6)
 #ifdef HAS_NEON
-void scaler_n16(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scaler_n32(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scaler_n16(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scaler_n32(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
 #endif
-void scaler_c16(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scaler_c32(uint32_t xmul, uint32_t ymul, void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scaler_c16(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scaler_c32(uint32_t xmul, uint32_t ymul, void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh,
+				uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
 
 #ifdef HAS_NEON
 //	NEON memcpy
-void memcpy_neon(void* dst, void* src, uint32_t size);
+void memcpy_neon(void *dst, void *src, uint32_t size);
 
 //	NEON scalers
-void scale1x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale1x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale2x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale2x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale3x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale3x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale4x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale4x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale5x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale5x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale6x_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale6x_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale1x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale1x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale2x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale2x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale3x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale3x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale4x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale4x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale5x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale5x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale6x_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale6x_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
 
-void scale1x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x5_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x5_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x1_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x1_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x2_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x2_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x3_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x3_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x4_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x4_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x5_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x5_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x6_n16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x6_n32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scale1x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x5_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x5_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x1_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x1_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x2_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x2_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x3_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x3_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x4_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x4_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x5_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x5_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x6_n16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x6_n32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
 #endif
 
-void scale1x_c16to32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x_c16to32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scale1x_c16to32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+					 uint32_t dh, uint32_t dp);
+void scale2x_c16to32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+					 uint32_t dh, uint32_t dp);
 
 //	C scalers
-void scale1x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale1x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale2x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale2x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale3x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale3x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale4x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale4x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale5x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale5x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale6x_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
-void scale6x_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale1x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale1x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale2x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale2x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale3x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale3x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale4x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale4x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale5x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale5x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale6x_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
+void scale6x_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				 uint32_t dh, uint32_t dp, uint32_t ymul);
 
-void scale1x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale1x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x5_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale5x5_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x1_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x1_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x2_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x2_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x3_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x3_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x4_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x4_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x5_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x5_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x6_c16(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale6x6_c32(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scale1x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale1x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x5_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale5x5_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x1_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x1_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x2_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x2_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x3_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x3_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x4_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x4_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x5_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x5_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x6_c16(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale6x6_c32(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
 
-void scale1x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale2x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale4x_line(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scale1x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale2x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale4x_line(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
 
-void scale2x_grid(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
-void scale3x_grid(void* __restrict src, void* __restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw, uint32_t dh, uint32_t dp);
+void scale2x_grid(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
+void scale3x_grid(void *__restrict src, void *__restrict dst, uint32_t sw, uint32_t sh, uint32_t sp, uint32_t dw,
+				  uint32_t dh, uint32_t dp);
 
 #endif
diff --git a/workspace/all/common/sdl.h b/workspace/all/common/sdl.h
index 2907f08ca..9ef3aece4 100644
--- a/workspace/all/common/sdl.h
+++ b/workspace/all/common/sdl.h
@@ -18,17 +18,20 @@
 ///////////////////////////////
 
 #define SDL_SRCALPHA 0x00010000
-#define SDLX_SetAlpha(surface,flags_,value) do { \
-    if (flags_ & SDL_SRCALPHA) { \
-        if (!surface->format->Amask) SDL_SetSurfaceAlphaMod(surface, value); \
-        surface->flags |= SDL_SRCALPHA; \
-        SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND); \
-    } else { \
-        if (!surface->format->Amask) SDL_SetSurfaceAlphaMod(surface, 255); \
-        surface->flags &= ~SDL_SRCALPHA; \
-        SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE); \
-    } \
-} while(0);
+#define SDLX_SetAlpha(surface, flags_, value)                                                                          \
+	do {                                                                                                               \
+		if (flags_ & SDL_SRCALPHA) {                                                                                   \
+			if (!surface->format->Amask)                                                                               \
+				SDL_SetSurfaceAlphaMod(surface, value);                                                                \
+			surface->flags |= SDL_SRCALPHA;                                                                            \
+			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);                                                     \
+		} else {                                                                                                       \
+			if (!surface->format->Amask)                                                                               \
+				SDL_SetSurfaceAlphaMod(surface, 255);                                                                  \
+			surface->flags &= ~SDL_SRCALPHA;                                                                           \
+			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);                                                      \
+		}                                                                                                              \
+	} while (0);
 
 ///////////////////////////////
 
diff --git a/workspace/all/common/utils.c b/workspace/all/common/utils.c
index 90640b444..58e40cfd7 100644
--- a/workspace/all/common/utils.c
+++ b/workspace/all/common/utils.c
@@ -12,41 +12,51 @@
 
 ///////////////////////////////////////
 
-int prefixMatch(char* pre, const char* str) {
-	return (strncasecmp(pre,str,strlen(pre))==0);
+int prefixMatch(char *pre, const char *str)
+{
+	return (strncasecmp(pre, str, strlen(pre)) == 0);
 }
-int suffixMatch(char* suf, const char* str) {
+int suffixMatch(char *suf, const char *str)
+{
 	int len = strlen(suf);
-	int offset = strlen(str)-len;
-	return (offset>=0 && strncasecmp(suf, str+offset, len)==0);
+	int offset = strlen(str) - len;
+	return (offset >= 0 && strncasecmp(suf, str + offset, len) == 0);
 }
-int exactMatch(const char* str1, const char* str2) {
-	if (!str1 || !str2) return 0; // NULL isn't safe here
+int exactMatch(const char *str1, const char *str2)
+{
+	if (!str1 || !str2)
+		return 0; // NULL isn't safe here
 	int len1 = strlen(str1);
-	if (len1!=strlen(str2)) return 0;
-	return (strncmp(str1,str2,len1)==0);
+	if (len1 != strlen(str2))
+		return 0;
+	return (strncmp(str1, str2, len1) == 0);
 }
-int containsString(char* haystack, char* needle) {
+int containsString(char *haystack, char *needle)
+{
 	return strcasestr(haystack, needle) != NULL;
 }
-int hide(char* file_name) {
-	return file_name[0]=='.' || suffixMatch(".disabled", file_name) || exactMatch("map.txt", file_name);
+int hide(char *file_name)
+{
+	return file_name[0] == '.' || suffixMatch(".disabled", file_name) || exactMatch("map.txt", file_name);
 }
 char *splitString(char *str, const char *delim)
 {
-    char *p = strstr(str, delim);
-    if (p == NULL)
-        return NULL;          // delimiter not found
-    *p = '\0';                // terminate string after head
-    return p + strlen(delim); // return tail substring
+	char *p = strstr(str, delim);
+	if (p == NULL)
+		return NULL;		  // delimiter not found
+	*p = '\0';				  // terminate string after head
+	return p + strlen(delim); // return tail substring
 }
-void truncateString(char *string, size_t max_len) {
+void truncateString(char *string, size_t max_len)
+{
 	size_t len = strlen(string) + 1;
-	if (len <= max_len) return;
+	if (len <= max_len)
+		return;
 
 	strncpy(&string[max_len - 4], "...\0", 4);
 }
-void wrapString(char *string, size_t max_len, size_t max_lines) {
+void wrapString(char *string, size_t max_len, size_t max_lines)
+{
 	char *line = string;
 
 	for (size_t i = 1; i < max_lines; i++) {
@@ -54,10 +64,11 @@ void wrapString(char *string, size_t max_len, size_t max_lines) {
 		char *prev;
 		do {
 			prev = p;
-			p = strchr(prev+1, ' ');
+			p = strchr(prev + 1, ' ');
 		} while (p && p - line < (int)max_len);
 
-		if (!p && strlen(line) < max_len) break;
+		if (!p && strlen(line) < max_len)
+			break;
 
 		if (prev && prev != line) {
 			line = prev + 1;
@@ -70,293 +81,298 @@ void wrapString(char *string, size_t max_len, size_t max_lines) {
 // This one does not modify the input, cause we arent savages
 char *replaceString2(const char *orig, char *rep, char *with)
 {
-    const char *ins;     // the next insert point
-    char *tmp;     // varies
-    int len_rep;   // length of rep (the string to remove)
-    int len_with;  // length of with (the string to replace rep with)
-    int len_front; // distance between rep and end of last rep
-    int count;     // number of replacements
-
-    // sanity checks and initialization
-    if (!orig || !rep)
-        return NULL;
-    len_rep = strlen(rep);
-    if (len_rep == 0)
-        return NULL; // empty rep causes infinite loop during count
-    if (!with)
-        with = "";
-    len_with = strlen(with);
-
-    // count the number of replacements needed
-    ins = orig;
-    for (count = 0; (tmp = strstr(ins, rep)); ++count)
-        ins = tmp + len_rep;
-
-    char *result =
-        (char *)malloc(strlen(orig) + (len_with - len_rep) * count + 1);
-    tmp = result;
-
-    if (!result)
-        return NULL;
-
-    // first time through the loop, all the variable are set correctly
-    // from here on,
-    //    tmp points to the end of the result string
-    //    ins points to the next occurrence of rep in orig
-    //    orig points to the remainder of orig after "end of rep"
-    while (count--) {
-        ins = strstr(orig, rep);
-        len_front = ins - orig;
-        tmp = strncpy(tmp, orig, len_front) + len_front;
-        tmp = strcpy(tmp, with) + len_with;
-        orig += len_front + len_rep; // move to next "end of rep"
-    }
-    strcpy(tmp, orig);
-    return result;
+	const char *ins; // the next insert point
+	char *tmp;		 // varies
+	int len_rep;	 // length of rep (the string to remove)
+	int len_with;	 // length of with (the string to replace rep with)
+	int len_front;	 // distance between rep and end of last rep
+	int count;		 // number of replacements
+
+	// sanity checks and initialization
+	if (!orig || !rep)
+		return NULL;
+	len_rep = strlen(rep);
+	if (len_rep == 0)
+		return NULL; // empty rep causes infinite loop during count
+	if (!with)
+		with = "";
+	len_with = strlen(with);
+
+	// count the number of replacements needed
+	ins = orig;
+	for (count = 0; (tmp = strstr(ins, rep)); ++count)
+		ins = tmp + len_rep;
+
+	char *result = (char *)malloc(strlen(orig) + (len_with - len_rep) * count + 1);
+	tmp = result;
+
+	if (!result)
+		return NULL;
+
+	// first time through the loop, all the variable are set correctly
+	// from here on,
+	//    tmp points to the end of the result string
+	//    ins points to the next occurrence of rep in orig
+	//    orig points to the remainder of orig after "end of rep"
+	while (count--) {
+		ins = strstr(orig, rep);
+		len_front = ins - orig;
+		tmp = strncpy(tmp, orig, len_front) + len_front;
+		tmp = strcpy(tmp, with) + len_with;
+		orig += len_front + len_rep; // move to next "end of rep"
+	}
+	strcpy(tmp, orig);
+	return result;
 }
 // Stores the trimmed input string into the given output buffer, which must be
 // large enough to store the result.  If it is too small, the output is
 // truncated.
 size_t trimString(char *out, size_t len, const char *str, bool first)
 {
-    if (len == 0)
-        return 0;
+	if (len == 0)
+		return 0;
 
-    const char *end;
-    size_t out_size;
-    bool is_string = false;
+	const char *end;
+	size_t out_size;
+	bool is_string = false;
 
-    // Trim leading space
-    while (strchr("\r\n\t {},", (unsigned char)*str) != NULL)
-        str++;
+	// Trim leading space
+	while (strchr("\r\n\t {},", (unsigned char)*str) != NULL)
+		str++;
 
-    end = str + 1;
+	end = str + 1;
 
-    if ((unsigned char)*str == '"') {
-        is_string = true;
-        str++;
-        while (strchr("\r\n\"", (unsigned char)*end) == NULL)
-            end++;
-    }
+	if ((unsigned char)*str == '"') {
+		is_string = true;
+		str++;
+		while (strchr("\r\n\"", (unsigned char)*end) == NULL)
+			end++;
+	}
 
-    if (*str == 0) // All spaces?
-    {
-        *out = 0;
-        return 1;
-    }
+	if (*str == 0) // All spaces?
+	{
+		*out = 0;
+		return 1;
+	}
 
-    // Trim trailing space
-    if (first)
-        while (strchr("\r\n\t {},", (unsigned char)*end) == NULL)
-            end++;
-    else {
-        end = str + strlen(str) - 1;
-        while (end > str && strchr("\r\n\t {},", (unsigned char)*end) != NULL)
-            end--;
-        end++;
-    }
+	// Trim trailing space
+	if (first)
+		while (strchr("\r\n\t {},", (unsigned char)*end) == NULL)
+			end++;
+	else {
+		end = str + strlen(str) - 1;
+		while (end > str && strchr("\r\n\t {},", (unsigned char)*end) != NULL)
+			end--;
+		end++;
+	}
 
-    if (is_string && (unsigned char)*(end - 1) == '"')
-        end--;
+	if (is_string && (unsigned char)*(end - 1) == '"')
+		end--;
 
-    // Set output size to minimum of trimmed string length and buffer size minus
-    // 1
-    out_size = (end - str) < len - 1 ? (end - str) : len - 1;
+	// Set output size to minimum of trimmed string length and buffer size minus
+	// 1
+	out_size = (end - str) < len - 1 ? (end - str) : len - 1;
 
-    // Copy trimmed string and add null terminator
-    memcpy(out, str, out_size);
-    out[out_size] = 0;
+	// Copy trimmed string and add null terminator
+	memcpy(out, str, out_size);
+	out[out_size] = 0;
 
-    return out_size;
+	return out_size;
 }
 
 void removeParentheses(char *str_out, const char *str_in)
 {
-    char temp[STR_MAX];
-    int len = strlen(str_in);
-    int c = 0;
-    bool inside = false;
-    char end_char;
-
-    for (int i = 0; i < len && i < STR_MAX; i++) {
-        if (!inside && (str_in[i] == '(' || str_in[i] == '[')) {
-            end_char = str_in[i] == '(' ? ')' : ']';
-            inside = true;
-            continue;
-        }
-        else if (inside) {
-            if (str_in[i] == end_char)
-                inside = false;
-            continue;
-        }
-        temp[c++] = str_in[i];
-    }
-
-    temp[c] = '\0';
-
-    trimString(str_out, STR_MAX - 1, temp, false);
+	char temp[STR_MAX];
+	int len = strlen(str_in);
+	int c = 0;
+	bool inside = false;
+	char end_char;
+
+	for (int i = 0; i < len && i < STR_MAX; i++) {
+		if (!inside && (str_in[i] == '(' || str_in[i] == '[')) {
+			end_char = str_in[i] == '(' ? ')' : ']';
+			inside = true;
+			continue;
+		} else if (inside) {
+			if (str_in[i] == end_char)
+				inside = false;
+			continue;
+		}
+		temp[c++] = str_in[i];
+	}
+
+	temp[c] = '\0';
+
+	trimString(str_out, STR_MAX - 1, temp, false);
 }
 void serializeTime(char *dest_str, int nTime)
 {
-    if (nTime >= 60) {
-        int h = nTime / 3600;
-        int m = (nTime - 3600 * h) / 60;
-        if (h > 0) {
-            sprintf(dest_str, "%dh %dm", h, m);
-        }
-        else {
-            sprintf(dest_str, "%dm %ds", m, nTime - 60 * m);
-        }
-    }
-    else {
-        sprintf(dest_str, "%ds", nTime);
-    }
+	if (nTime >= 60) {
+		int h = nTime / 3600;
+		int m = (nTime - 3600 * h) / 60;
+		if (h > 0) {
+			sprintf(dest_str, "%dh %dm", h, m);
+		} else {
+			sprintf(dest_str, "%dm %ds", m, nTime - 60 * m);
+		}
+	} else {
+		sprintf(dest_str, "%ds", nTime);
+	}
 }
 int countChar(const char *str, char ch)
 {
-    int i, count = 0;
-    for (i = 0; i <= strlen(str); i++) {
-        if (str[i] == ch) {
-            count++;
-        }
-    }
-    return count;
+	int i, count = 0;
+	for (i = 0; i <= strlen(str); i++) {
+		if (str[i] == ch) {
+			count++;
+		}
+	}
+	return count;
 }
 char *removeExtension(const char *myStr)
 {
-    if (myStr == NULL)
-        return NULL;
-    char *retStr = (char *)malloc(strlen(myStr) + 1);
-    char *lastExt;
-    if (retStr == NULL)
-        return NULL;
-    strcpy(retStr, myStr);
-    if ((lastExt = strrchr(retStr, '.')) != NULL && *(lastExt + 1) != ' ' && *(lastExt + 2) != '\0')
-        *lastExt = '\0';
-    return retStr;
+	if (myStr == NULL)
+		return NULL;
+	char *retStr = (char *)malloc(strlen(myStr) + 1);
+	char *lastExt;
+	if (retStr == NULL)
+		return NULL;
+	strcpy(retStr, myStr);
+	if ((lastExt = strrchr(retStr, '.')) != NULL && *(lastExt + 1) != ' ' && *(lastExt + 2) != '\0')
+		*lastExt = '\0';
+	return retStr;
 }
 const char *baseName(const char *filename)
 {
-    char *p = strrchr(filename, '/');
-    return p ? p + 1 : (char *)filename;
+	char *p = strrchr(filename, '/');
+	return p ? p + 1 : (char *)filename;
 }
-void folderPath(const char *path, char *result) {
-    char pathCopy[256];  
-    strcpy(pathCopy, path);
-
-    char *lastSlash = strrchr(pathCopy, '/');  // Find the last slash
-    if (lastSlash != NULL) {
-        *lastSlash = '\0';  // Cut off the filename
-        strcpy(result, pathCopy);  // Copy the remaining path
-    } else {
-        strcpy(result, "");  // No folder found
-    }
+void folderPath(const char *path, char *result)
+{
+	char pathCopy[256];
+	strcpy(pathCopy, path);
+
+	char *lastSlash = strrchr(pathCopy, '/'); // Find the last slash
+	if (lastSlash != NULL) {
+		*lastSlash = '\0';		  // Cut off the filename
+		strcpy(result, pathCopy); // Copy the remaining path
+	} else {
+		strcpy(result, ""); // No folder found
+	}
 }
 void cleanName(char *name_out, const char *file_name)
 {
-    char *name_without_ext = removeExtension(file_name);
-    char *no_underscores = replaceString2(name_without_ext, "_", " ");
-    char *dot_ptr = strstr(no_underscores, ".");
-    if (dot_ptr != NULL) {
-        char *s = no_underscores;
-        while (isdigit(*s) && s < dot_ptr)
-            s++;
-        if (s != dot_ptr)
-            dot_ptr = no_underscores;
-        else {
-            dot_ptr++;
-            if (dot_ptr[0] == ' ')
-                dot_ptr++;
-        }
-    }
-    else {
-        dot_ptr = no_underscores;
-    }
-    removeParentheses(name_out, dot_ptr);
-    free(name_without_ext);
-    free(no_underscores);
+	char *name_without_ext = removeExtension(file_name);
+	char *no_underscores = replaceString2(name_without_ext, "_", " ");
+	char *dot_ptr = strstr(no_underscores, ".");
+	if (dot_ptr != NULL) {
+		char *s = no_underscores;
+		while (isdigit(*s) && s < dot_ptr)
+			s++;
+		if (s != dot_ptr)
+			dot_ptr = no_underscores;
+		else {
+			dot_ptr++;
+			if (dot_ptr[0] == ' ')
+				dot_ptr++;
+		}
+	} else {
+		dot_ptr = no_underscores;
+	}
+	removeParentheses(name_out, dot_ptr);
+	free(name_without_ext);
+	free(no_underscores);
 }
 bool pathRelativeTo(char *path_out, const char *dir_from, const char *file_to)
 {
-    path_out[0] = '\0';
+	path_out[0] = '\0';
 
-    char abs_from[MAX_PATH];
-    char abs_to[MAX_PATH];
-    if (realpath(dir_from, abs_from) == NULL || realpath(file_to, abs_to) == NULL) {
-        return false;
-    }
+	char abs_from[MAX_PATH];
+	char abs_to[MAX_PATH];
+	if (realpath(dir_from, abs_from) == NULL || realpath(file_to, abs_to) == NULL) {
+		return false;
+	}
 
-    char *p1 = abs_from;
-    char *p2 = abs_to;
-    while (*p1 && (*p1 == *p2)) {
-        ++p1, ++p2;
-    }
+	char *p1 = abs_from;
+	char *p2 = abs_to;
+	while (*p1 && (*p1 == *p2)) {
+		++p1, ++p2;
+	}
 
-    if (*p2 == '/') {
-        ++p2;
-    }
+	if (*p2 == '/') {
+		++p2;
+	}
 
-    if (strlen(p1) > 0) {
-        int num_parens = countChar(p1, '/') + 1;
-        for (int i = 0; i < num_parens; i++) {
-            strcat(path_out, "../");
-        }
-    }
-    strcat(path_out, p2);
+	if (strlen(p1) > 0) {
+		int num_parens = countChar(p1, '/') + 1;
+		for (int i = 0; i < num_parens; i++) {
+			strcat(path_out, "../");
+		}
+	}
+	strcat(path_out, p2);
 
-    return true;
+	return true;
 }
 
-void getDisplayName(const char* in_name, char* out_name) {
-	char* tmp;
+void getDisplayName(const char *in_name, char *out_name)
+{
+	char *tmp;
 	char work_name[256];
 	strcpy(work_name, in_name);
 	strcpy(out_name, in_name);
-	
+
 	if (suffixMatch("/" PLATFORM, work_name)) { // hide platform from Tools path...
 		tmp = strrchr(work_name, '/');
 		tmp[0] = '\0';
 	}
-	
+
 	// extract just the filename if necessary
 	tmp = strrchr(work_name, '/');
-	if (tmp) strcpy(out_name, tmp+1);
-	
+	if (tmp)
+		strcpy(out_name, tmp + 1);
+
 	// remove extension(s), eg. .p8.png
-	while ((tmp = strrchr(out_name, '.'))!=NULL) {
+	while ((tmp = strrchr(out_name, '.')) != NULL) {
 		int len = strlen(tmp);
-		if (len>2 && len<=5) tmp[0] = '\0'; // 1-4 letter extension plus dot (was 1-3, extended for .doom files)
-		else break;
+		if (len > 2 && len <= 5)
+			tmp[0] = '\0'; // 1-4 letter extension plus dot (was 1-3, extended for .doom files)
+		else
+			break;
 	}
-	
+
 	// remove trailing parens (round and square)
 	strcpy(work_name, out_name);
-	while ((tmp=strrchr(out_name, '('))!=NULL || (tmp=strrchr(out_name, '['))!=NULL) {
-		if (tmp==out_name) break;
+	while ((tmp = strrchr(out_name, '(')) != NULL || (tmp = strrchr(out_name, '[')) != NULL) {
+		if (tmp == out_name)
+			break;
 		tmp[0] = '\0';
 		tmp = out_name;
 	}
-	
+
 	// make sure we haven't nuked the entire name
-	if (out_name[0]=='\0') strcpy(out_name, work_name);
-	
+	if (out_name[0] == '\0')
+		strcpy(out_name, work_name);
+
 	// remove trailing whitespace
 	tmp = out_name + strlen(out_name) - 1;
-    while(tmp>out_name && isspace((unsigned char)*tmp)) tmp--;
-    tmp[1] = '\0';
+	while (tmp > out_name && isspace((unsigned char)*tmp))
+		tmp--;
+	tmp[1] = '\0';
 }
-void getEmuName(const char* in_name, char* out_name) { // NOTE: both char arrays need to be MAX_PATH length!
-	char* tmp;
+void getEmuName(const char *in_name, char *out_name)
+{ // NOTE: both char arrays need to be MAX_PATH length!
+	char *tmp;
 	strcpy(out_name, in_name);
 	tmp = out_name;
-	
+
 	// printf("--------\n  in_name: %s\n",in_name); fflush(stdout);
-	
+
 	// extract just the Roms folder name if necessary
 	if (prefixMatch(ROMS_PATH, tmp)) {
 		tmp += strlen(ROMS_PATH) + 1;
-		char* tmp2 = strchr(tmp, '/');
-		if (tmp2) tmp2[0] = '\0';
+		char *tmp2 = strchr(tmp, '/');
+		if (tmp2)
+			tmp2[0] = '\0';
 		// printf("    tmp1: %s\n", tmp);
 		strcpy(out_name, tmp);
 		tmp = out_name;
@@ -368,91 +384,104 @@ void getEmuName(const char* in_name, char* out_name) { // NOTE: both char arrays
 		tmp += 1;
 		// printf("    tmp2: %s\n", tmp);
 		strcpy(out_name, tmp);
-		tmp = strchr(out_name,')');
+		tmp = strchr(out_name, ')');
 		tmp[0] = '\0';
 	}
-	
+
 	// printf(" out_name: %s\n", out_name); fflush(stdout);
 }
-void getEmuPath(char* emu_name, char* pak_path) {
+void getEmuPath(char *emu_name, char *pak_path)
+{
 	sprintf(pak_path, "%s/Emus/%s/%s.pak/launch.sh", SDCARD_PATH, PLATFORM, emu_name);
-	if (exists(pak_path)) return;
+	if (exists(pak_path))
+		return;
 	sprintf(pak_path, "%s/Emus/%s.pak/launch.sh", PAKS_PATH, emu_name);
 }
 
-void normalizeNewline(char* line) {
+void normalizeNewline(char *line)
+{
 	int len = strlen(line);
-	if (len>1 && line[len-1]=='\n' && line[len-2]=='\r') { // windows!
-		line[len-2] = '\n';
-		line[len-1] = '\0';
+	if (len > 1 && line[len - 1] == '\n' && line[len - 2] == '\r') { // windows!
+		line[len - 2] = '\n';
+		line[len - 1] = '\0';
 	}
 }
-void trimTrailingNewlines(char* line) {
+void trimTrailingNewlines(char *line)
+{
 	int len = strlen(line);
-	while (len>0 && line[len-1]=='\n') {
-		line[len-1] = '\0'; // trim newline
+	while (len > 0 && line[len - 1] == '\n') {
+		line[len - 1] = '\0'; // trim newline
 		len -= 1;
 	}
 }
-void trimSortingMeta(char** str) { // eg. `001) `
+void trimSortingMeta(char **str)
+{ // eg. `001) `
 	// TODO: this code is suss
-	char* safe = *str;
-	while(isdigit(**str)) *str += 1; // ignore leading numbers
+	char *safe = *str;
+	while (isdigit(**str))
+		*str += 1; // ignore leading numbers
 
-	if (*str[0]==')') { // then match a closing parenthesis
+	if (*str[0] == ')') { // then match a closing parenthesis
 		*str += 1;
-	}
-	else { //  or bail, restoring the string to its original value
+	} else { //  or bail, restoring the string to its original value
 		*str = safe;
 		return;
 	}
-	
-	while(isblank(**str)) *str += 1; // ignore leading space
+
+	while (isblank(**str))
+		*str += 1; // ignore leading space
 }
 
 ///////////////////////////////////////
 
-int exists(char* path) {
-	return access(path, F_OK)==0;
+int exists(char *path)
+{
+	return access(path, F_OK) == 0;
 }
-void touch(char* path) {
-	close(open(path, O_RDWR|O_CREAT, 0777));
+void touch(char *path)
+{
+	close(open(path, O_RDWR | O_CREAT, 0777));
 }
-int toggle(char *path) {
-    if (access(path, F_OK) == 0) {
-        unlink(path);
-        return 0;
-    } else {
-        touch(path);
-        return 1;
-    }
+int toggle(char *path)
+{
+	if (access(path, F_OK) == 0) {
+		unlink(path);
+		return 0;
+	} else {
+		touch(path);
+		return 1;
+	}
 }
-void putFile(char* path, char* contents) {
-	FILE* file = fopen(path, "w");
+void putFile(char *path, char *contents)
+{
+	FILE *file = fopen(path, "w");
 	if (file) {
 		fputs(contents, file);
 		fclose(file);
 	}
 }
-void getFile(char* path, char* buffer, size_t buffer_size) {
+void getFile(char *path, char *buffer, size_t buffer_size)
+{
 	FILE *file = fopen(path, "r");
 	if (file) {
 		fseek(file, 0L, SEEK_END);
 		size_t size = ftell(file);
-		if (size>buffer_size-1) size = buffer_size - 1;
+		if (size > buffer_size - 1)
+			size = buffer_size - 1;
 		rewind(file);
 		fread(buffer, sizeof(char), size, file);
 		fclose(file);
 		buffer[size] = '\0';
 	}
 }
-char* allocFile(char* path) { // caller must free!
-	char* contents = NULL;
+char *allocFile(char *path)
+{ // caller must free!
+	char *contents = NULL;
 	FILE *file = fopen(path, "r");
 	if (file) {
 		fseek(file, 0L, SEEK_END);
 		size_t size = ftell(file);
-		contents = calloc(size+1, sizeof(char));
+		contents = calloc(size + 1, sizeof(char));
 		fseek(file, 0L, SEEK_SET);
 		fread(contents, sizeof(char), size, file);
 		fclose(file);
@@ -460,58 +489,61 @@ char* allocFile(char* path) { // caller must free!
 	}
 	return contents;
 }
-int getInt(char* path) {
+int getInt(char *path)
+{
 	int i = 0;
-    if(path == NULL)
-        return i;
-    
+	if (path == NULL)
+		return i;
+
 	FILE *file = fopen(path, "r");
-	if (file!=NULL) {
+	if (file != NULL) {
 		int res = fscanf(file, "%i", &i);
 		fclose(file);
-        if(res != 1)
-            i = 0; // failed to parse int
+		if (res != 1)
+			i = 0; // failed to parse int
 	}
 	return i;
 }
-void putInt(char* path, int value) {
+void putInt(char *path, int value)
+{
 	char buffer[8];
 	sprintf(buffer, "%d", value);
 	putFile(path, buffer);
 }
 
-uint64_t getMicroseconds(void) {
-    uint64_t ret;
-    struct timeval tv;
+uint64_t getMicroseconds(void)
+{
+	uint64_t ret;
+	struct timeval tv;
 
-    gettimeofday(&tv, NULL);
+	gettimeofday(&tv, NULL);
 
-    ret = (uint64_t)tv.tv_sec * 1000000;
-    ret += (uint64_t)tv.tv_usec;
+	ret = (uint64_t)tv.tv_sec * 1000000;
+	ret += (uint64_t)tv.tv_usec;
 
-    return ret;
+	return ret;
 }
 
-#define max(a,b)             \
-({                           \
-    __typeof__ (a) _a = (a); \
-    __typeof__ (b) _b = (b); \
-    _a > _b ? _a : _b;       \
-})
+#define max(a, b)                                                                                                      \
+	({                                                                                                                 \
+		__typeof__(a) _a = (a);                                                                                        \
+		__typeof__(b) _b = (b);                                                                                        \
+		_a > _b ? _a : _b;                                                                                             \
+	})
 
-#define min(a,b)             \
-({                           \
-    __typeof__ (a) _a = (a); \
-    __typeof__ (b) _b = (b); \
-    _a < _b ? _a : _b;       \
-})
+#define min(a, b)                                                                                                      \
+	({                                                                                                                 \
+		__typeof__(a) _a = (a);                                                                                        \
+		__typeof__(b) _b = (b);                                                                                        \
+		_a < _b ? _a : _b;                                                                                             \
+	})
 
 int clamp(int x, int lower, int upper)
 {
-    return min(upper, max(x, lower));
+	return min(upper, max(x, lower));
 }
 
 double clampd(double x, double lower, double upper)
 {
-    return min(upper, max(x, lower));
+	return min(upper, max(x, lower));
 }
\ No newline at end of file
diff --git a/workspace/all/common/utils.h b/workspace/all/common/utils.h
index b7dbd8ff8..b93ce0a04 100644
--- a/workspace/all/common/utils.h
+++ b/workspace/all/common/utils.h
@@ -5,11 +5,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-int prefixMatch(char* pre, const char* str);
-int suffixMatch(char* suf,const char* str);
-int exactMatch(const char* str1, const char* str2);
-int containsString(char* haystack, char* needle);
-int hide(char* file_name);
+int prefixMatch(char *pre, const char *str);
+int suffixMatch(char *suf, const char *str);
+int exactMatch(const char *str1, const char *str2);
+int containsString(char *haystack, char *needle);
+int hide(char *file_name);
 
 char *splitString(char *str, const char *delim);
 char *replaceString2(const char *orig, char *rep, char *with);
@@ -25,22 +25,22 @@ void folderPath(const char *filePath, char *folder_path);
 void cleanName(char *name_out, const char *file_name);
 bool pathRelativeTo(char *path_out, const char *dir_from, const char *file_to);
 
-void getDisplayName(const char* in_name, char* out_name);
-void getEmuName(const char* in_name, char* out_name);
-void getEmuPath(char* emu_name, char* pak_path);
+void getDisplayName(const char *in_name, char *out_name);
+void getEmuName(const char *in_name, char *out_name);
+void getEmuPath(char *emu_name, char *pak_path);
 
-void normalizeNewline(char* line);
-void trimTrailingNewlines(char* line);
-void trimSortingMeta(char** str);
+void normalizeNewline(char *line);
+void trimTrailingNewlines(char *line);
+void trimSortingMeta(char **str);
 
-int exists(char* path);
-void touch(char* path);
+int exists(char *path);
+void touch(char *path);
 int toggle(char *path); // creates or removes file
 void putFile(char *path, char *contents);
-char* allocFile(char* path); // caller must free
-void getFile(char* path, char* buffer, size_t buffer_size);
-void putInt(char* path, int value);
-int getInt(char* path);
+char *allocFile(char *path); // caller must free
+void getFile(char *path, char *buffer, size_t buffer_size);
+void putInt(char *path, int value);
+int getInt(char *path);
 
 uint64_t getMicroseconds(void);
 
diff --git a/workspace/all/gametime/gametime.c b/workspace/all/gametime/gametime.c
index f3913a060..4be1ba95f 100644
--- a/workspace/all/gametime/gametime.c
+++ b/workspace/all/gametime/gametime.c
@@ -1,4 +1,5 @@
-// heavily modified from the Onion original: https://github.com/OnionUI/Onion/blob/main/src/playActivity/playActivityUI.c
+// heavily modified from the Onion original:
+// https://github.com/OnionUI/Onion/blob/main/src/playActivity/playActivityUI.c
 #include <stdio.h>
 #include <unistd.h>
 #include <stdbool.h>
@@ -12,33 +13,32 @@
 #include <sqlite3.h>
 #include <gametimedb.h>
 
-struct ListLayout
-{
-    int list_display_size_x;
-    int list_display_size_y;
-    int list_display_start_x;
-    int list_display_start_y;
-    SDL_Rect list_display_rect;
+struct ListLayout {
+	int list_display_size_x;
+	int list_display_size_y;
+	int list_display_start_x;
+	int list_display_start_y;
+	SDL_Rect list_display_rect;
 
-    int sub_title_x;
-    int sub_title_y;
+	int sub_title_x;
+	int sub_title_y;
 
-    int items_per_page;
-    int num_pages;
+	int items_per_page;
+	int num_pages;
 } layout = {0};
 
 static bool quit = false;
 
 static void sigHandler(int sig)
 {
-    switch (sig) {
-    case SIGINT:
-    case SIGTERM:
-        quit = true;
-        break;
-    default:
-        break;
-    }
+	switch (sig) {
+	case SIGINT:
+	case SIGTERM:
+		quit = true;
+		break;
+	default:
+		break;
+	}
 }
 
 #define BIG_PILL_SIZE 48
@@ -65,396 +65,381 @@ static inline SDL_Color colorFromUint(uint32_t colour)
 
 int _renderText(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect, bool right_align)
 {
-    int text_width = 0;
-    SDL_Surface *textSurface = TTF_RenderUTF8_Blended(font, text, color);
-    if (textSurface != NULL) {
-        text_width = textSurface->w;
-        if (right_align)
-            SDL_BlitSurface(textSurface, NULL, screen, &(SDL_Rect){rect->w - textSurface->w, rect->y, rect->w, rect->h});
-        else
-            SDL_BlitSurface(textSurface, NULL, screen, rect);
-        SDL_FreeSurface(textSurface);
-    }
-    return text_width;
+	int text_width = 0;
+	SDL_Surface *textSurface = TTF_RenderUTF8_Blended(font, text, color);
+	if (textSurface != NULL) {
+		text_width = textSurface->w;
+		if (right_align)
+			SDL_BlitSurface(textSurface, NULL, screen,
+							&(SDL_Rect){rect->w - textSurface->w, rect->y, rect->w, rect->h});
+		else
+			SDL_BlitSurface(textSurface, NULL, screen, rect);
+		SDL_FreeSurface(textSurface);
+	}
+	return text_width;
 }
 
 int renderText(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect)
 {
-    return _renderText(text, font, color, rect, false);
+	return _renderText(text, font, color, rect, false);
 }
 
 int renderTextAlignRight(const char *text, TTF_Font *font, SDL_Color color, SDL_Rect *rect)
 {
-    return _renderText(text, font, color, rect, true);
+	return _renderText(text, font, color, rect, true);
 }
 
 // Set a pixel color on the surface
-void _setPixel(SDL_Surface *surface, int x, int y, Uint32 color) {
-    if (x < 0 || x >= surface->w || y < 0 || y >= surface->h) {
-        return; // Out of bounds check
-    }
-
-    // Lock surface if needed
-    SDL_LockSurface(surface);
-
-    Uint8 *pixelPtr = (Uint8 *)surface->pixels + y * surface->pitch + x * surface->format->BytesPerPixel;
-
-    switch (surface->format->BytesPerPixel) {
-        case 1:
-            *pixelPtr = color;
-            break;
-        case 2:
-            *(Uint16 *)pixelPtr = color;
-            break;
-        case 3:
-            if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
-                pixelPtr[0] = (color >> 16) & 0xFF;
-                pixelPtr[1] = (color >> 8) & 0xFF;
-                pixelPtr[2] = color & 0xFF;
-            } else {
-                pixelPtr[0] = color & 0xFF;
-                pixelPtr[1] = (color >> 8) & 0xFF;
-                pixelPtr[2] = (color >> 16) & 0xFF;
-            }
-            break;
-        case 4:
-            *(Uint32 *)pixelPtr = color;
-            break;
-    }
-
-    SDL_UnlockSurface(surface);
+void _setPixel(SDL_Surface *surface, int x, int y, Uint32 color)
+{
+	if (x < 0 || x >= surface->w || y < 0 || y >= surface->h) {
+		return; // Out of bounds check
+	}
+
+	// Lock surface if needed
+	SDL_LockSurface(surface);
+
+	Uint8 *pixelPtr = (Uint8 *)surface->pixels + y * surface->pitch + x * surface->format->BytesPerPixel;
+
+	switch (surface->format->BytesPerPixel) {
+	case 1:
+		*pixelPtr = color;
+		break;
+	case 2:
+		*(Uint16 *)pixelPtr = color;
+		break;
+	case 3:
+		if (SDL_BYTEORDER == SDL_BIG_ENDIAN) {
+			pixelPtr[0] = (color >> 16) & 0xFF;
+			pixelPtr[1] = (color >> 8) & 0xFF;
+			pixelPtr[2] = color & 0xFF;
+		} else {
+			pixelPtr[0] = color & 0xFF;
+			pixelPtr[1] = (color >> 8) & 0xFF;
+			pixelPtr[2] = (color >> 16) & 0xFF;
+		}
+		break;
+	case 4:
+		*(Uint32 *)pixelPtr = color;
+		break;
+	}
+
+	SDL_UnlockSurface(surface);
 }
 
 // Draw a filled circle
-void _drawFilledCircle(SDL_Surface *surface, int cx, int cy, int radius, Uint32 color) {
-    for (int y = -radius; y <= radius; y++) {
-        for (int x = -radius; x <= radius; x++) {
-            if (x * x + y * y <= radius * radius) {
-                _setPixel(surface, cx + x, cy + y, color);
-            }
-        }
-    }
+void _drawFilledCircle(SDL_Surface *surface, int cx, int cy, int radius, Uint32 color)
+{
+	for (int y = -radius; y <= radius; y++) {
+		for (int x = -radius; x <= radius; x++) {
+			if (x * x + y * y <= radius * radius) {
+				_setPixel(surface, cx + x, cy + y, color);
+			}
+		}
+	}
 }
 
 // Draw a filled rounded rectangle
-void renderRoundedRectangle(SDL_Rect rect, Uint32 color, int radius) {
-    // Fill the center and straight edges
-    SDL_Rect fillRect = {rect.x + radius, rect.y, rect.w - 2 * radius, rect.h};
-    SDL_FillRect(screen, &fillRect, color);
-
-    fillRect.x = rect.x;
-    fillRect.y = rect.y + radius;
-    fillRect.w = rect.w;
-    fillRect.h = rect.h - 2 * radius;
-    SDL_FillRect(screen, &fillRect, color);
-
-    // Draw the corner circles
-    _drawFilledCircle(screen, rect.x + radius, rect.y + radius, radius, color);                         // Top-left
-    _drawFilledCircle(screen, rect.x + rect.w - radius - 1, rect.y + radius, radius, color);            // Top-right
-    _drawFilledCircle(screen, rect.x + radius, rect.y + rect.h - radius - 1, radius, color);            // Bottom-left
-    _drawFilledCircle(screen, rect.x + rect.w - radius - 1, rect.y + rect.h - radius - 1, radius, color); // Bottom-right
+void renderRoundedRectangle(SDL_Rect rect, Uint32 color, int radius)
+{
+	// Fill the center and straight edges
+	SDL_Rect fillRect = {rect.x + radius, rect.y, rect.w - 2 * radius, rect.h};
+	SDL_FillRect(screen, &fillRect, color);
+
+	fillRect.x = rect.x;
+	fillRect.y = rect.y + radius;
+	fillRect.w = rect.w;
+	fillRect.h = rect.h - 2 * radius;
+	SDL_FillRect(screen, &fillRect, color);
+
+	// Draw the corner circles
+	_drawFilledCircle(screen, rect.x + radius, rect.y + radius, radius, color);				 // Top-left
+	_drawFilledCircle(screen, rect.x + rect.w - radius - 1, rect.y + radius, radius, color); // Top-right
+	_drawFilledCircle(screen, rect.x + radius, rect.y + rect.h - radius - 1, radius, color); // Bottom-left
+	_drawFilledCircle(screen, rect.x + rect.w - radius - 1, rect.y + rect.h - radius - 1, radius,
+					  color); // Bottom-right
 }
 
 SDL_Surface *loadRomImage(char *image_path)
 {
-    if(!exists(image_path))
-        return NULL;
-
-    SDL_Surface *img = IMG_Load(image_path);
-    if(!img)
-        return NULL;
-
-    if(img->format->format != SDL_PIXELFORMAT_RGBA32) {
-        SDL_Surface *optimized = SDL_ConvertSurfaceFormat(img, SDL_PIXELFORMAT_RGBA32, 0);
-        SDL_FreeSurface(img); 
-        img = optimized;
-    }
-    
-    SDL_PixelFormat *ft = img->format;
-    SDL_Surface *dst = SDL_CreateRGBSurface(0, SCALE1(IMG_MAX_WIDTH), SCALE1(IMG_MAX_HEIGHT), ft->BitsPerPixel, ft->Rmask, ft->Gmask, ft->Bmask, ft->Amask);
-    SDL_Rect imgRect = GFX_blitScaled(GFX_SCALE_FILL, img, dst);
-    GFX_ApplyRoundedCorners(dst, &imgRect, SCALE1(18));
-    SDL_FreeSurface(img);
-
-    return dst;
+	if (!exists(image_path))
+		return NULL;
+
+	SDL_Surface *img = IMG_Load(image_path);
+	if (!img)
+		return NULL;
+
+	if (img->format->format != SDL_PIXELFORMAT_RGBA32) {
+		SDL_Surface *optimized = SDL_ConvertSurfaceFormat(img, SDL_PIXELFORMAT_RGBA32, 0);
+		SDL_FreeSurface(img);
+		img = optimized;
+	}
+
+	SDL_PixelFormat *ft = img->format;
+	SDL_Surface *dst = SDL_CreateRGBSurface(0, SCALE1(IMG_MAX_WIDTH), SCALE1(IMG_MAX_HEIGHT), ft->BitsPerPixel,
+											ft->Rmask, ft->Gmask, ft->Bmask, ft->Amask);
+	SDL_Rect imgRect = GFX_blitScaled(GFX_SCALE_FILL, img, dst);
+	GFX_ApplyRoundedCorners(dst, &imgRect, SCALE1(18));
+	SDL_FreeSurface(img);
+
+	return dst;
 }
 
 void preloadRomImages()
 {
-    // load all rom images into SDL_Surfaces
-    romImages = malloc(sizeof(SDL_Surface *) * play_activities->count);
-    for (int i = 0; i < play_activities->count; i++) {
-        PlayActivity *entry = play_activities->play_activity[i];
-        ROM *rom = entry->rom;
-        romImages[i] = loadRomImage(rom->image_path);
-    }
+	// load all rom images into SDL_Surfaces
+	romImages = malloc(sizeof(SDL_Surface *) * play_activities->count);
+	for (int i = 0; i < play_activities->count; i++) {
+		PlayActivity *entry = play_activities->play_activity[i];
+		ROM *rom = entry->rom;
+		romImages[i] = loadRomImage(rom->image_path);
+	}
 }
 
 void freeRomImages()
 {
-    for (int i = 0; i < play_activities->count; i++) {
-        SDL_FreeSurface(romImages[i]);
-    }
-    free(romImages);
+	for (int i = 0; i < play_activities->count; i++) {
+		SDL_FreeSurface(romImages[i]);
+	}
+	free(romImages);
 }
 
 void renderList(int count, int start, int end, int selected)
 {
-    char num_str[12];
-    char rom_name[255];
-    char total[25];
-    char average[25];
-    char plays[25];
-
-    int num_width = 0;
-
-    const int elemHeight = SCALE1(BIG_PILL_SIZE);
-    const int thumbMargin = SCALE1(IMG_MARGIN);
-    const int textHeight = (elemHeight - thumbMargin) / 2;
-
-    int selected_row = selected - start;
-    for (int index=start,row=0; index<end; index++,row++) {
-        bool isSelected = selected_row == row;
-
-        PlayActivity *entry = play_activities->play_activity[index];
-        ROM *rom = entry->rom;
-
-        renderRoundedRectangle((SDL_Rect){
-            layout.list_display_start_x, 
-            layout.list_display_start_y + row * elemHeight, 
-            layout.list_display_size_x, 
-            elemHeight
-        }, isSelected ? RGB_WHITE : RGB_BLACK, SCALE1(24));
-
-        SDL_Surface *romImage = romImages[index];
-        if (romImage) {
-            SDL_Rect rectRomImage = {
-                layout.list_display_start_x + num_width + thumbMargin / 2 + (SCALE1(IMG_MAX_WIDTH) - romImage->w) / 2, 
-                layout.list_display_start_y + elemHeight * row + thumbMargin / 2, 
-                SCALE1(IMG_MAX_WIDTH), 
-                SCALE1(IMG_MAX_HEIGHT)
-            };
-            SDL_BlitSurface(romImage, NULL, screen, &rectRomImage);
-        }
-        else {
-            SDL_Rect rectRomImage = {
-                layout.list_display_start_x + num_width + thumbMargin / 2, 
-                layout.list_display_start_y + elemHeight * row + thumbMargin / 2, 
-                SCALE1(IMG_MAX_WIDTH), 
-                SCALE1(IMG_MAX_HEIGHT)
-            };
-
-            renderRoundedRectangle(rectRomImage, RGB_DARK_GRAY, SCALE1(18));
-
-            // TODO: no getter exposed for this right now
-            //SDL_Rect rect = asset_rects[ASSET_GAMEPAD];
-            SDL_Rect rect = (SDL_Rect){SCALE4(92,51,18,10)};
-            int x = rectRomImage.x;
-            int y = rectRomImage.y;
-            x += (SCALE1(IMG_MAX_WIDTH) - rect.w) / 2;
-            y += (SCALE1(IMG_MAX_HEIGHT) - rect.h) / 2;
-
-            GFX_blitAssetColor(ASSET_GAMEPAD, NULL, screen, &(SDL_Rect){x,y}, THEME_COLOR1_255);
-        }
-
-        cleanName(rom_name, rom->name);
-        SDL_Color textColor = COLOR_WHITE;
-        if(isSelected) {
-            //textColor = colorFromUint(THEME_COLOR1);
-            textColor = COLOR_BLACK;
-        }
-        renderText(rom_name, font.medium, textColor, &(SDL_Rect){
-            layout.list_display_start_x + num_width + thumbMargin + SCALE1(IMG_MAX_WIDTH), 
-            layout.list_display_start_y + thumbMargin / 2 + elemHeight * row, 
-            layout.list_display_size_x, 
-            textHeight});
-
-        serializeTime(total, entry->play_time_total);
-        serializeTime(average, entry->play_time_average);
-        snprintf(plays, 24, "%d", entry->play_count);
-
-        const char *details[] = {"TOTAL ", total, "  AVERAGE ", average, "  # PLAYS ", plays};
-        SDL_Rect detailsRect = {
-            layout.list_display_start_x + num_width + thumbMargin + SCALE1(IMG_MAX_WIDTH), 
-            layout.list_display_start_y + thumbMargin + textHeight + elemHeight * row, 
-            layout.list_display_size_x, 
-            textHeight
-        };
-        for (int i = 0; i < 6; i++) {
-            SDL_Color detailCol = i % 2 == 0 ? COLOR_DARK_TEXT : colorFromUint(THEME_COLOR2_255);
-            //SDL_Color detailCol = colorFromUint(i % 2 == 0 ? THEME_COLOR3_255 : THEME_COLOR2_255);
-            //SDL_Color detailCol = i % 2 == 0 ? COLOR_DARK_TEXT : COLOR_LIGHT_TEXT;
-            detailsRect.x += renderText(details[i], font.small, detailCol, &detailsRect);
-        }
-    }
-
-    if (count>layout.items_per_page) {
-        #define SCROLL_WIDTH 24
-        #define SCROLL_HEIGHT 4
-        int ox = (screen->w - SCALE1(SCROLL_WIDTH)) / 2;
-        int oy = SCALE1((PILL_SIZE - SCROLL_HEIGHT) / 2);
-        if (start>0) 
-            GFX_blitAsset(ASSET_SCROLL_UP,   NULL, screen, &(SDL_Rect){ox, SCALE1(PADDING + PILL_SIZE)});
-        if (end<count) 
-            GFX_blitAsset(ASSET_SCROLL_DOWN, NULL, screen, &(SDL_Rect){ox, screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_SIZE) + oy});
-    }
+	char num_str[12];
+	char rom_name[255];
+	char total[25];
+	char average[25];
+	char plays[25];
+
+	int num_width = 0;
+
+	const int elemHeight = SCALE1(BIG_PILL_SIZE);
+	const int thumbMargin = SCALE1(IMG_MARGIN);
+	const int textHeight = (elemHeight - thumbMargin) / 2;
+
+	int selected_row = selected - start;
+	for (int index = start, row = 0; index < end; index++, row++) {
+		bool isSelected = selected_row == row;
+
+		PlayActivity *entry = play_activities->play_activity[index];
+		ROM *rom = entry->rom;
+
+		renderRoundedRectangle((SDL_Rect){layout.list_display_start_x, layout.list_display_start_y + row * elemHeight,
+										  layout.list_display_size_x, elemHeight},
+							   isSelected ? RGB_WHITE : RGB_BLACK, SCALE1(24));
+
+		SDL_Surface *romImage = romImages[index];
+		if (romImage) {
+			SDL_Rect rectRomImage = {layout.list_display_start_x + num_width + thumbMargin / 2 +
+										 (SCALE1(IMG_MAX_WIDTH) - romImage->w) / 2,
+									 layout.list_display_start_y + elemHeight * row + thumbMargin / 2,
+									 SCALE1(IMG_MAX_WIDTH), SCALE1(IMG_MAX_HEIGHT)};
+			SDL_BlitSurface(romImage, NULL, screen, &rectRomImage);
+		} else {
+			SDL_Rect rectRomImage = {layout.list_display_start_x + num_width + thumbMargin / 2,
+									 layout.list_display_start_y + elemHeight * row + thumbMargin / 2,
+									 SCALE1(IMG_MAX_WIDTH), SCALE1(IMG_MAX_HEIGHT)};
+
+			renderRoundedRectangle(rectRomImage, RGB_DARK_GRAY, SCALE1(18));
+
+			// TODO: no getter exposed for this right now
+			// SDL_Rect rect = asset_rects[ASSET_GAMEPAD];
+			SDL_Rect rect = (SDL_Rect){SCALE4(92, 51, 18, 10)};
+			int x = rectRomImage.x;
+			int y = rectRomImage.y;
+			x += (SCALE1(IMG_MAX_WIDTH) - rect.w) / 2;
+			y += (SCALE1(IMG_MAX_HEIGHT) - rect.h) / 2;
+
+			GFX_blitAssetColor(ASSET_GAMEPAD, NULL, screen, &(SDL_Rect){x, y}, THEME_COLOR1_255);
+		}
+
+		cleanName(rom_name, rom->name);
+		SDL_Color textColor = COLOR_WHITE;
+		if (isSelected) {
+			// textColor = colorFromUint(THEME_COLOR1);
+			textColor = COLOR_BLACK;
+		}
+		renderText(rom_name, font.medium, textColor,
+				   &(SDL_Rect){layout.list_display_start_x + num_width + thumbMargin + SCALE1(IMG_MAX_WIDTH),
+							   layout.list_display_start_y + thumbMargin / 2 + elemHeight * row,
+							   layout.list_display_size_x, textHeight});
+
+		serializeTime(total, entry->play_time_total);
+		serializeTime(average, entry->play_time_average);
+		snprintf(plays, 24, "%d", entry->play_count);
+
+		const char *details[] = {"TOTAL ", total, "  AVERAGE ", average, "  # PLAYS ", plays};
+		SDL_Rect detailsRect = {layout.list_display_start_x + num_width + thumbMargin + SCALE1(IMG_MAX_WIDTH),
+								layout.list_display_start_y + thumbMargin + textHeight + elemHeight * row,
+								layout.list_display_size_x, textHeight};
+		for (int i = 0; i < 6; i++) {
+			SDL_Color detailCol = i % 2 == 0 ? COLOR_DARK_TEXT : colorFromUint(THEME_COLOR2_255);
+			// SDL_Color detailCol = colorFromUint(i % 2 == 0 ? THEME_COLOR3_255 : THEME_COLOR2_255);
+			// SDL_Color detailCol = i % 2 == 0 ? COLOR_DARK_TEXT : COLOR_LIGHT_TEXT;
+			detailsRect.x += renderText(details[i], font.small, detailCol, &detailsRect);
+		}
+	}
+
+	if (count > layout.items_per_page) {
+#define SCROLL_WIDTH 24
+#define SCROLL_HEIGHT 4
+		int ox = (screen->w - SCALE1(SCROLL_WIDTH)) / 2;
+		int oy = SCALE1((PILL_SIZE - SCROLL_HEIGHT) / 2);
+		if (start > 0)
+			GFX_blitAsset(ASSET_SCROLL_UP, NULL, screen, &(SDL_Rect){ox, SCALE1(PADDING + PILL_SIZE)});
+		if (end < count)
+			GFX_blitAsset(ASSET_SCROLL_DOWN, NULL, screen,
+						  &(SDL_Rect){ox, screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_SIZE) + oy});
+	}
 }
 
 void initLayout()
 {
-    // unscaled
-    int hw = screen->w;
-    int hh = screen->h;
-
-    // the title. just leave the default padding all around
-    layout.sub_title_x = SCALE1(PADDING);
-    layout.sub_title_y = SCALE1(PADDING);
-
-    // the main list.
-    // x: start inside the default padding, and align with the title pill.
-    // y: default padding, below the title pill and some additional padding to leave some breathing room (BUTTON_MARGIN).
-    layout.list_display_start_x = SCALE1(PADDING);
-    layout.list_display_start_y = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN);
-    // x: stretch whole width inside default padding + extra margin (see above).
-    // y: stretch whole height below list_display_start_y, leaving room at the bottom for padding and button hints.
-    layout.list_display_size_x = hw - SCALE1(PADDING * 2);
-    layout.list_display_size_y = hh - SCALE1(PADDING * 2 + PILL_SIZE * 2 + BUTTON_MARGIN * 2);
-
-    layout.list_display_rect.x = layout.list_display_start_x, 
-    layout.list_display_rect.y = layout.list_display_start_y, 
-    layout.list_display_rect.w = layout.list_display_size_x, 
-    layout.list_display_rect.h = layout.list_display_size_y;
-
-    layout.items_per_page = layout.list_display_size_y / SCALE1(BIG_PILL_SIZE);
-    layout.num_pages = (int)ceil((double)play_activities->count / (double)layout.items_per_page);
+	// unscaled
+	int hw = screen->w;
+	int hh = screen->h;
+
+	// the title. just leave the default padding all around
+	layout.sub_title_x = SCALE1(PADDING);
+	layout.sub_title_y = SCALE1(PADDING);
+
+	// the main list.
+	// x: start inside the default padding, and align with the title pill.
+	// y: default padding, below the title pill and some additional padding to leave some breathing room
+	// (BUTTON_MARGIN).
+	layout.list_display_start_x = SCALE1(PADDING);
+	layout.list_display_start_y = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN);
+	// x: stretch whole width inside default padding + extra margin (see above).
+	// y: stretch whole height below list_display_start_y, leaving room at the bottom for padding and button hints.
+	layout.list_display_size_x = hw - SCALE1(PADDING * 2);
+	layout.list_display_size_y = hh - SCALE1(PADDING * 2 + PILL_SIZE * 2 + BUTTON_MARGIN * 2);
+
+	layout.list_display_rect.x = layout.list_display_start_x, layout.list_display_rect.y = layout.list_display_start_y,
+	layout.list_display_rect.w = layout.list_display_size_x, layout.list_display_rect.h = layout.list_display_size_y;
+
+	layout.items_per_page = layout.list_display_size_y / SCALE1(BIG_PILL_SIZE);
+	layout.num_pages = (int)ceil((double)play_activities->count / (double)layout.items_per_page);
 }
 
 int main(int argc, char *argv[])
 {
-    InitSettings();
-
-    PWR_setCPUSpeed(CPU_SPEED_MENU);
-
-    screen = GFX_init(MODE_MAIN);
-    PAD_init();
-    PWR_init();
-
-    signal(SIGINT, sigHandler);
-    signal(SIGTERM, sigHandler);
-
-    play_activities = play_activity_find_all();
-    LOG_debug("found %d roms\n", play_activities->count);
-
-    initLayout();
-    preloadRomImages();
-    int count = play_activities->count;
-    int selected = 0;
-    int start = 0;
-    int end = MIN(count, layout.items_per_page);
-    int visible_rows = end;
-
-    int dirty = 1;
-    int show_setting = 0;
-    while (!quit)
-    {
-        uint32_t frame_start = SDL_GetTicks();
-
-        PAD_poll();
-
-        // This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
-        if (PAD_justPressed(BTN_MENU))
-        {
-            // ?
-        }
-        else {
-            if (PAD_justRepeated(BTN_UP))
-            {
-                selected -= 1;
-                if (selected<0) {
-                    selected = count - 1;
-                    start = MAX(0,count - layout.items_per_page);
-                    end = count;
-                }
-                else if (selected<start) {
-                    start -= 1;
-                    end -= 1;
-                }
-                dirty = 1;
-            }
-            else if (PAD_justRepeated(BTN_DOWN))
-            {
-                selected += 1;
-                if (selected>=count) {
-                    selected = 0;
-                    start = 0;
-                    end = visible_rows;
-                }
-                else if (selected>=end) {
-                    start += 1;
-                    end += 1;
-                }
-                dirty = 1;
-            }
-            else if (PAD_justPressed(BTN_B))
-            {
-                quit = 1;
-            }
-        }
-
-        PWR_update(&dirty, &show_setting, NULL, NULL);
-
-        if (dirty) {
-            GFX_clear(screen);
-
-            // title pill
-            {
-                int max_width = screen->w - SCALE1(PADDING * 2);
-                if(screen->w >= SCALE1(320)) {
-                    int ow = GFX_blitHardwareGroup(screen, show_setting);
-                    max_width = screen->w - SCALE1(PADDING * 2) - ow;
-                }
-
-                int play_time_total = play_activities->play_time_total;
-                char play_time_total_formatted[255];
-                serializeTime(play_time_total_formatted, play_time_total);
-                char display_name[256];
-                sprintf(display_name, "Time spent having fun: %s", play_time_total_formatted);
-
-                char title[256];
-                int text_width = GFX_truncateText(font.large, display_name, title, max_width, SCALE1(BUTTON_PADDING * 2));
-                max_width = MIN(max_width, text_width);
-
-                SDL_Surface *text;
-                text = TTF_RenderUTF8_Blended(font.large, title, COLOR_WHITE);
-                GFX_blitPill(ASSET_BLACK_PILL, screen, &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
-                SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen, &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
-                SDL_FreeSurface(text);
-            }
-
-            renderList(count, start, end, selected);
-
-            if (show_setting)
-                GFX_blitHardwareHints(screen, show_setting);
-            else
-                GFX_blitButtonGroup((char *[]){"U/D", "SCROLL", NULL}, 0, screen, 0);
-
-            GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
-
-            GFX_flip(screen);
-            dirty = 0;
-        }
-        else {
-            GFX_sync();
-        }
-    }
-
-    freeRomImages();
-    free_play_activities(play_activities);
-
-    QuitSettings();
-    PWR_quit();
-    PAD_quit();
-    GFX_quit();
-
-    return EXIT_SUCCESS;
+	InitSettings();
+
+	PWR_setCPUSpeed(CPU_SPEED_MENU);
+
+	screen = GFX_init(MODE_MAIN);
+	PAD_init();
+	PWR_init();
+
+	signal(SIGINT, sigHandler);
+	signal(SIGTERM, sigHandler);
+
+	play_activities = play_activity_find_all();
+	LOG_debug("found %d roms\n", play_activities->count);
+
+	initLayout();
+	preloadRomImages();
+	int count = play_activities->count;
+	int selected = 0;
+	int start = 0;
+	int end = MIN(count, layout.items_per_page);
+	int visible_rows = end;
+
+	int dirty = 1;
+	int show_setting = 0;
+	while (!quit) {
+		uint32_t frame_start = SDL_GetTicks();
+
+		PAD_poll();
+
+		// This might be too harsh, but ignore all combos with MENU (most likely a shortcut for someone else)
+		if (PAD_justPressed(BTN_MENU)) {
+			// ?
+		} else {
+			if (PAD_justRepeated(BTN_UP)) {
+				selected -= 1;
+				if (selected < 0) {
+					selected = count - 1;
+					start = MAX(0, count - layout.items_per_page);
+					end = count;
+				} else if (selected < start) {
+					start -= 1;
+					end -= 1;
+				}
+				dirty = 1;
+			} else if (PAD_justRepeated(BTN_DOWN)) {
+				selected += 1;
+				if (selected >= count) {
+					selected = 0;
+					start = 0;
+					end = visible_rows;
+				} else if (selected >= end) {
+					start += 1;
+					end += 1;
+				}
+				dirty = 1;
+			} else if (PAD_justPressed(BTN_B)) {
+				quit = 1;
+			}
+		}
+
+		PWR_update(&dirty, &show_setting, NULL, NULL);
+
+		if (dirty) {
+			GFX_clear(screen);
+
+			// title pill
+			{
+				int max_width = screen->w - SCALE1(PADDING * 2);
+				if (screen->w >= SCALE1(320)) {
+					int ow = GFX_blitHardwareGroup(screen, show_setting);
+					max_width = screen->w - SCALE1(PADDING * 2) - ow;
+				}
+
+				int play_time_total = play_activities->play_time_total;
+				char play_time_total_formatted[255];
+				serializeTime(play_time_total_formatted, play_time_total);
+				char display_name[256];
+				sprintf(display_name, "Time spent having fun: %s", play_time_total_formatted);
+
+				char title[256];
+				int text_width =
+					GFX_truncateText(font.large, display_name, title, max_width, SCALE1(BUTTON_PADDING * 2));
+				max_width = MIN(max_width, text_width);
+
+				SDL_Surface *text;
+				text = TTF_RenderUTF8_Blended(font.large, title, COLOR_WHITE);
+				GFX_blitPill(ASSET_BLACK_PILL, screen,
+							 &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
+				SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen,
+								&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
+				SDL_FreeSurface(text);
+			}
+
+			renderList(count, start, end, selected);
+
+			if (show_setting)
+				GFX_blitHardwareHints(screen, show_setting);
+			else
+				GFX_blitButtonGroup((char *[]){"U/D", "SCROLL", NULL}, 0, screen, 0);
+
+			GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
+
+			GFX_flip(screen);
+			dirty = 0;
+		} else {
+			GFX_sync();
+		}
+	}
+
+	freeRomImages();
+	free_play_activities(play_activities);
+
+	QuitSettings();
+	PWR_quit();
+	PAD_quit();
+	GFX_quit();
+
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/gametimectl/gametimectl.c b/workspace/all/gametimectl/gametimectl.c
index 9b030b76c..909c87536 100644
--- a/workspace/all/gametimectl/gametimectl.c
+++ b/workspace/all/gametimectl/gametimectl.c
@@ -10,60 +10,53 @@
 
 void printUsage()
 {
-    printf("Usage: gametimectl list             -> List all play activities\n"
-           "       gametimectl start [rom_path] -> Launch the counter for this rom\n"
-           "       gametimectl resume           -> Resume the last rom as a new play activity\n"
-           "       gametimectl stop [rom_path]  -> Stop the counter for this rom\n"
-           "       gametimectl stop_all         -> Stop the counter for all roms\n");
+	printf("Usage: gametimectl list             -> List all play activities\n"
+		   "       gametimectl start [rom_path] -> Launch the counter for this rom\n"
+		   "       gametimectl resume           -> Resume the last rom as a new play activity\n"
+		   "       gametimectl stop [rom_path]  -> Stop the counter for this rom\n"
+		   "       gametimectl stop_all         -> Stop the counter for all roms\n");
 }
 
 int main(int argc, char *argv[])
 {
-    if (argc <= 1) {
-        printUsage();
-        return EXIT_SUCCESS;
-    }
+	if (argc <= 1) {
+		printUsage();
+		return EXIT_SUCCESS;
+	}
 
-    for (int i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "start") == 0) {
-            if (i + 1 < argc) {
-                LOG_info("Start tracking: %s\n", argv[i+1]);
-                play_activity_start(argv[++i]);
-            }
-            else {
-                printf("Error: Missing rom_path argument\n");
-                printUsage();
-                return EXIT_FAILURE;
-            }
-        }
-        else if (strcmp(argv[i], "resume") == 0) {
-            LOG_info("Resuming tracking for last game\n");
-            play_activity_resume();
-        }
-        else if (strcmp(argv[i], "stop") == 0) {
-            if (i + 1 < argc) {
-                LOG_info("Stop tracking: %s\n", argv[i+1]);
-                play_activity_stop(argv[++i]);
-            }
-            else {
-                printf("Error: Missing rom_path argument\n");
-                printUsage();
-                return EXIT_FAILURE;
-            }
-        }
-        else if (strcmp(argv[i], "stop_all") == 0) {
-            LOG_info("Stopping tracking for all games\n");
-            play_activity_stop_all();
-        }
-        else if (strcmp(argv[i], "list") == 0) {
-            play_activity_list_all();
-        }
-        else {
-            printf("Error: Invalid argument '%s'\n", argv[1]);
-            printUsage();
-            return EXIT_FAILURE;
-        }
-    }
+	for (int i = 1; i < argc; i++) {
+		if (strcmp(argv[i], "start") == 0) {
+			if (i + 1 < argc) {
+				LOG_info("Start tracking: %s\n", argv[i + 1]);
+				play_activity_start(argv[++i]);
+			} else {
+				printf("Error: Missing rom_path argument\n");
+				printUsage();
+				return EXIT_FAILURE;
+			}
+		} else if (strcmp(argv[i], "resume") == 0) {
+			LOG_info("Resuming tracking for last game\n");
+			play_activity_resume();
+		} else if (strcmp(argv[i], "stop") == 0) {
+			if (i + 1 < argc) {
+				LOG_info("Stop tracking: %s\n", argv[i + 1]);
+				play_activity_stop(argv[++i]);
+			} else {
+				printf("Error: Missing rom_path argument\n");
+				printUsage();
+				return EXIT_FAILURE;
+			}
+		} else if (strcmp(argv[i], "stop_all") == 0) {
+			LOG_info("Stopping tracking for all games\n");
+			play_activity_stop_all();
+		} else if (strcmp(argv[i], "list") == 0) {
+			play_activity_list_all();
+		} else {
+			printf("Error: Invalid argument '%s'\n", argv[1]);
+			printUsage();
+			return EXIT_FAILURE;
+		}
+	}
 
-    return EXIT_SUCCESS;
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/ledcontrol/ledcontrol.c b/workspace/all/ledcontrol/ledcontrol.c
index aff2cd35c..fae73d870 100644
--- a/workspace/all/ledcontrol/ledcontrol.c
+++ b/workspace/all/ledcontrol/ledcontrol.c
@@ -13,384 +13,361 @@
 
 const char *lightnames[4];
 #define NROF_TRIGGERS 14
-const char *triggernames[] = {
-    "B", "A", "Y", "X", "L", "R", "FN1", "FN2", "MENU", "SELECT", "START", "ALL", "LR", "DPAD"};
-
-const char *effect_names[] = {
-    "Linear", "Breathe", "Interval Breathe", "Static",
-    "Blink 1", "Blink 2", "Blink 3", "Rainbow", "Twinkle",
-    "Fire", "Glitter", "NeonGlow", "Firefly", "Aurora", "Reactive"};
-const char *topbar_effect_names[] = {
-    "Linear", "Breathe", "Interval Breathe", "Static",
-    "Blink 1", "Blink 2", "Blink 3", "Rainbow", "Twinkle",
-    "Fire", "Glitter", "NeonGlow", "Firefly", "Aurora", "Reactive", "Topbar Rainbow", "Topbar night"};
-const char *lr_effect_names[] = {
-    "Linear", "Breathe", "Interval Breathe", "Static",
-    "Blink 1", "Blink 2", "Blink 3", "Rainbow", "Twinkle",
-    "Fire", "Glitter", "NeonGlow", "Firefly", "Aurora", "Reactive", "LR Rainbow", "LR Reactive"};
-
-void save_settings() {
-    LOG_debug("saving settings plat\n");
-    char diskfilename[256];
-    char* device = getenv("DEVICE");
-    is_brick = exactMatch("brick", device);
-    int maxlights = 4;
-    // TODO: this shouldnt be in shared userdata
-    if(is_brick) {
-        snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/ledsettings_brick.txt");
-    }
-    else {
-        maxlights = 3;
-        snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/ledsettings.txt");
-    }
-
-    FILE *file = fopen(diskfilename, "w");
-
-    if (file == NULL)
-    {
-        perror("Unable to open settings file for writing");
-    } else {
-        LOG_debug("saving leds!\n");
-        for (int i = 0; i < maxlights; ++i)
-        {
-            fprintf(file, "[%s]\n", lightsDefault[i].name);
-            fprintf(file, "effect=%d\n", lightsDefault[i].effect);
-            fprintf(file, "color1=0x%06X\n", lightsDefault[i].color1);
-            fprintf(file, "color2=0x%06X\n", lightsDefault[i].color2);
-            fprintf(file, "speed=%d\n", lightsDefault[i].speed);
-            fprintf(file, "brightness=%d\n", lightsDefault[i].brightness);
-            fprintf(file, "trigger=%d\n", lightsDefault[i].trigger);
-            fprintf(file, "filename=%s\n", lightsDefault[i].filename);
-            fprintf(file, "inbrightness=%i\n", lightsDefault[i].inbrightness);
-            fprintf(file, "\n"); // added last extra break seperate because everytime i add another option i forget to change it lol
-        }
-
-        fclose(file);
-    }
+const char *triggernames[] = {"B",	 "A",	 "Y",	   "X",		"L",   "R",	 "FN1",
+							  "FN2", "MENU", "SELECT", "START", "ALL", "LR", "DPAD"};
+
+const char *effect_names[] = {"Linear",	 "Breathe",	 "Interval Breathe", "Static",	"Blink 1",
+							  "Blink 2", "Blink 3",	 "Rainbow",			 "Twinkle", "Fire",
+							  "Glitter", "NeonGlow", "Firefly",			 "Aurora",	"Reactive"};
+const char *topbar_effect_names[] = {"Linear",		   "Breathe",	  "Interval Breathe", "Static",	 "Blink 1",
+									 "Blink 2",		   "Blink 3",	  "Rainbow",		  "Twinkle", "Fire",
+									 "Glitter",		   "NeonGlow",	  "Firefly",		  "Aurora",	 "Reactive",
+									 "Topbar Rainbow", "Topbar night"};
+const char *lr_effect_names[] = {"Linear",	"Breathe", "Interval Breathe", "Static",	 "Blink 1",	   "Blink 2",
+								 "Blink 3", "Rainbow", "Twinkle",		   "Fire",		 "Glitter",	   "NeonGlow",
+								 "Firefly", "Aurora",  "Reactive",		   "LR Rainbow", "LR Reactive"};
+
+void save_settings()
+{
+	LOG_debug("saving settings plat\n");
+	char diskfilename[256];
+	char *device = getenv("DEVICE");
+	is_brick = exactMatch("brick", device);
+	int maxlights = 4;
+	// TODO: this shouldnt be in shared userdata
+	if (is_brick) {
+		snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/ledsettings_brick.txt");
+	} else {
+		maxlights = 3;
+		snprintf(diskfilename, sizeof(diskfilename), SHARED_USERDATA_PATH "/ledsettings.txt");
+	}
+
+	FILE *file = fopen(diskfilename, "w");
+
+	if (file == NULL) {
+		perror("Unable to open settings file for writing");
+	} else {
+		LOG_debug("saving leds!\n");
+		for (int i = 0; i < maxlights; ++i) {
+			fprintf(file, "[%s]\n", lightsDefault[i].name);
+			fprintf(file, "effect=%d\n", lightsDefault[i].effect);
+			fprintf(file, "color1=0x%06X\n", lightsDefault[i].color1);
+			fprintf(file, "color2=0x%06X\n", lightsDefault[i].color2);
+			fprintf(file, "speed=%d\n", lightsDefault[i].speed);
+			fprintf(file, "brightness=%d\n", lightsDefault[i].brightness);
+			fprintf(file, "trigger=%d\n", lightsDefault[i].trigger);
+			fprintf(file, "filename=%s\n", lightsDefault[i].filename);
+			fprintf(file, "inbrightness=%i\n", lightsDefault[i].inbrightness);
+			fprintf(file, "\n"); // added last extra break seperate because everytime i add another option i forget to
+								 // change it lol
+		}
+
+		fclose(file);
+	}
 }
-    
+
 void handle_light_input(LightSettings *light, SDL_Event *event, int selected_setting)
 {
-    const uint32_t bright_colors[] = {
-        // Blues
-        0x000011, 0x000022, 0x000033, 0x000044, 0x000055, 0x000066, 0x000077, 0x000088, 0x000099, 0x0000AA, 0x0000BB, 0x0000CC, 0x3366FF, 0x4D7AFF, 0x6699FF, 0x80B3FF, 0x99CCFF, 0xB3D9FF, 0x0000FF,
-        // Cyan
-        0x001111, 0x002222, 0x003333, 0x004444, 0x005555, 0x006666, 0x007777, 0x008888, 0x009999, 0x00AAAA, 0x00BBBB, 0x00CCCC, 0x33FFFF, 0x4DFFFF, 0x66FFFF, 0x80FFFF, 0x99FFFF, 0xB3FFFF, 0x00FFFF,
-        // Green
-        0x001100, 0x002200, 0x003300, 0x004400, 0x005500, 0x006600, 0x007700, 0x008800, 0x009900, 0x00AA00, 0x00BB00, 0x00CC00, 0x33FF33, 0x4DFF4D, 0x66FF66, 0x80FF80, 0x99FF99, 0xB3FFB3, 0x00FF00,
-        // Magenta
-        0x110011, 0x220022, 0x330033, 0x440044, 0x550055, 0x660066, 0x770077, 0x880088, 0x990099, 0xAA00AA, 0xBB00BB, 0xCC00CC, 0xFF33FF, 0xFF4DFF, 0xFF66FF, 0xFF80FF, 0xFF99FF, 0xFFB3FF, 0xFF00FF,
-        // Purple
-        0x220044, 0x330066, 0x440088, 0x5500AA, 0x6600CC, 0x7700DD, 0x8800EE, 0x9900FF, 0xAA00FF, 0xBB00FF, 0xCC00FF, 0x8833FF, 0x994DFF, 0xAA66FF, 0xBB80FF, 0xCC99FF, 0xDDB3FF,
-        // Red
-        0x220000, 0x440000, 0x660000, 0x880000, 0xAA0000, 0xCC0000, 0xFF3333, 0xFF4D4D, 0xFF6666, 0xFF8080, 0xFF9999, 0xFFB3B3, 0xFF0000,
-        // Yellow
-        0x222200, 0x444400, 0x666600, 0x888800, 0xAAAA00, 0xCCCC00, 0xFFFF33, 0xFFFF4D, 0xFFFF66, 0xFFFF80, 0xFFFF99, 0xFFFFB3, 0xFFFF00,
-        // Orange
-        0x331100, 0x662200, 0x993300, 0xCC4400, 0xFF5500, 0xFF6600, 0xFF7711, 0xFF8822, 0xFF9933, 0xFFAA44, 0xFFBB55, 0xFFCC66, 0xFFDD77, 0xFFEE88,
-        // White to Black Gradient
-        0x000000, 0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, 0x888888, 0x999999, 0xAAAAAA, 0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xFFFFFF
-    };
-    
-    const int num_bright_colors = sizeof(bright_colors) / sizeof(bright_colors[0]);
-
-    switch (selected_setting)
-    {
-    case 0: // Effect
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            light->effect = (light->effect % 6) + 1; // Increase effect (1 to 8)
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            light->effect = (light->effect - 2 + 6) % 6 + 1; // Decrease effect (1 to 8)
-        }
-        break;
-    case 1: // Color
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            int current_index = -1;
-            for (int i = 0; i < num_bright_colors; i++)
-            {
-                if (bright_colors[i] == light->color1)
-                {
-                    current_index = i;
-                    break;
-                }
-            }
-            light->color1 = bright_colors[(current_index + 1) % num_bright_colors];
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            int current_index = -1;
-            for (int i = 0; i < num_bright_colors; i++)
-            {
-                if (bright_colors[i] == light->color1)
-                {
-                    current_index = i;
-                    break;
-                }
-            }
-            light->color1 = bright_colors[(current_index - 1 + num_bright_colors) % num_bright_colors];
-        }
-        break;
-    // case 2: // Color2
-    //     if (PAD_justPressed(BTN_RIGHT))
-    //     {
-    //         int current_index = -1;
-    //         for (int i = 0; i < num_bright_colors; i++)
-    //         {
-    //             if (bright_colors[i] == light->color2)
-    //             {
-    //                 current_index = i;
-    //                 break;
-    //             }
-    //         }
-    //         SDL_Log("saved settings to disk and shm %d", current_index);
-    //         light->color2 = bright_colors[(current_index + 1) % num_bright_colors];
-    //     }
-    //     else if (PAD_justPressed(BTN_LEFT))
-    //     {
-    //         int current_index = -1;
-    //         for (int i = 0; i < num_bright_colors; i++)
-    //         {
-    //             if (bright_colors[i] == light->color2)
-    //             {
-    //                 current_index = i;
-    //                 break;
-    //             }
-    //         }
-    //         light->color2 = bright_colors[(current_index - 1 + num_bright_colors) % num_bright_colors];
-    //     }
-    //     break;
-    case 2: // Duration
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            light->speed = (light->speed + 100) % 5000; // Increase duration
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            light->speed = (light->speed - 100 + 5000) % 5000; // Decrease duration
-        }
-        break;
-    case 3: // Brightness
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            light->brightness = (light->brightness + 5) % 105; // Increase duration
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            light->brightness = (light->brightness - 5 + 105) % 105; // Decrease duration
-        }
-        break;
-    case 4: // Info Brightness
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            light->inbrightness = (light->inbrightness + 5) % 105; // Increase duration
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            light->inbrightness = (light->inbrightness - 5 + 105) % 105; // Decrease duration
-        }
-        break;
-    case 5: // trigger
-    if (PAD_justPressed(BTN_RIGHT))
-        {
-            light->trigger = (light->trigger % NROF_TRIGGERS) + 1; // Increase effect (1 to 8)
-        }
-        else if (PAD_justPressed(BTN_LEFT))
-        {
-            light->trigger = (light->trigger - 2 + NROF_TRIGGERS) % NROF_TRIGGERS + 1; // Decrease effect (1 to 8)
-        }
-        break;
-    }
-
-    // Save settings after each change
-    LEDS_setProfile(LIGHT_PROFILE_DEFAULT);
-    LEDS_updateLeds(false);
-    save_settings();
+	const uint32_t bright_colors[] = {
+		// Blues
+		0x000011, 0x000022, 0x000033, 0x000044, 0x000055, 0x000066, 0x000077, 0x000088, 0x000099, 0x0000AA, 0x0000BB,
+		0x0000CC, 0x3366FF, 0x4D7AFF, 0x6699FF, 0x80B3FF, 0x99CCFF, 0xB3D9FF, 0x0000FF,
+		// Cyan
+		0x001111, 0x002222, 0x003333, 0x004444, 0x005555, 0x006666, 0x007777, 0x008888, 0x009999, 0x00AAAA, 0x00BBBB,
+		0x00CCCC, 0x33FFFF, 0x4DFFFF, 0x66FFFF, 0x80FFFF, 0x99FFFF, 0xB3FFFF, 0x00FFFF,
+		// Green
+		0x001100, 0x002200, 0x003300, 0x004400, 0x005500, 0x006600, 0x007700, 0x008800, 0x009900, 0x00AA00, 0x00BB00,
+		0x00CC00, 0x33FF33, 0x4DFF4D, 0x66FF66, 0x80FF80, 0x99FF99, 0xB3FFB3, 0x00FF00,
+		// Magenta
+		0x110011, 0x220022, 0x330033, 0x440044, 0x550055, 0x660066, 0x770077, 0x880088, 0x990099, 0xAA00AA, 0xBB00BB,
+		0xCC00CC, 0xFF33FF, 0xFF4DFF, 0xFF66FF, 0xFF80FF, 0xFF99FF, 0xFFB3FF, 0xFF00FF,
+		// Purple
+		0x220044, 0x330066, 0x440088, 0x5500AA, 0x6600CC, 0x7700DD, 0x8800EE, 0x9900FF, 0xAA00FF, 0xBB00FF, 0xCC00FF,
+		0x8833FF, 0x994DFF, 0xAA66FF, 0xBB80FF, 0xCC99FF, 0xDDB3FF,
+		// Red
+		0x220000, 0x440000, 0x660000, 0x880000, 0xAA0000, 0xCC0000, 0xFF3333, 0xFF4D4D, 0xFF6666, 0xFF8080, 0xFF9999,
+		0xFFB3B3, 0xFF0000,
+		// Yellow
+		0x222200, 0x444400, 0x666600, 0x888800, 0xAAAA00, 0xCCCC00, 0xFFFF33, 0xFFFF4D, 0xFFFF66, 0xFFFF80, 0xFFFF99,
+		0xFFFFB3, 0xFFFF00,
+		// Orange
+		0x331100, 0x662200, 0x993300, 0xCC4400, 0xFF5500, 0xFF6600, 0xFF7711, 0xFF8822, 0xFF9933, 0xFFAA44, 0xFFBB55,
+		0xFFCC66, 0xFFDD77, 0xFFEE88,
+		// White to Black Gradient
+		0x000000, 0x111111, 0x222222, 0x333333, 0x444444, 0x555555, 0x666666, 0x777777, 0x888888, 0x999999, 0xAAAAAA,
+		0xBBBBBB, 0xCCCCCC, 0xDDDDDD, 0xFFFFFF};
+
+	const int num_bright_colors = sizeof(bright_colors) / sizeof(bright_colors[0]);
+
+	switch (selected_setting) {
+	case 0: // Effect
+		if (PAD_justPressed(BTN_RIGHT)) {
+			light->effect = (light->effect % 6) + 1; // Increase effect (1 to 8)
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			light->effect = (light->effect - 2 + 6) % 6 + 1; // Decrease effect (1 to 8)
+		}
+		break;
+	case 1: // Color
+		if (PAD_justPressed(BTN_RIGHT)) {
+			int current_index = -1;
+			for (int i = 0; i < num_bright_colors; i++) {
+				if (bright_colors[i] == light->color1) {
+					current_index = i;
+					break;
+				}
+			}
+			light->color1 = bright_colors[(current_index + 1) % num_bright_colors];
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			int current_index = -1;
+			for (int i = 0; i < num_bright_colors; i++) {
+				if (bright_colors[i] == light->color1) {
+					current_index = i;
+					break;
+				}
+			}
+			light->color1 = bright_colors[(current_index - 1 + num_bright_colors) % num_bright_colors];
+		}
+		break;
+	// case 2: // Color2
+	//     if (PAD_justPressed(BTN_RIGHT))
+	//     {
+	//         int current_index = -1;
+	//         for (int i = 0; i < num_bright_colors; i++)
+	//         {
+	//             if (bright_colors[i] == light->color2)
+	//             {
+	//                 current_index = i;
+	//                 break;
+	//             }
+	//         }
+	//         SDL_Log("saved settings to disk and shm %d", current_index);
+	//         light->color2 = bright_colors[(current_index + 1) % num_bright_colors];
+	//     }
+	//     else if (PAD_justPressed(BTN_LEFT))
+	//     {
+	//         int current_index = -1;
+	//         for (int i = 0; i < num_bright_colors; i++)
+	//         {
+	//             if (bright_colors[i] == light->color2)
+	//             {
+	//                 current_index = i;
+	//                 break;
+	//             }
+	//         }
+	//         light->color2 = bright_colors[(current_index - 1 + num_bright_colors) % num_bright_colors];
+	//     }
+	//     break;
+	case 2: // Duration
+		if (PAD_justPressed(BTN_RIGHT)) {
+			light->speed = (light->speed + 100) % 5000; // Increase duration
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			light->speed = (light->speed - 100 + 5000) % 5000; // Decrease duration
+		}
+		break;
+	case 3: // Brightness
+		if (PAD_justPressed(BTN_RIGHT)) {
+			light->brightness = (light->brightness + 5) % 105; // Increase duration
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			light->brightness = (light->brightness - 5 + 105) % 105; // Decrease duration
+		}
+		break;
+	case 4: // Info Brightness
+		if (PAD_justPressed(BTN_RIGHT)) {
+			light->inbrightness = (light->inbrightness + 5) % 105; // Increase duration
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			light->inbrightness = (light->inbrightness - 5 + 105) % 105; // Decrease duration
+		}
+		break;
+	case 5: // trigger
+		if (PAD_justPressed(BTN_RIGHT)) {
+			light->trigger = (light->trigger % NROF_TRIGGERS) + 1; // Increase effect (1 to 8)
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			light->trigger = (light->trigger - 2 + NROF_TRIGGERS) % NROF_TRIGGERS + 1; // Decrease effect (1 to 8)
+		}
+		break;
+	}
+
+	// Save settings after each change
+	LEDS_setProfile(LIGHT_PROFILE_DEFAULT);
+	LEDS_updateLeds(false);
+	save_settings();
 }
 
 int main(int argc, char *argv[])
 {
-    char* device = getenv("DEVICE");
-    is_brick = exactMatch("brick", device);
-    
+	char *device = getenv("DEVICE");
+	is_brick = exactMatch("brick", device);
+
 	InitSettings();
-    PWR_setCPUSpeed(CPU_SPEED_MENU);
-
-    if (is_brick) {
-        const char *brick_names[] = {"F1 key", "F2 key", "Top bar", "L&R triggers"};
-        memcpy(lightnames, brick_names, sizeof(brick_names)); // Copy values
-    } else {
-        const char *default_names[] = {"Joystick L","Joystick R", "Logo"};
-        memcpy(lightnames, default_names, sizeof(default_names)); // Copy values
-    }
-    
-    SDL_Surface* screen = GFX_init(MODE_MENU);
+	PWR_setCPUSpeed(CPU_SPEED_MENU);
+
+	if (is_brick) {
+		const char *brick_names[] = {"F1 key", "F2 key", "Top bar", "L&R triggers"};
+		memcpy(lightnames, brick_names, sizeof(brick_names)); // Copy values
+	} else {
+		const char *default_names[] = {"Joystick L", "Joystick R", "Logo"};
+		memcpy(lightnames, default_names, sizeof(default_names)); // Copy values
+	}
+
+	SDL_Surface *screen = GFX_init(MODE_MENU);
 	PAD_init();
 	PWR_init();
 
-    GFX_clearAll();
+	GFX_clearAll();
 	GFX_clearLayers(0);
 	GFX_flip(screen);
 
-    bool running = true;
-    int selected_light = 0;
-    int selected_setting = 0;
-    SDL_Event event;
-    int quit = 0;
+	bool running = true;
+	int selected_light = 0;
+	int selected_setting = 0;
+	SDL_Event event;
+	int quit = 0;
 	int dirty = 1;
-    int show_setting = 0; // 1=brightness,2=volume,3=colortemp
-    int was_online = PLAT_isOnline();
-    int had_bt = PLAT_btIsConnected();
-
-    while (!quit)
-    {
-        GFX_startFrame();
-        uint32_t frame_start = SDL_GetTicks();
-		
+	int show_setting = 0; // 1=brightness,2=volume,3=colortemp
+	int was_online = PLAT_isOnline();
+	int had_bt = PLAT_btIsConnected();
+
+	while (!quit) {
+		GFX_startFrame();
+		uint32_t frame_start = SDL_GetTicks();
+
 		PAD_poll();
 
-        PWR_update(&dirty, &show_setting, NULL, NULL);
-        
-        int is_online = PLAT_isOnline();
-		if (was_online!=is_online) 
-            dirty = 1;
+		PWR_update(&dirty, &show_setting, NULL, NULL);
+
+		int is_online = PLAT_isOnline();
+		if (was_online != is_online)
+			dirty = 1;
 		was_online = is_online;
 
-        int has_bt = PLAT_btIsConnected();
-        if (had_bt != has_bt)
-            dirty = 1;
-        had_bt = has_bt;
-
-        int numOfLights = 3;
-        if(is_brick) numOfLights = 4;
-
-        if (PAD_justPressed(BTN_B)) {
-            quit = 1;
-        }
-        else if(PAD_justPressed(BTN_DOWN)) {
-            selected_setting = (selected_setting + 1) % NUM_MAIN_OPTIONS;
-            dirty = 1;
-        }
-        else if(PAD_justPressed(BTN_UP)) {
-            selected_setting = (selected_setting - 1 + NUM_MAIN_OPTIONS) % NUM_MAIN_OPTIONS;
-            dirty = 1;
-        }
-        else if(PAD_justPressed(BTN_L1)) {
-            selected_light = (selected_light - 1 + numOfLights) % numOfLights;
-            dirty = 1;
-        }
-        else if(PAD_justPressed(BTN_R1)) {
-            selected_light = (selected_light + 1) % numOfLights;
-            dirty = 1;
-        }
-        else if(PAD_justPressed(BTN_LEFT) || PAD_justPressed(BTN_RIGHT)) {
-            handle_light_input(&lightsDefault[selected_light],&event, selected_setting);
-            dirty = 1;
-        }
-
-        if (dirty) {
-            GFX_clear(screen);
-
-            int ow = GFX_blitHardwareGroup(screen, show_setting);
-
-            if (show_setting) GFX_blitHardwareHints(screen, show_setting);
-
-            GFX_blitButtonGroup((char*[]){ "B","BACK", NULL }, 1, screen, 1);
-            GFX_blitButtonGroup((char*[]){ "L/R","Select light", NULL }, 0, screen, 0);
-
-
-            int max_width = screen->w - SCALE1(PADDING * 2) - ow;
-            // Display light name
-            char light_name_text[256];
-            snprintf(light_name_text, sizeof(light_name_text), "%s", lightnames[selected_light]);
-
-            char title[256];
-            int text_width = GFX_truncateText(font.medium, light_name_text, title, max_width, SCALE1(BUTTON_PADDING * 2));
-            max_width = MIN(max_width, text_width);
-
-            SDL_Surface *text;
-            text = TTF_RenderUTF8_Blended(font.medium, title, COLOR_WHITE);
-            GFX_blitPill(ASSET_BLACK_PILL, screen, &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
-            SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen, &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
-            SDL_FreeSurface(text);
-
-            // Display settings
-            // const char *settings_labels[6] = {"Effect", "Color", "Color2", "Speed", "Brightness", "Trigger"};
-            // this stuff is really not multiplatform at all, need to figure out a way so its not so TrimUI specific
-            const char *settings_labels[5]; // Define array with correct size
-            if (is_brick) {
-                const char *brick_labels[] = {"Effect", "Color", "Speed", "Brightness", "Info brightness"};
-                memcpy(settings_labels, brick_labels, sizeof(brick_labels)); // Copy values
-            } else {
-                const char *non_brick_labels[] = {"Effect", "Color", "Speed", "Brightness (All Leds)", "Info brightness (All Leds)"};
-                memcpy(settings_labels, non_brick_labels, sizeof(non_brick_labels)); // Copy values
-            }
-            int settings_values[5] = {
-                lightsDefault[selected_light].effect,
-                lightsDefault[selected_light].color1,
-                lightsDefault[selected_light].speed,
-                lightsDefault[selected_light].brightness,
-                lightsDefault[selected_light].inbrightness
-            };
-
-            for (int j = 0; j < 5; ++j)
-            {
-                char setting_text[256];
-                bool selected = (j == selected_setting);
-                SDL_Color current_color = selected ? COLOR_BLACK : COLOR_WHITE;
-
-                int y = SCALE1(PADDING + PILL_SIZE * (j + 1));
-
-                if (j == 0) { // Display effect name instead of number
-                    snprintf(setting_text, sizeof(setting_text), "%s: %s", settings_labels[j], selected_light == 3 ? lr_effect_names[settings_values[j] - 1] : selected_light == 2 ? topbar_effect_names[settings_values[j] - 1] : effect_names[settings_values[j] - 1]);
-                    SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
-                    int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
-                    GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen,
-                                    &(SDL_Rect){SCALE1(PADDING), y, text_width, SCALE1(PILL_SIZE)});
-                    SDL_BlitSurface(text, 
-                        &(SDL_Rect){0, 0, text->w, text->h}, screen, 
-                        &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
-                    SDL_FreeSurface(text);
-                } else if (j == 1) { // Display color as hex code
-                    snprintf(setting_text, sizeof(setting_text), "%s", settings_labels[j]);
-                    SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
-                    int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
-                    GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen, 
-                        &(SDL_Rect){SCALE1(PADDING), y, text_width + SCALE1(BUTTON_MARGIN + BUTTON_SIZE), SCALE1(PILL_SIZE)});
-                    SDL_BlitSurface(text, 
-                        &(SDL_Rect){0, 0, text->w, text->h}, screen, 
-                        &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
-                    SDL_FreeSurface(text);
-
-                    GFX_blitAssetColor(ASSET_BUTTON, NULL, screen, &(SDL_Rect){
-                        SCALE1(PADDING) + text_width,
-                        y + SCALE1(BUTTON_MARGIN)
-                    }, settings_values[j]);
-                } else  {
-                    snprintf(setting_text, sizeof(setting_text), "%s: %d", settings_labels[j], settings_values[j]);
-                    SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
-                    int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
-                    GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen, 
-                        &(SDL_Rect){SCALE1(PADDING), y, text_width, SCALE1(PILL_SIZE)});
-                    SDL_BlitSurface(text, 
-                        &(SDL_Rect){0, 0, text->w, text->h}, screen, 
-                        &(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
-                    SDL_FreeSurface(text);
-                }
-            }
-
-            GFX_flip(screen);
-            dirty = 0;
-        }
-        else GFX_delay();
-    }
+		int has_bt = PLAT_btIsConnected();
+		if (had_bt != has_bt)
+			dirty = 1;
+		had_bt = has_bt;
+
+		int numOfLights = 3;
+		if (is_brick)
+			numOfLights = 4;
+
+		if (PAD_justPressed(BTN_B)) {
+			quit = 1;
+		} else if (PAD_justPressed(BTN_DOWN)) {
+			selected_setting = (selected_setting + 1) % NUM_MAIN_OPTIONS;
+			dirty = 1;
+		} else if (PAD_justPressed(BTN_UP)) {
+			selected_setting = (selected_setting - 1 + NUM_MAIN_OPTIONS) % NUM_MAIN_OPTIONS;
+			dirty = 1;
+		} else if (PAD_justPressed(BTN_L1)) {
+			selected_light = (selected_light - 1 + numOfLights) % numOfLights;
+			dirty = 1;
+		} else if (PAD_justPressed(BTN_R1)) {
+			selected_light = (selected_light + 1) % numOfLights;
+			dirty = 1;
+		} else if (PAD_justPressed(BTN_LEFT) || PAD_justPressed(BTN_RIGHT)) {
+			handle_light_input(&lightsDefault[selected_light], &event, selected_setting);
+			dirty = 1;
+		}
+
+		if (dirty) {
+			GFX_clear(screen);
+
+			int ow = GFX_blitHardwareGroup(screen, show_setting);
+
+			if (show_setting)
+				GFX_blitHardwareHints(screen, show_setting);
+
+			GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
+			GFX_blitButtonGroup((char *[]){"L/R", "Select light", NULL}, 0, screen, 0);
+
+
+			int max_width = screen->w - SCALE1(PADDING * 2) - ow;
+			// Display light name
+			char light_name_text[256];
+			snprintf(light_name_text, sizeof(light_name_text), "%s", lightnames[selected_light]);
+
+			char title[256];
+			int text_width =
+				GFX_truncateText(font.medium, light_name_text, title, max_width, SCALE1(BUTTON_PADDING * 2));
+			max_width = MIN(max_width, text_width);
+
+			SDL_Surface *text;
+			text = TTF_RenderUTF8_Blended(font.medium, title, COLOR_WHITE);
+			GFX_blitPill(ASSET_BLACK_PILL, screen,
+						 &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
+			SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen,
+							&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
+			SDL_FreeSurface(text);
+
+			// Display settings
+			// const char *settings_labels[6] = {"Effect", "Color", "Color2", "Speed", "Brightness", "Trigger"};
+			// this stuff is really not multiplatform at all, need to figure out a way so its not so TrimUI specific
+			const char *settings_labels[5]; // Define array with correct size
+			if (is_brick) {
+				const char *brick_labels[] = {"Effect", "Color", "Speed", "Brightness", "Info brightness"};
+				memcpy(settings_labels, brick_labels, sizeof(brick_labels)); // Copy values
+			} else {
+				const char *non_brick_labels[] = {"Effect", "Color", "Speed", "Brightness (All Leds)",
+												  "Info brightness (All Leds)"};
+				memcpy(settings_labels, non_brick_labels, sizeof(non_brick_labels)); // Copy values
+			}
+			int settings_values[5] = {lightsDefault[selected_light].effect, lightsDefault[selected_light].color1,
+									  lightsDefault[selected_light].speed, lightsDefault[selected_light].brightness,
+									  lightsDefault[selected_light].inbrightness};
+
+			for (int j = 0; j < 5; ++j) {
+				char setting_text[256];
+				bool selected = (j == selected_setting);
+				SDL_Color current_color = selected ? COLOR_BLACK : COLOR_WHITE;
+
+				int y = SCALE1(PADDING + PILL_SIZE * (j + 1));
+
+				if (j == 0) { // Display effect name instead of number
+					snprintf(setting_text, sizeof(setting_text), "%s: %s", settings_labels[j],
+							 selected_light == 3   ? lr_effect_names[settings_values[j] - 1]
+							 : selected_light == 2 ? topbar_effect_names[settings_values[j] - 1]
+												   : effect_names[settings_values[j] - 1]);
+					SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
+					int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
+					GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen,
+								 &(SDL_Rect){SCALE1(PADDING), y, text_width, SCALE1(PILL_SIZE)});
+					SDL_BlitSurface(text, &(SDL_Rect){0, 0, text->w, text->h}, screen,
+									&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
+					SDL_FreeSurface(text);
+				} else if (j == 1) { // Display color as hex code
+					snprintf(setting_text, sizeof(setting_text), "%s", settings_labels[j]);
+					SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
+					int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
+					GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen,
+								 &(SDL_Rect){SCALE1(PADDING), y, text_width + SCALE1(BUTTON_MARGIN + BUTTON_SIZE),
+											 SCALE1(PILL_SIZE)});
+					SDL_BlitSurface(text, &(SDL_Rect){0, 0, text->w, text->h}, screen,
+									&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
+					SDL_FreeSurface(text);
+
+					GFX_blitAssetColor(ASSET_BUTTON, NULL, screen,
+									   &(SDL_Rect){SCALE1(PADDING) + text_width, y + SCALE1(BUTTON_MARGIN)},
+									   settings_values[j]);
+				} else {
+					snprintf(setting_text, sizeof(setting_text), "%s: %d", settings_labels[j], settings_values[j]);
+					SDL_Surface *text = TTF_RenderUTF8_Blended(font.medium, setting_text, current_color);
+					int text_width = text->w + SCALE1(BUTTON_PADDING * 2);
+					GFX_blitPill(selected ? ASSET_WHITE_PILL : ASSET_BLACK_PILL, screen,
+								 &(SDL_Rect){SCALE1(PADDING), y, text_width, SCALE1(PILL_SIZE)});
+					SDL_BlitSurface(text, &(SDL_Rect){0, 0, text->w, text->h}, screen,
+									&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), y + SCALE1(4)});
+					SDL_FreeSurface(text);
+				}
+			}
+
+			GFX_flip(screen);
+			dirty = 0;
+		} else
+			GFX_delay();
+	}
 	PWR_quit();
 	PAD_quit();
 	GFX_quit();
-    QuitSettings();
+	QuitSettings();
 
-    return 0;
+	return 0;
 }
diff --git a/workspace/all/libbatmondb/batmondb.c b/workspace/all/libbatmondb/batmondb.c
index 598eed438..46120e077 100644
--- a/workspace/all/libbatmondb/batmondb.c
+++ b/workspace/all/libbatmondb/batmondb.c
@@ -12,66 +12,67 @@
 #define BATTERY_LOG_PATH SHARED_USERDATA_PATH
 #define BATTERY_LOG_FILE BATTERY_LOG_PATH "/battery_logs.sqlite"
 
-sqlite3* open_battery_log_db(void)
+sqlite3 *open_battery_log_db(void)
 {
-    mkdir(BATTERY_LOG_PATH, 0755);
-    bool db_exists = exists(BATTERY_LOG_FILE);
-    if (!db_exists)
-        touch(BATTERY_LOG_FILE);
+	mkdir(BATTERY_LOG_PATH, 0755);
+	bool db_exists = exists(BATTERY_LOG_FILE);
+	if (!db_exists)
+		touch(BATTERY_LOG_FILE);
 
-    sqlite3 *bat_log_db = NULL;
+	sqlite3 *bat_log_db = NULL;
 
-    if (sqlite3_open(BATTERY_LOG_FILE, &bat_log_db) != SQLITE_OK) {
-        printf("%s\n", sqlite3_errmsg(bat_log_db));
-        close_battery_log_db(bat_log_db);
-        return NULL;
-    }
+	if (sqlite3_open(BATTERY_LOG_FILE, &bat_log_db) != SQLITE_OK) {
+		printf("%s\n", sqlite3_errmsg(bat_log_db));
+		close_battery_log_db(bat_log_db);
+		return NULL;
+	}
 
-    if (!db_exists) {
-        sqlite3_exec(bat_log_db,
-                     "DROP TABLE IF EXISTS bat_activity;"
-                     "CREATE TABLE bat_activity(id INTEGER PRIMARY KEY, device_serial TEXT, bat_level INTEGER, duration INTEGER, is_charging INTEGER);"
-                     "CREATE INDEX bat_activity_device_SN_index ON bat_activity(device_serial);",
-                     NULL, NULL, NULL);
-        sqlite3_exec(bat_log_db,
-                     "DROP TABLE IF EXISTS device_specifics;"
-                     "CREATE TABLE device_specifics(id INTEGER PRIMARY KEY, device_serial TEXT, best_session INTEGER);"
-                     "CREATE INDEX device_specifics_index ON device_specifics(device_serial);",
-                     NULL, NULL, NULL);
-    }
+	if (!db_exists) {
+		sqlite3_exec(bat_log_db,
+					 "DROP TABLE IF EXISTS bat_activity;"
+					 "CREATE TABLE bat_activity(id INTEGER PRIMARY KEY, device_serial TEXT, bat_level INTEGER, "
+					 "duration INTEGER, is_charging INTEGER);"
+					 "CREATE INDEX bat_activity_device_SN_index ON bat_activity(device_serial);",
+					 NULL, NULL, NULL);
+		sqlite3_exec(bat_log_db,
+					 "DROP TABLE IF EXISTS device_specifics;"
+					 "CREATE TABLE device_specifics(id INTEGER PRIMARY KEY, device_serial TEXT, best_session INTEGER);"
+					 "CREATE INDEX device_specifics_index ON device_specifics(device_serial);",
+					 NULL, NULL, NULL);
+	}
 
-    return bat_log_db;
+	return bat_log_db;
 }
 
-void close_battery_log_db(sqlite3* bat_log_db)
+void close_battery_log_db(sqlite3 *bat_log_db)
 {
-    sqlite3_close(bat_log_db);
-    bat_log_db = NULL;
+	sqlite3_close(bat_log_db);
+	bat_log_db = NULL;
 }
 
-int get_best_session_time(sqlite3* bat_log_db, const char* device)
+int get_best_session_time(sqlite3 *bat_log_db, const char *device)
 {
-    int best_time = 0;
+	int best_time = 0;
 
-    if (bat_log_db != NULL) {
-        const char *sql = "SELECT * FROM device_specifics WHERE device_serial = ? ORDER BY id LIMIT 1;";
-        sqlite3_stmt *stmt;
+	if (bat_log_db != NULL) {
+		const char *sql = "SELECT * FROM device_specifics WHERE device_serial = ? ORDER BY id LIMIT 1;";
+		sqlite3_stmt *stmt;
 
-        int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
-        if (rc == SQLITE_OK) {
-            sqlite3_bind_text(stmt, 1, device, -1, SQLITE_STATIC);
-            rc = sqlite3_step(stmt);
-            if (rc == SQLITE_ROW) {
-                best_time = sqlite3_column_int(stmt, 2);
-            }
-            else {
-                char *sql2 = sqlite3_mprintf("INSERT INTO device_specifics(device_serial, best_session) VALUES(%Q, %d);", device, 0);
-                sqlite3_exec(bat_log_db, sql2, NULL, NULL, NULL);
-                sqlite3_free(sql2);
-            }
-        }
-        sqlite3_finalize(stmt);
-    }
-    
-    return best_time;
+		int rc = sqlite3_prepare_v2(bat_log_db, sql, -1, &stmt, 0);
+		if (rc == SQLITE_OK) {
+			sqlite3_bind_text(stmt, 1, device, -1, SQLITE_STATIC);
+			rc = sqlite3_step(stmt);
+			if (rc == SQLITE_ROW) {
+				best_time = sqlite3_column_int(stmt, 2);
+			} else {
+				char *sql2 = sqlite3_mprintf(
+					"INSERT INTO device_specifics(device_serial, best_session) VALUES(%Q, %d);", device, 0);
+				sqlite3_exec(bat_log_db, sql2, NULL, NULL, NULL);
+				sqlite3_free(sql2);
+			}
+		}
+		sqlite3_finalize(stmt);
+	}
+
+	return best_time;
 }
\ No newline at end of file
diff --git a/workspace/all/libbatmondb/batmondb.h b/workspace/all/libbatmondb/batmondb.h
index 7483d7fdb..599dbd8e6 100644
--- a/workspace/all/libbatmondb/batmondb.h
+++ b/workspace/all/libbatmondb/batmondb.h
@@ -2,8 +2,8 @@
 #ifndef __batmon_db_h__
 #define __batmon_db_h__
 
-sqlite3* open_battery_log_db(void);
-void close_battery_log_db(sqlite3* ctx);
-int get_best_session_time(sqlite3* ctx, const char* device);
+sqlite3 *open_battery_log_db(void);
+void close_battery_log_db(sqlite3 *ctx);
+int get_best_session_time(sqlite3 *ctx, const char *device);
 
 #endif // __batmon_db_h__
\ No newline at end of file
diff --git a/workspace/all/libgametimedb/gametimedb.c b/workspace/all/libgametimedb/gametimedb.c
index 0bad08717..30c94f1f8 100644
--- a/workspace/all/libgametimedb/gametimedb.c
+++ b/workspace/all/libgametimedb/gametimedb.c
@@ -1,4 +1,5 @@
-// heavily modified from the Onion original: https://github.com/OnionUI/Onion/blob/main/src/playActivity/playActivityDB.h
+// heavily modified from the Onion original:
+// https://github.com/OnionUI/Onion/blob/main/src/playActivity/playActivityDB.h
 #include <stdlib.h>
 #include <stdbool.h>
 #include <sys/stat.h>
@@ -15,456 +16,460 @@
 #define GAMETIME_LOG_PATH SHARED_USERDATA_PATH
 #define GAMETIME_LOG_FILE GAMETIME_LOG_PATH "/game_logs.sqlite"
 
-sqlite3* play_activity_db_open(void)
+sqlite3 *play_activity_db_open(void)
 {
-    mkdir(GAMETIME_LOG_PATH, 0777);
-    bool db_exists = exists(GAMETIME_LOG_FILE);
-    if (!db_exists)
-        touch(GAMETIME_LOG_FILE);
-
-    sqlite3 *game_log_db = NULL;
-
-    if (sqlite3_open(GAMETIME_LOG_FILE, &game_log_db) != SQLITE_OK) {
-        printf("%s\n", sqlite3_errmsg(game_log_db));
-        play_activity_db_close(game_log_db);
-        return NULL;
-    }
-
-    if (!db_exists) {
-        sqlite3_exec(game_log_db,
-                     "DROP TABLE IF EXISTS rom;"
-                     "CREATE TABLE rom(id INTEGER PRIMARY KEY, type TEXT, name TEXT, file_path TEXT, image_path TEXT, created_at INTEGER DEFAULT (strftime('%s', 'now')), updated_at INTEGER);"
-                     "CREATE UNIQUE INDEX rom_id_index ON rom(id);",
-                     NULL, NULL, NULL);
-        sqlite3_exec(game_log_db,
-                     "DROP TABLE IF EXISTS play_activity;"
-                     "CREATE TABLE play_activity(rom_id INTEGER, play_time INTEGER, created_at INTEGER DEFAULT (strftime('%s', 'now')), updated_at INTEGER);"
-                     "CREATE INDEX play_activity_rom_id_index ON play_activity(rom_id);",
-                     NULL, NULL, NULL);
-    }
-
-    return game_log_db;
+	mkdir(GAMETIME_LOG_PATH, 0777);
+	bool db_exists = exists(GAMETIME_LOG_FILE);
+	if (!db_exists)
+		touch(GAMETIME_LOG_FILE);
+
+	sqlite3 *game_log_db = NULL;
+
+	if (sqlite3_open(GAMETIME_LOG_FILE, &game_log_db) != SQLITE_OK) {
+		printf("%s\n", sqlite3_errmsg(game_log_db));
+		play_activity_db_close(game_log_db);
+		return NULL;
+	}
+
+	if (!db_exists) {
+		sqlite3_exec(game_log_db,
+					 "DROP TABLE IF EXISTS rom;"
+					 "CREATE TABLE rom(id INTEGER PRIMARY KEY, type TEXT, name TEXT, file_path TEXT, image_path TEXT, "
+					 "created_at INTEGER DEFAULT (strftime('%s', 'now')), updated_at INTEGER);"
+					 "CREATE UNIQUE INDEX rom_id_index ON rom(id);",
+					 NULL, NULL, NULL);
+		sqlite3_exec(game_log_db,
+					 "DROP TABLE IF EXISTS play_activity;"
+					 "CREATE TABLE play_activity(rom_id INTEGER, play_time INTEGER, created_at INTEGER DEFAULT "
+					 "(strftime('%s', 'now')), updated_at INTEGER);"
+					 "CREATE INDEX play_activity_rom_id_index ON play_activity(rom_id);",
+					 NULL, NULL, NULL);
+	}
+
+	return game_log_db;
 }
 
-void play_activity_db_close(sqlite3* game_log_db)
+void play_activity_db_close(sqlite3 *game_log_db)
 {
-    sqlite3_close(game_log_db);
-    game_log_db = NULL;
+	sqlite3_close(game_log_db);
+	game_log_db = NULL;
 }
 
 void free_play_activities(PlayActivities *pa_ptr)
 {
-    for (int i = 0; i < pa_ptr->count; i++) {
-        free(pa_ptr->play_activity[i]->first_played_at);
-        free(pa_ptr->play_activity[i]->last_played_at);
-        free(pa_ptr->play_activity[i]->rom);
-        free(pa_ptr->play_activity[i]);
-    }
-    free(pa_ptr->play_activity);
-    free(pa_ptr);
+	for (int i = 0; i < pa_ptr->count; i++) {
+		free(pa_ptr->play_activity[i]->first_played_at);
+		free(pa_ptr->play_activity[i]->last_played_at);
+		free(pa_ptr->play_activity[i]->rom);
+		free(pa_ptr->play_activity[i]);
+	}
+	free(pa_ptr->play_activity);
+	free(pa_ptr);
 }
 
 void get_rom_image_path(char *rom_file, char *out_image_path)
 {
-    if (suffixMatch(rom_file, ".p8") || suffixMatch(rom_file, ".png")) {
-        snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s", rom_file);
-    }
-    
-    char *clean_rom_name = removeExtension(baseName(rom_file));
-    // this assumes all media resides in a top-level .media folder
-    //char *rom_folder = strtok(rom_file, "/");
-    //snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s/.media/%s.png", rom_folder, clean_rom_name);
-    // this assumes that roms in subfolders have corresponding game art in
-    // a .media folder in the respective subfolder
-    char rom_folder_path[MAX_PATH];
-    folderPath(rom_file, rom_folder_path);
-
-    snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s/.media/%s.png", rom_folder_path, clean_rom_name);
-    //LOG_debug("out_image_path: %s\n", out_image_path);
-    free(clean_rom_name);
+	if (suffixMatch(rom_file, ".p8") || suffixMatch(rom_file, ".png")) {
+		snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s", rom_file);
+	}
+
+	char *clean_rom_name = removeExtension(baseName(rom_file));
+	// this assumes all media resides in a top-level .media folder
+	// char *rom_folder = strtok(rom_file, "/");
+	// snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s/.media/%s.png", rom_folder, clean_rom_name);
+	// this assumes that roms in subfolders have corresponding game art in
+	// a .media folder in the respective subfolder
+	char rom_folder_path[MAX_PATH];
+	folderPath(rom_file, rom_folder_path);
+
+	snprintf(out_image_path, STR_MAX - 1, ROMS_PATH "/%s/.media/%s.png", rom_folder_path, clean_rom_name);
+	// LOG_debug("out_image_path: %s\n", out_image_path);
+	free(clean_rom_name);
 }
 
-int play_activity_db_transaction(sqlite3* game_log_db, int (*exec_transaction)(sqlite3*))
+int play_activity_db_transaction(sqlite3 *game_log_db, int (*exec_transaction)(sqlite3 *))
 {
-    int retval;
-    retval = exec_transaction(game_log_db);
-    return retval;
+	int retval;
+	retval = exec_transaction(game_log_db);
+	return retval;
 }
 
 int play_activity_db_execute(char *sql)
 {
-    //LOG_info("play_activity_db_execute(%s)\n", sql);
-    sqlite3* game_log_db = play_activity_db_open();
-    int rc = sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
-    play_activity_db_close(game_log_db);
-    return rc;
+	// LOG_info("play_activity_db_execute(%s)\n", sql);
+	sqlite3 *game_log_db = play_activity_db_open();
+	int rc = sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
+	play_activity_db_close(game_log_db);
+	return rc;
 }
 
-sqlite3_stmt *play_activity_db_prepare(sqlite3* game_log_db, char *sql)
+sqlite3_stmt *play_activity_db_prepare(sqlite3 *game_log_db, char *sql)
 {
-    //LOG_info("play_activity_db_prepare(%s)\n", sql);
-    if (game_log_db == NULL) {
-        printf("DB is not open");
-        return NULL;
-    }
-    sqlite3_stmt *stmt = NULL;
-    if (sqlite3_prepare_v2(game_log_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
-        printf("%s: %s\n", sqlite3_errmsg(game_log_db), sqlite3_sql(stmt));
-    }
-    return stmt;
+	// LOG_info("play_activity_db_prepare(%s)\n", sql);
+	if (game_log_db == NULL) {
+		printf("DB is not open");
+		return NULL;
+	}
+	sqlite3_stmt *stmt = NULL;
+	if (sqlite3_prepare_v2(game_log_db, sql, -1, &stmt, NULL) != SQLITE_OK) {
+		printf("%s: %s\n", sqlite3_errmsg(game_log_db), sqlite3_sql(stmt));
+	}
+	return stmt;
 }
 
 int play_activity_get_total_play_time(void)
 {
-    int total_play_time = 0;
-    char *sql =
-        "SELECT SUM(play_time_total) FROM (SELECT SUM(play_time) AS play_time_total FROM play_activity GROUP BY rom_id) "
-        "WHERE play_time_total > 60;";
-    sqlite3_stmt *stmt;
+	int total_play_time = 0;
+	char *sql = "SELECT SUM(play_time_total) FROM (SELECT SUM(play_time) AS play_time_total FROM play_activity GROUP "
+				"BY rom_id) "
+				"WHERE play_time_total > 60;";
+	sqlite3_stmt *stmt;
 
-    sqlite3* game_log_db = play_activity_db_open();
-    stmt = play_activity_db_prepare(game_log_db, sql);
+	sqlite3 *game_log_db = play_activity_db_open();
+	stmt = play_activity_db_prepare(game_log_db, sql);
 
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        total_play_time = sqlite3_column_int(stmt, 0);
-    }
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		total_play_time = sqlite3_column_int(stmt, 0);
+	}
 
-    sqlite3_finalize(stmt);
-    play_activity_db_close(game_log_db);
+	sqlite3_finalize(stmt);
+	play_activity_db_close(game_log_db);
 
-    return total_play_time;
+	return total_play_time;
 }
 
 PlayActivities *play_activity_find_all(void)
 {
-    PlayActivities *play_activities = NULL;
-    char *sql =
-        "SELECT * FROM ("
-        "    SELECT rom.id, rom.type, rom.name, rom.file_path, "
-        "           COUNT(play_activity.ROWID) AS play_count_total, "
-        "           SUM(play_activity.play_time) AS play_time_total, "
-        "           SUM(play_activity.play_time)/COUNT(play_activity.ROWID) AS play_time_average, "
-        "           datetime(MIN(play_activity.created_at), 'unixepoch') AS first_played_at, "
-        "           datetime(MAX(play_activity.created_at), 'unixepoch') AS last_played_at "
-        "    FROM rom LEFT JOIN play_activity ON rom.id = play_activity.rom_id "
-        "    GROUP BY rom.id) "
-        "WHERE play_time_total > 0 "
-        "ORDER BY play_time_total DESC;";
-    sqlite3_stmt *stmt;
-
-    sqlite3* game_log_db = play_activity_db_open();
-
-    stmt = play_activity_db_prepare(game_log_db, sql);
-
-    int play_activity_count = 0;
-    while (sqlite3_step(stmt) == SQLITE_ROW) {
-        play_activity_count++;
-    }
-    sqlite3_reset(stmt);
-
-    play_activities = (PlayActivities *)malloc(sizeof(PlayActivities));
-    play_activities->count = play_activity_count;
-    play_activities->play_time_total = 0;
-    play_activities->play_activity = (PlayActivity **)malloc(sizeof(PlayActivity *) * play_activities->count);
-
-    for (int i = 0; i < play_activities->count; i++) {
-        if (sqlite3_step(stmt) != SQLITE_ROW)
-            break;
-
-        PlayActivity *entry = play_activities->play_activity[i] = (PlayActivity *)malloc(sizeof(PlayActivity));
-        ROM *rom = play_activities->play_activity[i]->rom = (ROM *)malloc(sizeof(ROM));
-        entry->first_played_at = NULL;
-        entry->last_played_at = NULL;
-
-        rom->id = sqlite3_column_int(stmt, 0);
-        rom->type = strdup((const char *)sqlite3_column_text(stmt, 1));
-        rom->name = strdup((const char *)sqlite3_column_text(stmt, 2));
-        if (sqlite3_column_text(stmt, 3) != NULL) {
-            rom->file_path = strdup((const char *)sqlite3_column_text(stmt, 3));
-            rom->image_path = malloc(STR_MAX * sizeof(char));
-            memset(rom->image_path, 0, STR_MAX);
-            get_rom_image_path(rom->file_path, rom->image_path);
-        }
-
-        entry->play_count = sqlite3_column_int(stmt, 4);
-        entry->play_time_total = sqlite3_column_int(stmt, 5);
-        entry->play_time_average = sqlite3_column_int(stmt, 6);
-        if (sqlite3_column_text(stmt, 8) != NULL) {
-            entry->first_played_at = strdup((const char *)sqlite3_column_text(stmt, 7));
-        }
-        if (sqlite3_column_text(stmt, 9) != NULL) {
-            entry->last_played_at = strdup((const char *)sqlite3_column_text(stmt, 8));
-        }
-
-        play_activities->play_time_total += entry->play_time_total;
-    }
-
-    sqlite3_finalize(stmt);
-    play_activity_db_close(game_log_db);
-
-    return play_activities;
+	PlayActivities *play_activities = NULL;
+	char *sql = "SELECT * FROM ("
+				"    SELECT rom.id, rom.type, rom.name, rom.file_path, "
+				"           COUNT(play_activity.ROWID) AS play_count_total, "
+				"           SUM(play_activity.play_time) AS play_time_total, "
+				"           SUM(play_activity.play_time)/COUNT(play_activity.ROWID) AS play_time_average, "
+				"           datetime(MIN(play_activity.created_at), 'unixepoch') AS first_played_at, "
+				"           datetime(MAX(play_activity.created_at), 'unixepoch') AS last_played_at "
+				"    FROM rom LEFT JOIN play_activity ON rom.id = play_activity.rom_id "
+				"    GROUP BY rom.id) "
+				"WHERE play_time_total > 0 "
+				"ORDER BY play_time_total DESC;";
+	sqlite3_stmt *stmt;
+
+	sqlite3 *game_log_db = play_activity_db_open();
+
+	stmt = play_activity_db_prepare(game_log_db, sql);
+
+	int play_activity_count = 0;
+	while (sqlite3_step(stmt) == SQLITE_ROW) {
+		play_activity_count++;
+	}
+	sqlite3_reset(stmt);
+
+	play_activities = (PlayActivities *)malloc(sizeof(PlayActivities));
+	play_activities->count = play_activity_count;
+	play_activities->play_time_total = 0;
+	play_activities->play_activity = (PlayActivity **)malloc(sizeof(PlayActivity *) * play_activities->count);
+
+	for (int i = 0; i < play_activities->count; i++) {
+		if (sqlite3_step(stmt) != SQLITE_ROW)
+			break;
+
+		PlayActivity *entry = play_activities->play_activity[i] = (PlayActivity *)malloc(sizeof(PlayActivity));
+		ROM *rom = play_activities->play_activity[i]->rom = (ROM *)malloc(sizeof(ROM));
+		entry->first_played_at = NULL;
+		entry->last_played_at = NULL;
+
+		rom->id = sqlite3_column_int(stmt, 0);
+		rom->type = strdup((const char *)sqlite3_column_text(stmt, 1));
+		rom->name = strdup((const char *)sqlite3_column_text(stmt, 2));
+		if (sqlite3_column_text(stmt, 3) != NULL) {
+			rom->file_path = strdup((const char *)sqlite3_column_text(stmt, 3));
+			rom->image_path = malloc(STR_MAX * sizeof(char));
+			memset(rom->image_path, 0, STR_MAX);
+			get_rom_image_path(rom->file_path, rom->image_path);
+		}
+
+		entry->play_count = sqlite3_column_int(stmt, 4);
+		entry->play_time_total = sqlite3_column_int(stmt, 5);
+		entry->play_time_average = sqlite3_column_int(stmt, 6);
+		if (sqlite3_column_text(stmt, 8) != NULL) {
+			entry->first_played_at = strdup((const char *)sqlite3_column_text(stmt, 7));
+		}
+		if (sqlite3_column_text(stmt, 9) != NULL) {
+			entry->last_played_at = strdup((const char *)sqlite3_column_text(stmt, 8));
+		}
+
+		play_activities->play_time_total += entry->play_time_total;
+	}
+
+	sqlite3_finalize(stmt);
+	play_activity_db_close(game_log_db);
+
+	return play_activities;
 }
 
 void __ensure_rel_path(char *rel_path, const char *rom_path)
 {
-    if (!pathRelativeTo(rel_path, ROMS_PATH, rom_path)) {
-        if (strstr(rom_path, "../../Roms/") != NULL) {
-            strcpy(rel_path, splitString(strdup((const char *)rom_path), "../../Roms/"));
-        }
-        else {
-            strcpy(rel_path, replaceString2(strdup((const char *)rom_path), ROMS_PATH "/", ""));
-        }
-    }
+	if (!pathRelativeTo(rel_path, ROMS_PATH, rom_path)) {
+		if (strstr(rom_path, "../../Roms/") != NULL) {
+			strcpy(rel_path, splitString(strdup((const char *)rom_path), "../../Roms/"));
+		} else {
+			strcpy(rel_path, replaceString2(strdup((const char *)rom_path), ROMS_PATH "/", ""));
+		}
+	}
 }
 
-int __db_insert_rom(sqlite3* game_log_db, const char *rom_type, const char *rom_name, const char *file_path, const char *image_path)
+int __db_insert_rom(sqlite3 *game_log_db, const char *rom_type, const char *rom_name, const char *file_path,
+					const char *image_path)
 {
-    int rom_id = ROM_NOT_FOUND;
+	int rom_id = ROM_NOT_FOUND;
 
-    char rel_path[MAX_PATH];
-    __ensure_rel_path(rel_path, file_path);
+	char rel_path[MAX_PATH];
+	__ensure_rel_path(rel_path, file_path);
 
-    char *sql = sqlite3_mprintf("INSERT INTO rom(type, name, file_path, image_path) VALUES(%Q, %Q, %Q, %Q);",
-                                rom_type, rom_name, rel_path, image_path);
-    sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
-    sqlite3_free(sql);
+	char *sql = sqlite3_mprintf("INSERT INTO rom(type, name, file_path, image_path) VALUES(%Q, %Q, %Q, %Q);", rom_type,
+								rom_name, rel_path, image_path);
+	sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
+	sqlite3_free(sql);
 
-    sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, "SELECT id FROM rom WHERE ROWID = last_insert_rowid()");
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        rom_id = sqlite3_column_int(stmt, 0);
-    }
-    sqlite3_finalize(stmt);
+	sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, "SELECT id FROM rom WHERE ROWID = last_insert_rowid()");
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		rom_id = sqlite3_column_int(stmt, 0);
+	}
+	sqlite3_finalize(stmt);
 
-    return rom_id;
+	return rom_id;
 }
 
-void __db_update_rom(sqlite3* game_log_db, int rom_id, const char *rom_type, const char *rom_name, const char *file_path, const char *image_path)
+void __db_update_rom(sqlite3 *game_log_db, int rom_id, const char *rom_type, const char *rom_name,
+					 const char *file_path, const char *image_path)
 {
-    char rel_path[MAX_PATH];
-    __ensure_rel_path(rel_path, file_path);
+	char rel_path[MAX_PATH];
+	__ensure_rel_path(rel_path, file_path);
 
-    char *sql = sqlite3_mprintf("UPDATE rom SET type = %Q, name = %Q, file_path = %Q, image_path = %Q WHERE id = %d;",
-                                rom_type, rom_name, rel_path, image_path, rom_id);
-    sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
-    sqlite3_free(sql);
+	char *sql = sqlite3_mprintf("UPDATE rom SET type = %Q, name = %Q, file_path = %Q, image_path = %Q WHERE id = %d;",
+								rom_type, rom_name, rel_path, image_path, rom_id);
+	sqlite3_exec(game_log_db, sql, NULL, NULL, NULL);
+	sqlite3_free(sql);
 }
 
-int __db_get_orphan_rom_id(sqlite3* game_log_db, const char *rom_path)
+int __db_get_orphan_rom_id(sqlite3 *game_log_db, const char *rom_path)
 {
-    int rom_id = ROM_NOT_FOUND;
-    char *_file_name = strdup(rom_path);
-    const char *file_name = baseName(_file_name);
-    char *rom_name = removeExtension(file_name);
+	int rom_id = ROM_NOT_FOUND;
+	char *_file_name = strdup(rom_path);
+	const char *file_name = baseName(_file_name);
+	char *rom_name = removeExtension(file_name);
 
-    char *sql = sqlite3_mprintf("SELECT id FROM rom WHERE (name=%Q OR name=%Q) AND type='ORPHAN' LIMIT 1;", rom_name, file_name);
-    sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
-    sqlite3_free(sql);
-    free(rom_name);
-    free(_file_name);
+	char *sql = sqlite3_mprintf("SELECT id FROM rom WHERE (name=%Q OR name=%Q) AND type='ORPHAN' LIMIT 1;", rom_name,
+								file_name);
+	sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
+	sqlite3_free(sql);
+	free(rom_name);
+	free(_file_name);
 
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        rom_id = sqlite3_column_int(stmt, 0);
-    }
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		rom_id = sqlite3_column_int(stmt, 0);
+	}
 
-    sqlite3_finalize(stmt);
+	sqlite3_finalize(stmt);
 
-    return rom_id;
+	return rom_id;
 }
 
-int __db_get_rom_id_by_path(sqlite3* game_log_db, const char *rom_path)
+int __db_get_rom_id_by_path(sqlite3 *game_log_db, const char *rom_path)
 {
-    int rom_id = ROM_NOT_FOUND;
+	int rom_id = ROM_NOT_FOUND;
 
-    char rel_path[MAX_PATH];
-    __ensure_rel_path(rel_path, rom_path);
+	char rel_path[MAX_PATH];
+	__ensure_rel_path(rel_path, rom_path);
 
-    char *sql = sqlite3_mprintf("SELECT id FROM rom WHERE file_path=%Q LIMIT 1;", rel_path);
-    sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
-    sqlite3_free(sql);
+	char *sql = sqlite3_mprintf("SELECT id FROM rom WHERE file_path=%Q LIMIT 1;", rel_path);
+	sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
+	sqlite3_free(sql);
 
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        rom_id = sqlite3_column_int(stmt, 0);
-    }
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		rom_id = sqlite3_column_int(stmt, 0);
+	}
 
-    sqlite3_finalize(stmt);
+	sqlite3_finalize(stmt);
 
-    return rom_id;
+	return rom_id;
 }
 
-int __db_rom_find_by_file_path(sqlite3* game_log_db, const char *rom_path, bool create_or_update)
+int __db_rom_find_by_file_path(sqlite3 *game_log_db, const char *rom_path, bool create_or_update)
 {
-    //LOG_info("rom_find_by_file_path('%s')\n", rom_path);
-
-    bool update_orphan = false;
-    int rom_id = __db_get_rom_id_by_path(game_log_db, rom_path);
-
-    if (rom_id == ROM_NOT_FOUND) {
-        rom_id = __db_get_orphan_rom_id(game_log_db, rom_path);
-        if (rom_id != ROM_NOT_FOUND) {
-            update_orphan = true;
-        }
-    }
-
-    if (update_orphan) {
-        char *rom_name = removeExtension(baseName(rom_path));
-        __db_update_rom(game_log_db, rom_id, "", rom_name, rom_path, "");
-        free(rom_name);
-    }
-    else if (rom_id == ROM_NOT_FOUND && create_or_update) {
-        char *rom_name = removeExtension(baseName(rom_path));
-        rom_id = __db_insert_rom(game_log_db, "", rom_name, rom_path, "");
-        free(rom_name);
-    }
-
-    return rom_id;
+	// LOG_info("rom_find_by_file_path('%s')\n", rom_path);
+
+	bool update_orphan = false;
+	int rom_id = __db_get_rom_id_by_path(game_log_db, rom_path);
+
+	if (rom_id == ROM_NOT_FOUND) {
+		rom_id = __db_get_orphan_rom_id(game_log_db, rom_path);
+		if (rom_id != ROM_NOT_FOUND) {
+			update_orphan = true;
+		}
+	}
+
+	if (update_orphan) {
+		char *rom_name = removeExtension(baseName(rom_path));
+		__db_update_rom(game_log_db, rom_id, "", rom_name, rom_path, "");
+		free(rom_name);
+	} else if (rom_id == ROM_NOT_FOUND && create_or_update) {
+		char *rom_name = removeExtension(baseName(rom_path));
+		rom_id = __db_insert_rom(game_log_db, "", rom_name, rom_path, "");
+		free(rom_name);
+	}
+
+	return rom_id;
 }
 
 int play_activity_transaction_rom_find_by_file_path(const char *rom_path, bool create_or_update)
 {
-    int retval;
-    sqlite3* game_log_db = play_activity_db_open();
-    retval = __db_rom_find_by_file_path(game_log_db, rom_path, create_or_update);
-    play_activity_db_close(game_log_db);
-    return retval;
+	int retval;
+	sqlite3 *game_log_db = play_activity_db_open();
+	retval = __db_rom_find_by_file_path(game_log_db, rom_path, create_or_update);
+	play_activity_db_close(game_log_db);
+	return retval;
 }
 
 int play_activity_get_play_time(const char *rom_path)
 {
-    int play_time = 0;
-    sqlite3* game_log_db = play_activity_db_open();
-    int rom_id = __db_rom_find_by_file_path(game_log_db, rom_path, false);
-    if (rom_id != ROM_NOT_FOUND) {
-        char *sql = sqlite3_mprintf("SELECT SUM(play_time) FROM play_activity WHERE rom_id = %d;", rom_id);
-        sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
-        sqlite3_free(sql);
-        if (sqlite3_step(stmt) == SQLITE_ROW) {
-            play_time = sqlite3_column_int(stmt, 0);
-        }
-        sqlite3_finalize(stmt);
-    }
-    play_activity_db_close(game_log_db);
-    return play_time;
+	int play_time = 0;
+	sqlite3 *game_log_db = play_activity_db_open();
+	int rom_id = __db_rom_find_by_file_path(game_log_db, rom_path, false);
+	if (rom_id != ROM_NOT_FOUND) {
+		char *sql = sqlite3_mprintf("SELECT SUM(play_time) FROM play_activity WHERE rom_id = %d;", rom_id);
+		sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
+		sqlite3_free(sql);
+		if (sqlite3_step(stmt) == SQLITE_ROW) {
+			play_time = sqlite3_column_int(stmt, 0);
+		}
+		sqlite3_finalize(stmt);
+	}
+	play_activity_db_close(game_log_db);
+	return play_time;
 }
 
 bool _get_active_rom_path(char *rom_path_out)
 {
-    char *ptr;
-    char cmd[STR_MAX];
-    getFile(CMD_TO_RUN, cmd, STR_MAX);
-    trimTrailingNewlines(cmd);
-
-    if (strlen(cmd) == 0) {
-        return false;
-    }
-
-    if ((ptr = strrchr(cmd, '\'')) != NULL) {
-        *ptr = '\0';
-    }
-
-    if ((ptr = strrchr(cmd, '\'')) != NULL) {
-        strncpy(rom_path_out, ptr + 1, STR_MAX);
-        return true;
-    }
-    return false;
+	char *ptr;
+	char cmd[STR_MAX];
+	getFile(CMD_TO_RUN, cmd, STR_MAX);
+	trimTrailingNewlines(cmd);
+
+	if (strlen(cmd) == 0) {
+		return false;
+	}
+
+	if ((ptr = strrchr(cmd, '\'')) != NULL) {
+		*ptr = '\0';
+	}
+
+	if ((ptr = strrchr(cmd, '\'')) != NULL) {
+		strncpy(rom_path_out, ptr + 1, STR_MAX);
+		return true;
+	}
+	return false;
 }
 
-int __db_get_active_closed_activity(sqlite3* game_log_db)
+int __db_get_active_closed_activity(sqlite3 *game_log_db)
 {
-    int rom_id = ROM_NOT_FOUND;
+	int rom_id = ROM_NOT_FOUND;
 
-    char rom_path[STR_MAX];
-    if (!_get_active_rom_path(rom_path)) {
-        return ROM_NOT_FOUND;
-    }
+	char rom_path[STR_MAX];
+	if (!_get_active_rom_path(rom_path)) {
+		return ROM_NOT_FOUND;
+	}
 
-    //printf("Last closed active rom: %s\n", rom_path);
+	// printf("Last closed active rom: %s\n", rom_path);
 
-    if ((rom_id = __db_rom_find_by_file_path(game_log_db, rom_path, false)) == ROM_NOT_FOUND) {
-        return ROM_NOT_FOUND;
-    }
+	if ((rom_id = __db_rom_find_by_file_path(game_log_db, rom_path, false)) == ROM_NOT_FOUND) {
+		return ROM_NOT_FOUND;
+	}
 
-    char *sql = sqlite3_mprintf("SELECT * FROM play_activity WHERE rom_id = %d AND play_time IS NULL;", rom_id);
-    sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
+	char *sql = sqlite3_mprintf("SELECT * FROM play_activity WHERE rom_id = %d AND play_time IS NULL;", rom_id);
+	sqlite3_stmt *stmt = play_activity_db_prepare(game_log_db, sql);
 
-    if (sqlite3_step(stmt) == SQLITE_ROW) {
-        // Activity is not closed
-        rom_id = ROM_NOT_FOUND;
-    }
+	if (sqlite3_step(stmt) == SQLITE_ROW) {
+		// Activity is not closed
+		rom_id = ROM_NOT_FOUND;
+	}
 
-    sqlite3_free(sql);
-    sqlite3_finalize(stmt);
+	sqlite3_free(sql);
+	sqlite3_finalize(stmt);
 
-    return rom_id;
+	return rom_id;
 }
 
 void play_activity_start(char *rom_file_path)
 {
-    //LOG_info("\n:: play_activity_start(%s)\n", rom_file_path);
-    int rom_id = play_activity_transaction_rom_find_by_file_path(rom_file_path, true);
-    if (rom_id == ROM_NOT_FOUND) {
-        exit(1);
-    }
-    char *sql = sqlite3_mprintf("INSERT INTO play_activity(rom_id) VALUES(%d);", rom_id);
-    play_activity_db_execute(sql);
-    sqlite3_free(sql);
+	// LOG_info("\n:: play_activity_start(%s)\n", rom_file_path);
+	int rom_id = play_activity_transaction_rom_find_by_file_path(rom_file_path, true);
+	if (rom_id == ROM_NOT_FOUND) {
+		exit(1);
+	}
+	char *sql = sqlite3_mprintf("INSERT INTO play_activity(rom_id) VALUES(%d);", rom_id);
+	play_activity_db_execute(sql);
+	sqlite3_free(sql);
 }
 
 void play_activity_resume(void)
 {
-    //LOG_info("\n:: play_activity_resume()");
-    sqlite3* game_log_db = play_activity_db_open();
-    int rom_id = play_activity_db_transaction(game_log_db, __db_get_active_closed_activity);
-    play_activity_db_close(game_log_db);
-    if (rom_id == ROM_NOT_FOUND) {
-        printf("Error: no active rom\n");
-        exit(1);
-    }
-    char *sql = sqlite3_mprintf("INSERT INTO play_activity(rom_id) VALUES(%d);", rom_id);
-    play_activity_db_execute(sql);
-    sqlite3_free(sql);
+	// LOG_info("\n:: play_activity_resume()");
+	sqlite3 *game_log_db = play_activity_db_open();
+	int rom_id = play_activity_db_transaction(game_log_db, __db_get_active_closed_activity);
+	play_activity_db_close(game_log_db);
+	if (rom_id == ROM_NOT_FOUND) {
+		printf("Error: no active rom\n");
+		exit(1);
+	}
+	char *sql = sqlite3_mprintf("INSERT INTO play_activity(rom_id) VALUES(%d);", rom_id);
+	play_activity_db_execute(sql);
+	sqlite3_free(sql);
 }
 
 void play_activity_stop(char *rom_file_path)
 {
-    //LOG_info("\n:: play_activity_stop(%s)\n", rom_file_path);
-    int rom_id = play_activity_transaction_rom_find_by_file_path(rom_file_path, false);
-    if (rom_id == ROM_NOT_FOUND) {
-        exit(1);
-    }
-    char *sql = sqlite3_mprintf("UPDATE play_activity SET play_time = (strftime('%%s', 'now')) - created_at, updated_at = (strftime('%%s', 'now')) WHERE rom_id = %d AND play_time IS NULL;", rom_id);
-    play_activity_db_execute(sql);
-    sqlite3_free(sql);
+	// LOG_info("\n:: play_activity_stop(%s)\n", rom_file_path);
+	int rom_id = play_activity_transaction_rom_find_by_file_path(rom_file_path, false);
+	if (rom_id == ROM_NOT_FOUND) {
+		exit(1);
+	}
+	char *sql = sqlite3_mprintf("UPDATE play_activity SET play_time = (strftime('%%s', 'now')) - created_at, "
+								"updated_at = (strftime('%%s', 'now')) WHERE rom_id = %d AND play_time IS NULL;",
+								rom_id);
+	play_activity_db_execute(sql);
+	sqlite3_free(sql);
 }
 
 void play_activity_stop_all(void)
 {
-    //LOG_info("\n:: play_activity_stop_all()");
-    play_activity_db_execute(
-        "UPDATE play_activity SET play_time = (strftime('%s', 'now')) - created_at, updated_at = (strftime('%s', 'now')) WHERE play_time IS NULL;"
-        "DELETE FROM play_activity WHERE play_time < 0;");
+	// LOG_info("\n:: play_activity_stop_all()");
+	play_activity_db_execute("UPDATE play_activity SET play_time = (strftime('%s', 'now')) - created_at, updated_at = "
+							 "(strftime('%s', 'now')) WHERE play_time IS NULL;"
+							 "DELETE FROM play_activity WHERE play_time < 0;");
 }
 
 void play_activity_list_all(void)
 {
-    //LOG_info("\n:: play_activity_list_all()");
-    int total_play_time = play_activity_get_total_play_time();
-    PlayActivities *pas = play_activity_find_all();
-
-    printf("\n");
-
-    for (int i = 0; i < pas->count; i++) {
-        PlayActivity *entry = pas->play_activity[i];
-        ROM *rom = entry->rom;
-        char rom_name[STR_MAX];
-        cleanName(rom_name, rom->name);
-        char play_time[STR_MAX];
-        serializeTime(play_time, entry->play_time_total);
-        printf("%03d: %s (%s) [%s]\n", i + 1, rom_name, play_time, rom->type);
-    }
-
-    char total_str[25];
-    serializeTime(total_str, total_play_time);
-    printf("\nTotal: %s\n", total_str);
-
-    free_play_activities(pas);
+	// LOG_info("\n:: play_activity_list_all()");
+	int total_play_time = play_activity_get_total_play_time();
+	PlayActivities *pas = play_activity_find_all();
+
+	printf("\n");
+
+	for (int i = 0; i < pas->count; i++) {
+		PlayActivity *entry = pas->play_activity[i];
+		ROM *rom = entry->rom;
+		char rom_name[STR_MAX];
+		cleanName(rom_name, rom->name);
+		char play_time[STR_MAX];
+		serializeTime(play_time, entry->play_time_total);
+		printf("%03d: %s (%s) [%s]\n", i + 1, rom_name, play_time, rom->type);
+	}
+
+	char total_str[25];
+	serializeTime(total_str, total_play_time);
+	printf("\nTotal: %s\n", total_str);
+
+	free_play_activities(pas);
 }
\ No newline at end of file
diff --git a/workspace/all/libgametimedb/gametimedb.h b/workspace/all/libgametimedb/gametimedb.h
index 4c0e4eb1d..be626a37c 100644
--- a/workspace/all/libgametimedb/gametimedb.h
+++ b/workspace/all/libgametimedb/gametimedb.h
@@ -7,33 +7,33 @@ typedef struct PlayActivity PlayActivity;
 typedef struct PlayActivities PlayActivities;
 
 struct ROM {
-    int id;
-    char *type;
-    char *name;
-    char *file_path;
-    char *image_path;
+	int id;
+	char *type;
+	char *name;
+	char *file_path;
+	char *image_path;
 };
 struct PlayActivity {
-    ROM *rom;
-    int play_count;
-    int play_time_total;
-    int play_time_average;
-    char *first_played_at;
-    char *last_played_at;
+	ROM *rom;
+	int play_count;
+	int play_time_total;
+	int play_time_average;
+	char *first_played_at;
+	char *last_played_at;
 };
 struct PlayActivities {
-    PlayActivity **play_activity;
-    int count;
-    int play_time_total;
+	PlayActivity **play_activity;
+	int count;
+	int play_time_total;
 };
 
-sqlite3* play_activity_db_open(void);
-void play_activity_db_close(sqlite3* ctx);
+sqlite3 *play_activity_db_open(void);
+void play_activity_db_close(sqlite3 *ctx);
 void free_play_activities(PlayActivities *pa_ptr);
 
 // Main interface functions for read access
 PlayActivities *play_activity_find_all(void);
-//int play_activity_get_play_time(const char *rom_path);
+// int play_activity_get_play_time(const char *rom_path);
 
 // Main interface functions for write access
 void play_activity_start(char *rom_file_path);
diff --git a/workspace/all/minarch/minarch.c b/workspace/all/minarch/minarch.c
index f1a63884c..72710c56c 100644
--- a/workspace/all/minarch/minarch.c
+++ b/workspace/all/minarch/minarch.c
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <zip.h> 
+#include <zip.h>
 #include <pthread.h>
 #include <glob.h>
 
@@ -31,7 +31,7 @@
 
 ///////////////////////////////////////
 
-static SDL_Surface* screen;
+static SDL_Surface *screen;
 static int quit = 0;
 static int newScreenshot = 0;
 static int show_menu = 0;
@@ -40,9 +40,9 @@ static int was_threaded = 0;
 static int should_run_core = 1; // used by threaded video
 enum retro_pixel_format fmt;
 
-static pthread_t		core_pt;
-static pthread_mutex_t	core_mx;
-static pthread_cond_t	core_rq; // not sure this is required
+static pthread_t core_pt;
+static pthread_mutex_t core_mx;
+static pthread_cond_t core_rq; // not sure this is required
 
 
 enum {
@@ -62,7 +62,7 @@ static int screen_sharpness = SHARPNESS_SOFT;
 static int screen_effect = EFFECT_NONE;
 static int screenx = 64;
 static int screeny = 64;
-static int overlay = 0; 
+static int overlay = 0;
 static int prevent_tearing = 1; // lenient
 static int use_core_fps = 0;
 static int sync_ref = 0;
@@ -73,11 +73,11 @@ static int fast_forward = 0;
 static int overclock = 3; // auto
 static int has_custom_controllers = 0;
 static int gamepad_type = 0; // index in gamepad_labels/gamepad_values
-static int downsample = 0; // set to 1 to convert from 8888 to 565
+static int downsample = 0;	 // set to 1 to convert from 8888 to 565
 // these are no longer constants as of the RG CubeXX (even though they look like it)
-static int DEVICE_WIDTH = 0; // FIXED_WIDTH;
+static int DEVICE_WIDTH = 0;  // FIXED_WIDTH;
 static int DEVICE_HEIGHT = 0; // FIXED_HEIGHT;
-static int DEVICE_PITCH = 0; // FIXED_PITCH;
+static int DEVICE_PITCH = 0;  // FIXED_PITCH;
 
 GFX_Renderer renderer;
 
@@ -86,70 +86,71 @@ GFX_Renderer renderer;
 static struct Core {
 	int initialized;
 	int need_fullpath;
-	
-	const char tag[8]; // eg. GBC
-	const char name[128]; // eg. gambatte
-	const char version[128]; // eg. Gambatte (v0.5.0-netlink 7e02df6)
+
+	const char tag[8];			// eg. GBC
+	const char name[128];		// eg. gambatte
+	const char version[128];	// eg. Gambatte (v0.5.0-netlink 7e02df6)
 	const char extensions[128]; // eg. gb|gbc|dmg
-	
-	const char config_dir[MAX_PATH]; // eg. /mnt/sdcard/.userdata/rg35xx/GB-gambatte
-	const char states_dir[MAX_PATH]; // eg. /mnt/sdcard/.userdata/arm-480/GB-gambatte
-	const char saves_dir[MAX_PATH]; // eg. /mnt/sdcard/Saves/GB
-	const char bios_dir[MAX_PATH]; // eg. /mnt/sdcard/Bios/GB
-	const char cheats_dir[MAX_PATH]; // eg. /mnt/sdcard/Cheats/GB
+
+	const char config_dir[MAX_PATH];   // eg. /mnt/sdcard/.userdata/rg35xx/GB-gambatte
+	const char states_dir[MAX_PATH];   // eg. /mnt/sdcard/.userdata/arm-480/GB-gambatte
+	const char saves_dir[MAX_PATH];	   // eg. /mnt/sdcard/Saves/GB
+	const char bios_dir[MAX_PATH];	   // eg. /mnt/sdcard/Bios/GB
+	const char cheats_dir[MAX_PATH];   // eg. /mnt/sdcard/Cheats/GB
 	const char overlays_dir[MAX_PATH]; // eg. /mnt/sdcard/Cheats/GB
-	
+
 	double fps;
 	double sample_rate;
 	double aspect_ratio;
 
-	void* handle;
+	void *handle;
 	void (*init)(void);
 	void (*deinit)(void);
-	
+
 	void (*get_system_info)(struct retro_system_info *info);
 	void (*get_system_av_info)(struct retro_system_av_info *info);
 	void (*set_controller_port_device)(unsigned port, unsigned device);
-	
+
 	void (*reset)(void);
 	void (*run)(void);
 	size_t (*serialize_size)(void);
 	bool (*serialize)(void *data, size_t size);
 	bool (*unserialize)(const void *data, size_t size);
 	void (*cheat_reset)(void);
-	void (*cheat_set)(unsigned id, bool enabled, const char*);
+	void (*cheat_set)(unsigned id, bool enabled, const char *);
 	bool (*load_game)(const struct retro_game_info *game);
 	bool (*load_game_special)(unsigned game_type, const struct retro_game_info *info, size_t num_info);
 	void (*unload_game)(void);
 	unsigned (*get_region)(void);
 	void *(*get_memory_data)(unsigned id);
 	size_t (*get_memory_size)(unsigned id);
-	
+
 	retro_core_options_update_display_callback_t update_visibility_callback;
 	// retro_audio_buffer_status_callback_t audio_buffer_status;
 } core;
 
-int extract_zip(char** extensions);
-static bool getAlias(char* path, char* alias);
+int extract_zip(char **extensions);
+static bool getAlias(char *path, char *alias);
 
 static struct Game {
 	char path[MAX_PATH];
-	char name[MAX_PATH]; // TODO: rename to basename?
+	char name[MAX_PATH];	 // TODO: rename to basename?
 	char alt_name[MAX_PATH]; // alternate name, eg. unzipped rom file name
 	char m3u_path[MAX_PATH];
 	char tmp_path[MAX_PATH]; // location of unzipped file
-	void* data;
+	void *data;
 	size_t size;
 	int is_open;
 } game;
-static void Game_open(char* path) {
+static void Game_open(char *path)
+{
 	LOG_info("Game_open\n");
 	int skipzip = 0;
 	memset(&game, 0, sizeof(game));
-	
-	strcpy((char*)game.path, path);
-	strcpy((char*)game.name, strrchr(path, '/')+1);
-	strcpy((char*)game.alt_name, game.name); // default it
+
+	strcpy((char *)game.path, path);
+	strcpy((char *)game.name, strrchr(path, '/') + 1);
+	strcpy((char *)game.alt_name, game.name); // default it
 
 	// check first if the rom already is alive in tmp folder if so skip unzipping shit
 	char tmpfldr[255];
@@ -157,26 +158,26 @@ static void Game_open(char* path) {
 	char *tmppath = PLAT_findFileInDir(tmpfldr, game.name);
 	if (tmppath) {
 		printf("File exists skipping unzipping and setting game.tmp_path: %s\n", tmppath);
-		strcpy((char*)game.tmp_path, tmppath);
+		strcpy((char *)game.tmp_path, tmppath);
 		skipzip = 1;
 		free(tmppath);
 		// Update the game name to the extracted file name instead of the zip name
 		if (CFG_getUseExtractedFileName())
-			strcpy((char*)game.alt_name, strrchr(game.tmp_path, '/')+1);
+			strcpy((char *)game.alt_name, strrchr(game.tmp_path, '/') + 1);
 	} else {
-		printf("File does not exist in %s\n",tmpfldr);
+		printf("File does not exist in %s\n", tmpfldr);
 	}
-		
+
 	// if we have a zip file
 	if (suffixMatch(".zip", game.path) && !skipzip) {
 		LOG_info("is zip file\n");
 		int supports_zip = 0;
 		int i = 0;
-		char* ext;
+		char *ext;
 		char exts[128];
-		char* extensions[32];
-		strcpy(exts,core.extensions);
-		while ((ext=strtok(i?NULL:exts,"|"))) {
+		char *extensions[32];
+		strcpy(exts, core.extensions);
+		while ((ext = strtok(i ? NULL : exts, "|"))) {
 			extensions[i++] = ext;
 			if (!strcmp("zip", ext)) {
 				supports_zip = 1;
@@ -184,51 +185,50 @@ static void Game_open(char* path) {
 			}
 		}
 		extensions[i] = NULL;
-	
+
 		// if the core doesn't support zip files natively
 		if (!supports_zip) {
 			// extract zip file located at game.path to game.tmp_path
 			// game.tmp_path is temp dir generated by mkdtemp
 			LOG_info("Extracting zip file manually: %s\n", game.path);
-			if(!extract_zip(extensions))
+			if (!extract_zip(extensions))
 				return;
 			// Update the game name to the extracted file name instead of the zip name
 			if (CFG_getUseExtractedFileName())
-				strcpy((char*)game.alt_name, strrchr(game.tmp_path, '/')+1);
-		}
-		else {
+				strcpy((char *)game.alt_name, strrchr(game.tmp_path, '/') + 1);
+		} else {
 			LOG_info("Core can handle zip file: %s\n", game.path);
 		}
 	}
-		
+
 	// some cores handle opening files themselves, eg. pcsx_rearmed
 	// if the frontend tries to load a 500MB file itself bad things happen
 	if (!core.need_fullpath) {
-		path = game.tmp_path[0]=='\0'?game.path:game.tmp_path;
+		path = game.tmp_path[0] == '\0' ? game.path : game.tmp_path;
 
 		FILE *file = fopen(path, "r");
-		if (file==NULL) {
+		if (file == NULL) {
 			LOG_error("Error opening game: %s\n\t%s\n", path, strerror(errno));
 			return;
 		}
-	
+
 		fseek(file, 0, SEEK_END);
 		game.size = ftell(file);
-	
+
 		rewind(file);
 		game.data = malloc(game.size);
-		if (game.data==NULL) {
+		if (game.data == NULL) {
 			LOG_error("Couldn't allocate memory for file: %s\n", path);
 			return;
 		}
-	
+
 		fread(game.data, sizeof(uint8_t), game.size, file);
-	
+
 		fclose(file);
 	}
-	
+
 	// m3u-based?
-	char* tmp;
+	char *tmp;
 	char m3u_path[256];
 	char base_path[256];
 	char dir_name[256];
@@ -236,31 +236,33 @@ static void Game_open(char* path) {
 	strcpy(m3u_path, game.path);
 	tmp = strrchr(m3u_path, '/') + 1;
 	tmp[0] = '\0';
-	
+
 	strcpy(base_path, m3u_path);
-	
+
 	tmp = strrchr(m3u_path, '/');
 	tmp[0] = '\0';
 
 	tmp = strrchr(m3u_path, '/');
 	strcpy(dir_name, tmp);
-	
-	tmp = m3u_path + strlen(m3u_path); 
+
+	tmp = m3u_path + strlen(m3u_path);
 	strcpy(tmp, dir_name);
-	
+
 	tmp = m3u_path + strlen(m3u_path);
 	strcpy(tmp, ".m3u");
-	
+
 	if (exists(m3u_path)) {
 		strcpy(game.m3u_path, m3u_path);
-		strcpy((char*)game.name, strrchr(m3u_path, '/')+1);
-		strcpy((char*)game.alt_name, game.name); // default it
+		strcpy((char *)game.name, strrchr(m3u_path, '/') + 1);
+		strcpy((char *)game.alt_name, game.name); // default it
 	}
-	
+
 	game.is_open = 1;
 }
-static void Game_close(void) {
-	if (game.data) free(game.data);
+static void Game_close(void)
+{
+	if (game.data)
+		free(game.data);
 	// why delete tempfile? keep it for next time when loading the game its much faster from /tmp ram folder
 	// if (game.tmp_path[0]) remove(game.tmp_path);
 	game.is_open = 0;
@@ -268,23 +270,24 @@ static void Game_close(void) {
 }
 
 static struct retro_disk_control_ext_callback disk_control_ext;
-static void Game_changeDisc(char* path) {
-	
-	if (exactMatch(game.path, path) || !exists(path)) return;
-	
+static void Game_changeDisc(char *path)
+{
+	if (exactMatch(game.path, path) || !exists(path))
+		return;
+
 	Game_close();
 	Game_open(path);
-	
+
 	struct retro_game_info game_info = {};
 	game_info.path = game.path;
 	game_info.data = game.data;
 	game_info.size = game.size;
-	
+
 	disk_control_ext.replace_image_index(0, &game_info);
 	putFile(CHANGE_DISC_PATH, path); // NextUI still needs to know this to update recents.txt
 }
 
-int extract_zip(char** extensions)
+int extract_zip(char **extensions)
 {
 	char buf[100];
 	struct zip *za;
@@ -298,11 +301,11 @@ int extract_zip(char** extensions)
 
 	// char tmp_template[MAX_PATH];
 	// strcpy(tmp_template, "/tmp/minarch-XXXXXX");
-	
-	mkdir("/tmp/nextarch",0777);
+
+	mkdir("/tmp/nextarch", 0777);
 	char tmp_dirname[255];
-	snprintf(tmp_dirname, sizeof(tmp_dirname), "%s/%s", "/tmp/nextarch",core.tag);
-	mkdir(tmp_dirname,0777);
+	snprintf(tmp_dirname, sizeof(tmp_dirname), "%s/%s", "/tmp/nextarch", core.tag);
+	mkdir(tmp_dirname, 0777);
 
 	int i, len;
 	int fd;
@@ -312,43 +315,44 @@ int extract_zip(char** extensions)
 	for (i = 0; i < zip_get_num_entries(za, 0); i++) {
 		if (zip_stat_index(za, i, 0, &sb) == 0) {
 			len = strlen(sb.name);
-			//LOG_info("Name: [%s], ", sb.name);
-			//LOG_info("Size: [%llu], ", sb.size);
-			//LOG_info("mtime: [%u]\n", (unsigned int)sb.mtime);
+			// LOG_info("Name: [%s], ", sb.name);
+			// LOG_info("Size: [%llu], ", sb.size);
+			// LOG_info("mtime: [%u]\n", (unsigned int)sb.mtime);
 			if (sb.name[len - 1] == '/') {
-				sprintf(game.tmp_path, "%s/%s", tmp_dirname, basename((char*)sb.name));
+				sprintf(game.tmp_path, "%s/%s", tmp_dirname, basename((char *)sb.name));
 			} else {
 				int found = 0;
 				char extension[8];
-				for (int e=0; extensions[e]; e++) {
+				for (int e = 0; extensions[e]; e++) {
 					sprintf(extension, ".%s", extensions[e]);
 					if (suffixMatch(extension, sb.name)) {
 						found = 1;
 						break;
 					}
 				}
-				if (!found) continue;
+				if (!found)
+					continue;
 
 				zf = zip_fopen_index(za, i, 0);
 				if (!zf) {
-					LOG_error( "zip_fopen_index failed\n");
+					LOG_error("zip_fopen_index failed\n");
 					return 0;
 				}
 
-				sprintf(game.tmp_path, "%s/%s", tmp_dirname, basename((char*)sb.name));
+				sprintf(game.tmp_path, "%s/%s", tmp_dirname, basename((char *)sb.name));
 				fd = open(game.tmp_path, O_RDWR | O_TRUNC | O_CREAT, 0644);
 				if (fd < 0) {
-					LOG_error( "open failed\n");
+					LOG_error("open failed\n");
 					zip_fclose(zf);
 					return 0;
 				}
-				//LOG_info("Writing: %s\n", game.tmp_path);
+				// LOG_info("Writing: %s\n", game.tmp_path);
 
 				sum = 0;
 				while (sum != sb.size) {
 					len = zip_fread(zf, buf, 100);
 					if (len < 0) {
-						LOG_error( "zip_fread failed\n");
+						LOG_error("zip_fread failed\n");
 						close(fd);
 						zip_fclose(zf);
 						return 0;
@@ -362,7 +366,7 @@ int extract_zip(char** extensions)
 			}
 		}
 	}
-	
+
 	if (zip_close(za) == -1) {
 		LOG_error("can't close zip archive `%s'\n", game.path);
 		return 0;
@@ -391,30 +395,33 @@ static struct Cheats {
 #define CHEAT_MAX_LINE_LEN 52
 #define CHEAT_MAX_LINES 3
 
-static size_t parse_count(FILE *file) {
+static size_t parse_count(FILE *file)
+{
 	size_t count = 0;
 	fscanf(file, " cheats = %lu\n", (unsigned long *)&count);
 	return count;
 }
 
-static const char *find_val(const char *start) {
+static const char *find_val(const char *start)
+{
 	start--;
-	while(!isspace(*++start))
+	while (!isspace(*++start))
 		;
 
-	while(isspace(*++start))
+	while (isspace(*++start))
 		;
 
 	if (*start != '=')
 		return NULL;
 
-	while(isspace(*++start))
+	while (isspace(*++start))
 		;
 
 	return start;
 }
 
-static int parse_bool(const char *ptr, int *out) {
+static int parse_bool(const char *ptr, int *out)
+{
 	if (!strncasecmp(ptr, "true", 4)) {
 		*out = 1;
 	} else if (!strncasecmp(ptr, "false", 5)) {
@@ -425,7 +432,8 @@ static int parse_bool(const char *ptr, int *out) {
 	return 0;
 }
 
-static int parse_string(const char *ptr, char *buf, size_t len) {
+static int parse_string(const char *ptr, char *buf, size_t len)
+{
 	int index = 0;
 	size_t input_len = strlen(ptr);
 
@@ -455,7 +463,8 @@ static int parse_string(const char *ptr, char *buf, size_t len) {
 	return 0;
 }
 
-static int parse_cheats(struct Cheats *cheats, FILE *file) {
+static int parse_cheats(struct Cheats *cheats, FILE *file)
+{
 	int ret = -1;
 	char line[512];
 	char buf[512];
@@ -493,7 +502,7 @@ static int parse_cheats(struct Cheats *cheats, FILE *file) {
 				if (len == 0)
 					continue;
 
-				cheat->name = calloc(len+1, sizeof(char));
+				cheat->name = calloc(len + 1, sizeof(char));
 				if (!cheat->name)
 					goto finish;
 
@@ -501,7 +510,7 @@ static int parse_cheats(struct Cheats *cheats, FILE *file) {
 				truncateString((char *)cheat->name, CHEAT_MAX_DESC_LEN);
 
 				if (len >= CHEAT_MAX_DESC_LEN) {
-					cheat->info = calloc(len+1, sizeof(char));
+					cheat->info = calloc(len + 1, sizeof(char));
 					if (!cheat->info)
 						goto finish;
 
@@ -519,7 +528,7 @@ static int parse_cheats(struct Cheats *cheats, FILE *file) {
 				if (len == 0)
 					continue;
 
-				cheat->code = calloc(len+1, sizeof(char));
+				cheat->code = calloc(len + 1, sizeof(char));
 				if (!cheat->code)
 					goto finish;
 
@@ -532,7 +541,7 @@ static int parse_cheats(struct Cheats *cheats, FILE *file) {
 				}
 			}
 		}
-	} while(1);
+	} while (1);
 
 finish:
 	return ret;
@@ -541,26 +550,30 @@ static int parse_cheats(struct Cheats *cheats, FILE *file) {
 // return variations with/without extensions and other cruft
 #define CHEAT_MAX_PATHS 16
 #define CHEAT_MAX_LIST_LENGTH (CHEAT_MAX_PATHS * MAX_PATH)
-static void Cheat_getPaths(char paths[CHEAT_MAX_PATHS][MAX_PATH], int* count) {
+static void Cheat_getPaths(char paths[CHEAT_MAX_PATHS][MAX_PATH], int *count)
+{
 	// Generate possible paths, ordered by most likely to be used (pre v6.2.3 style first)
-	sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir, game.name); // /mnt/SDCARD/Cheats/GB/Super Example World.<ext>.cht
-	if(CFG_getUseExtractedFileName())
-		sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir, game.alt_name); // /mnt/SDCARD/Cheats/GB/Super Example World (USA).<ext>.cht
+	sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir,
+			game.name); // /mnt/SDCARD/Cheats/GB/Super Example World.<ext>.cht
+	if (CFG_getUseExtractedFileName())
+		sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir,
+				game.alt_name); // /mnt/SDCARD/Cheats/GB/Super Example World (USA).<ext>.cht
 
 	// game.alt_name, but with all extension-like stuff removed (apart from .cht)
 	// eg. Super Example World (USA).zip -> Super Example World (USA).cht
 	{
 		int i = 0;
-		char* ext;
+		char *ext;
 		char exts[128];
-		strcpy(exts,core.extensions);
-		while ((ext=strtok(i?NULL:exts,"|"))) {
+		strcpy(exts, core.extensions);
+		while ((ext = strtok(i ? NULL : exts, "|"))) {
 			char rom_name[MAX_PATH];
 			strcpy(rom_name, game.alt_name);
-			char* tmp = strrchr(rom_name, '.');
+			char *tmp = strrchr(rom_name, '.');
 			if (tmp != NULL && strlen(tmp) > 2 && strlen(tmp) <= 5) {
 				tmp[0] = '\0';
-				sprintf(paths[(*count)++], "%s/%s.%s.cht", core.cheats_dir, rom_name, ext); // /mnt/SDCARD/Cheats/GB/Super Example World (USA).foo.cht
+				sprintf(paths[(*count)++], "%s/%s.%s.cht", core.cheats_dir, rom_name,
+						ext); // /mnt/SDCARD/Cheats/GB/Super Example World (USA).foo.cht
 			}
 			i++;
 		}
@@ -576,28 +589,32 @@ static void Cheat_getPaths(char paths[CHEAT_MAX_PATHS][MAX_PATH], int* count) {
 
 	// Respect map.txt: use alias if available
 	// eg. 1941.zip	-> 1941: Counter Attack
-	if(getAlias(game.path, rom_name))
-		sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir, rom_name); // /mnt/SDCARD/Cheats/GB/Super Example World.cht
+	if (getAlias(game.path, rom_name))
+		sprintf(paths[(*count)++], "%s/%s.cht", core.cheats_dir,
+				rom_name); // /mnt/SDCARD/Cheats/GB/Super Example World.cht
 
 	// Santitized alias, ignoring all extra cruft - including Cheat specifics like "(Game Breaker)" etc.
 	// This is a wildcard that may match something unexpected, but also may find something when nothing else does.
 	getDisplayName(game.alt_name, rom_name);
 	getAlias(game.path, rom_name);
-	sprintf(paths[(*count)++], "%s/%s*.cht", core.cheats_dir, rom_name); // /mnt/SDCARD/Cheats/GB/Super Example World*.cht
+	sprintf(paths[(*count)++], "%s/%s*.cht", core.cheats_dir,
+			rom_name); // /mnt/SDCARD/Cheats/GB/Super Example World*.cht
 
 	// Log all path candidates
 	{
 		int i;
 		char list[CHEAT_MAX_LIST_LENGTH] = {0};
-		for (i=0; i<*count; i++) {
+		for (i = 0; i < *count; i++) {
 			strcat(list, paths[i]);
-			if (i < *count-1) strcat(list, ", ");
+			if (i < *count - 1)
+				strcat(list, ", ");
 		}
 		LOG_info("Cheat paths to check: %s\n", list);
 	}
 }
 
-void Cheats_free() {
+void Cheats_free()
+{
 	size_t i;
 	for (i = 0; i < cheatcodes.count; i++) {
 		struct Cheat *cheat = &cheatcodes.cheats[i];
@@ -611,7 +628,8 @@ void Cheats_free() {
 	cheatcodes.count = 0;
 }
 
-bool Cheats_load() {
+bool Cheats_load()
+{
 	int success = 0;
 	struct Cheats *cheats = &cheatcodes;
 	FILE *file = NULL;
@@ -622,10 +640,10 @@ bool Cheats_load() {
 	int path_count = 0;
 	Cheat_getPaths(paths, &path_count);
 	char filename[MAX_PATH] = {0};
-	for (i=0; i<path_count; i++) {
+	for (i = 0; i < path_count; i++) {
 		LOG_info("Checking cheat path: %s\n", paths[i]);
 		// handle wildcards
-		if (strchr(paths[i],'*')) {
+		if (strchr(paths[i], '*')) {
 			// Use glob to handle wildcards
 			char glob_pattern[MAX_PATH];
 			strcpy(glob_pattern, paths[i]);
@@ -636,7 +654,8 @@ bool Cheats_load() {
 
 			if (glob_ret == 0 && glob_results.gl_pathc > 0) {
 				for (size_t gi = 0; gi < glob_results.gl_pathc; ++gi) {
-					if (!suffixMatch(".cht", glob_results.gl_pathv[gi])) continue;
+					if (!suffixMatch(".cht", glob_results.gl_pathv[gi]))
+						continue;
 					strcpy(filename, glob_results.gl_pathv[gi]);
 					if (exists(filename)) {
 						LOG_info("Found potential cheat file: %s\n", filename);
@@ -646,7 +665,8 @@ bool Cheats_load() {
 				}
 			}
 			globfree(&glob_results);
-			if (filename[0] == '\0') continue; // no match
+			if (filename[0] == '\0')
+				continue; // no match
 		} else {
 			strcpy(filename, paths[i]);
 			if (!exists(filename)) {
@@ -699,68 +719,72 @@ bool Cheats_load() {
 }
 
 ///////////////////////////////////////
-static void formatSavePath(char* work_name, char* filename, const char* suffix) {
-	char* tmp = strrchr(work_name, '.');
+static void formatSavePath(char *work_name, char *filename, const char *suffix)
+{
+	char *tmp = strrchr(work_name, '.');
 	if (tmp != NULL && strlen(tmp) > 2 && strlen(tmp) <= 5) {
 		tmp[0] = '\0';
 	}
 	sprintf(filename, "%s/%s%s", core.saves_dir, work_name, suffix);
 }
 
-static void SRAM_getPath(char* filename) {
+static void SRAM_getPath(char *filename)
+{
 	char work_name[MAX_PATH];
 
-	if (CFG_getSaveFormat() == SAVE_FORMAT_SRM 
-	 || CFG_getSaveFormat() == SAVE_FORMAT_SRM_UNCOMPRESSED) {
+	if (CFG_getSaveFormat() == SAVE_FORMAT_SRM || CFG_getSaveFormat() == SAVE_FORMAT_SRM_UNCOMPRESSED) {
 		strcpy(work_name, game.alt_name);
 		formatSavePath(work_name, filename, ".srm");
-	}
-	else if (CFG_getSaveFormat() == SAVE_FORMAT_GEN) {
+	} else if (CFG_getSaveFormat() == SAVE_FORMAT_GEN) {
 		strcpy(work_name, game.alt_name);
 		formatSavePath(work_name, filename, ".sav");
-	}
-	else {
+	} else {
 		sprintf(filename, "%s/%s.sav", core.saves_dir, game.alt_name);
 	}
 
 	LOG_info("SRAM_getPath %s\n", filename);
 }
 
-static void SRAM_read(void) {
+static void SRAM_read(void)
+{
 	size_t sram_size = core.get_memory_size(RETRO_MEMORY_SAVE_RAM);
-	if (!sram_size) return;
-	
+	if (!sram_size)
+		return;
+
 	char filename[MAX_PATH];
 	SRAM_getPath(filename);
 	printf("sav path (read): %s\n", filename);
 
-	void* sram = core.get_memory_data(RETRO_MEMORY_SAVE_RAM);
+	void *sram = core.get_memory_data(RETRO_MEMORY_SAVE_RAM);
 
 #ifdef HAS_SRM
 	// TODO: rzipstream_open can also handle uncompressed, else branch is probably unnecessary
 	// srm, potentially compressed
 	if (CFG_getSaveFormat() == SAVE_FORMAT_SRM) {
-		rzipstream_t* sram_file = rzipstream_open(filename, RETRO_VFS_FILE_ACCESS_READ);
-		if(!sram_file) return;
+		rzipstream_t *sram_file = rzipstream_open(filename, RETRO_VFS_FILE_ACCESS_READ);
+		if (!sram_file)
+			return;
 
 		if (!sram || rzipstream_read(sram_file, sram, sram_size) < 0)
 			LOG_error("rzipstream: Error reading SRAM data\n");
-		
+
 		rzipstream_close(sram_file);
 	}
 	// uncompressed
 	else {
-		RFILE* sram_file = filestream_open(filename, RETRO_VFS_FILE_ACCESS_READ, 0);
-		if(!sram_file) return;
+		RFILE *sram_file = filestream_open(filename, RETRO_VFS_FILE_ACCESS_READ, 0);
+		if (!sram_file)
+			return;
 
 		if (!sram || filestream_read(sram_file, sram, sram_size) < 0)
 			LOG_error("filestream: Error reading SRAM data\n");
-		
+
 		filestream_close(sram_file);
 	}
-#else 
+#else
 	FILE *sram_file = fopen(filename, "r");
-	if (!sram_file) return;
+	if (!sram_file)
+		return;
 	if (!sram || !fread(sram, 1, sram_size, sram_file)) {
 		LOG_error("Error reading SRAM data\n");
 	}
@@ -768,24 +792,25 @@ static void SRAM_read(void) {
 #endif
 }
 
-static void SRAM_write(void) {
+static void SRAM_write(void)
+{
 	size_t sram_size = core.get_memory_size(RETRO_MEMORY_SAVE_RAM);
-	if (!sram_size) return;
-	
+	if (!sram_size)
+		return;
+
 	char filename[MAX_PATH];
 	SRAM_getPath(filename);
 	printf("sav path (write): %s\n", filename);
-	
+
 	void *sram = core.get_memory_data(RETRO_MEMORY_SAVE_RAM);
 
 #ifdef HAS_SRM
 	// srm, compressed
 	if (CFG_getSaveFormat() == SAVE_FORMAT_SRM) {
-		if(!rzipstream_write_file(filename, sram, sram_size))
+		if (!rzipstream_write_file(filename, sram, sram_size))
 			LOG_error("rzipstream: Error writing SRAM data to file\n");
-	}
-	else {
-		if(!filestream_write_file(filename, sram, sram_size))
+	} else {
+		if (!filestream_write_file(filename, sram, sram_size))
 			LOG_error("filestream: Error writing SRAM data to file\n");
 	}
 #else
@@ -804,21 +829,25 @@ static void SRAM_write(void) {
 
 ///////////////////////////////////////
 
-static void RTC_getPath(char* filename) {
+static void RTC_getPath(char *filename)
+{
 	sprintf(filename, "%s/%s.rtc", core.saves_dir, game.alt_name);
 }
-static void RTC_read(void) {
+static void RTC_read(void)
+{
 	size_t rtc_size = core.get_memory_size(RETRO_MEMORY_RTC);
-	if (!rtc_size) return;
-	
+	if (!rtc_size)
+		return;
+
 	char filename[MAX_PATH];
 	RTC_getPath(filename);
 	printf("rtc path (read): %s\n", filename);
-	
+
 	FILE *rtc_file = fopen(filename, "r");
-	if (!rtc_file) return;
+	if (!rtc_file)
+		return;
 
-	void* rtc = core.get_memory_data(RETRO_MEMORY_RTC);
+	void *rtc = core.get_memory_data(RETRO_MEMORY_RTC);
 
 	if (!rtc || !fread(rtc, 1, rtc_size, rtc_file)) {
 		LOG_error("Error reading RTC data\n");
@@ -826,14 +855,16 @@ static void RTC_read(void) {
 
 	fclose(rtc_file);
 }
-static void RTC_write(void) {
+static void RTC_write(void)
+{
 	size_t rtc_size = core.get_memory_size(RETRO_MEMORY_RTC);
-	if (!rtc_size) return;
-	
+	if (!rtc_size)
+		return;
+
 	char filename[MAX_PATH];
 	RTC_getPath(filename);
 	printf("rtc path (write) size(%u): %s\n", rtc_size, filename);
-		
+
 	FILE *rtc_file = fopen(filename, "w");
 	if (!rtc_file) {
 		LOG_error("Error opening RTC file: %s\n", strerror(errno));
@@ -855,55 +886,56 @@ static void RTC_write(void) {
 
 static int state_slot = 0;
 
-static void formatStatePath(char* work_name, char* filename, const char* suffix) {
-	char* tmp = strrchr(work_name, '.');
+static void formatStatePath(char *work_name, char *filename, const char *suffix)
+{
+	char *tmp = strrchr(work_name, '.');
 	if (tmp != NULL && strlen(tmp) > 2 && strlen(tmp) <= 5) {
 		tmp[0] = '\0';
 	}
 	sprintf(filename, "%s/%s%s", core.saves_dir, work_name, suffix);
 }
 
-static void State_getPath(char* filename) {
+static void State_getPath(char *filename)
+{
 	char work_name[MAX_PATH];
 
 	// This is only here for compatibility with older versions of minarch,
 	// should probably be removed at some point in the future.
-	if (CFG_getStateFormat() == STATE_FORMAT_SRM_EXTRADOT 
-	 || CFG_getStateFormat() == STATE_FORMAT_SRM_UNCOMRESSED_EXTRADOT) {
+	if (CFG_getStateFormat() == STATE_FORMAT_SRM_EXTRADOT ||
+		CFG_getStateFormat() == STATE_FORMAT_SRM_UNCOMRESSED_EXTRADOT) {
 		strcpy(work_name, game.alt_name);
-		char* tmp = strrchr(work_name, '.');
+		char *tmp = strrchr(work_name, '.');
 		if (tmp != NULL && strlen(tmp) > 2 && strlen(tmp) <= 5) {
 			tmp[0] = '\0';
 		}
 
-		if(state_slot == AUTO_RESUME_SLOT)
+		if (state_slot == AUTO_RESUME_SLOT)
 			sprintf(filename, "%s/%s.state.auto", core.states_dir, work_name);
-		else 
+		else
 			sprintf(filename, "%s/%s.state.%i", core.states_dir, work_name, state_slot);
-	}
-	else if (CFG_getStateFormat() == STATE_FORMAT_SRM
-	 	  || CFG_getStateFormat() == STATE_FORMAT_SRM_UNCOMRESSED) {
+	} else if (CFG_getStateFormat() == STATE_FORMAT_SRM || CFG_getStateFormat() == STATE_FORMAT_SRM_UNCOMRESSED) {
 		strcpy(work_name, game.alt_name);
-		char* tmp = strrchr(work_name, '.');
+		char *tmp = strrchr(work_name, '.');
 		if (tmp != NULL && strlen(tmp) > 2 && strlen(tmp) <= 5) {
 			tmp[0] = '\0';
 		}
 
-		if(state_slot == AUTO_RESUME_SLOT)
+		if (state_slot == AUTO_RESUME_SLOT)
 			sprintf(filename, "%s/%s.state.auto", core.states_dir, work_name);
-		else if(state_slot == 0)
+		else if (state_slot == 0)
 			sprintf(filename, "%s/%s.state", core.states_dir, work_name);
-		else 
+		else
 			sprintf(filename, "%s/%s.state%i", core.states_dir, work_name, state_slot);
-	}
-	else {
+	} else {
 		sprintf(filename, "%s/%s.st%i", core.states_dir, game.alt_name, state_slot);
 	}
 }
 
-static void State_read(void) { // from picoarch
+static void State_read(void)
+{ // from picoarch
 	size_t state_size = core.serialize_size();
-	if (!state_size) return;
+	if (!state_size)
+		return;
 
 	int was_ff = fast_forward;
 	fast_forward = 0;
@@ -925,8 +957,8 @@ static void State_read(void) { // from picoarch
 	// srm, potentially compressed
 	if (CFG_getStateFormat() == STATE_FORMAT_SRM || CFG_getStateFormat() == STATE_FORMAT_SRM_EXTRADOT) {
 		state_rzfile = rzipstream_open(filename, RETRO_VFS_FILE_ACCESS_READ);
-		if(!state_rzfile) {
-			if (state_slot!=8) { // st8 is a default state in MiniUI and may not exist, that's okay
+		if (!state_rzfile) {
+			if (state_slot != 8) { // st8 is a default state in MiniUI and may not exist, that's okay
 				LOG_error("Error opening state file: %s (%s)\n", filename, strerror(errno));
 			}
 			goto error;
@@ -943,23 +975,22 @@ static void State_read(void) { // from picoarch
 			LOG_error("Error restoring save state: %s (%s)\n", filename, strerror(errno));
 			goto error;
 		}
-	}
-	else {
+	} else {
 		state_rfile = filestream_open(filename, RETRO_VFS_FILE_ACCESS_READ, 0);
 		if (!state_rfile) {
-			if (state_slot!=8) { // st8 is a default state in MiniUI and may not exist, that's okay
+			if (state_slot != 8) { // st8 is a default state in MiniUI and may not exist, that's okay
 				LOG_error("Error opening state file: %s (%s)\n", filename, strerror(errno));
 			}
 			goto error;
 		}
-		
+
 		// some cores report the wrong serialize size initially for some games, eg. mgba: Wario Land 4
 		// so we allow a size mismatch as long as the actual size fits in the buffer we've allocated
 		if (state_size < filestream_read(state_rfile, state, state_size)) {
 			LOG_error("Error reading state data from file: %s (%s)\n", filename, strerror(errno));
 			goto error;
 		}
-	
+
 		if (!core.unserialize(state, state_size)) {
 			LOG_error("Error restoring save state: %s (%s)\n", filename, strerror(errno));
 			goto error;
@@ -967,18 +998,21 @@ static void State_read(void) { // from picoarch
 	}
 
 error:
-	if (state) free(state);
-	if (state_rfile) filestream_close(state_rfile);
-	if (state_rzfile) rzipstream_close(state_rzfile);
+	if (state)
+		free(state);
+	if (state_rfile)
+		filestream_close(state_rfile);
+	if (state_rzfile)
+		rzipstream_close(state_rzfile);
 #else
 	FILE *state_file = fopen(filename, "r");
 	if (!state_file) {
-		if (state_slot!=8) { // st8 is a default state in MiniUI and may not exist, that's okay
+		if (state_slot != 8) { // st8 is a default state in MiniUI and may not exist, that's okay
 			LOG_error("Error opening state file: %s (%s)\n", filename, strerror(errno));
 		}
 		goto error;
 	}
-	
+
 	// some cores report the wrong serialize size initially for some games, eg. mgba: Wario Land 4
 	// so we allow a size mismatch as long as the actual size fits in the buffer we've allocated
 	if (state_size < fread(state, 1, state_size, state_file)) {
@@ -992,16 +1026,20 @@ static void State_read(void) { // from picoarch
 	}
 
 error:
-	if (state) free(state);
-	if (state_file) fclose(state_file);
+	if (state)
+		free(state);
+	if (state_file)
+		fclose(state_file);
 #endif
 	fast_forward = was_ff;
 }
 
-static void State_write(void) { // from picoarch
+static void State_write(void)
+{ // from picoarch
 	size_t state_size = core.serialize_size();
-	if (!state_size) return;
-	
+	if (!state_size)
+		return;
+
 	int was_ff = fast_forward;
 	fast_forward = 0;
 
@@ -1015,25 +1053,25 @@ static void State_write(void) { // from picoarch
 		LOG_error("Error serializing save state\n");
 		goto error;
 	}
-	
+
 	char filename[MAX_PATH];
 	State_getPath(filename);
 #ifdef HAS_SRM
 	if (CFG_getStateFormat() == STATE_FORMAT_SRM || CFG_getStateFormat() == STATE_FORMAT_SRM_EXTRADOT) {
-		if(!rzipstream_write_file(filename, state, state_size)) {
+		if (!rzipstream_write_file(filename, state, state_size)) {
 			LOG_error("rzipstream: Error writing state data to file: %s\n", filename);
 			goto error;
 		}
-	}
-	else {
-		if(!filestream_write_file(filename, state, state_size)) {
+	} else {
+		if (!filestream_write_file(filename, state, state_size)) {
 			LOG_error("filestream: Error writing state data to file: %s\n", filename);
 			goto error;
 		}
 	}
 
 error:
-	if (state) free(state);
+	if (state)
+		free(state);
 #else
 	FILE *state_file = fopen(filename, "w");
 	if (!state_file) {
@@ -1044,24 +1082,29 @@ static void State_write(void) { // from picoarch
 		LOG_error("Error writing state data to file: %s (%s)\n", filename, strerror(errno));
 		goto error;
 	}
-	error:
-	if (state) free(state);
-	if (state_file) fclose(state_file);
+error:
+	if (state)
+		free(state);
+	if (state_file)
+		fclose(state_file);
 #endif
 
 	sync();
 	fast_forward = was_ff;
 }
 
-static void State_autosave(void) {
+static void State_autosave(void)
+{
 	int last_state_slot = state_slot;
 	state_slot = AUTO_RESUME_SLOT;
 	State_write();
 	state_slot = last_state_slot;
 }
-static void State_resume(void) {
-	if (!exists(RESUME_SLOT_PATH)) return;
-	
+static void State_resume(void)
+{
+	if (!exists(RESUME_SLOT_PATH))
+		return;
+
 	int last_state_slot = state_slot;
 	state_slot = getInt(RESUME_SLOT_PATH);
 	unlink(RESUME_SLOT_PATH);
@@ -1072,19 +1115,19 @@ static void State_resume(void) {
 ///////////////////////////////
 
 typedef struct Option {
-	char* key;
-	char* name; // desc
-	char* desc; // info, truncated
-	char* full; // info, longer but possibly still truncated
+	char *key;
+	char *name; // desc
+	char *desc; // info, truncated
+	char *full; // info, longer but possibly still truncated
 	char *category;
-	char* var;
+	char *var;
 	int default_value;
 	int value;
 	int count; // TODO: drop this?
 	int lock;
 	int hidden;
-	char** values;
-	char** labels;
+	char **values;
+	char **labels;
 } Option;
 typedef struct OptionCategory {
 	char *key;
@@ -1094,250 +1137,49 @@ typedef struct OptionCategory {
 typedef struct OptionList {
 	int count;
 	int changed;
-	Option* options;
-	
+	Option *options;
+
 	int enabled_count;
-	Option** enabled_options;
+	Option **enabled_options;
 
 	OptionCategory *categories;
 	// OptionList_callback_t on_set;
 } OptionList;
 
-static char* onoff_labels[] = {
-	"Off",
-	"On",
-	NULL
-};
-static char* scaling_labels[] = {
-	"Native",
-	"Aspect",
-	"Aspect Screen",
-	"Fullscreen",
-	"Cropped",
-	NULL
-};
-static char* resample_labels[] = {
-	"Low",
-	"Medium",
-	"High",
-	"Max",
-	NULL
-};
-static char* ambient_labels[] = {
-	"Off",
-	"All",
-	"Top",
-	"FN",
-	"LR",
-	"Top/LR",
-	NULL
-};
+static char *onoff_labels[] = {"Off", "On", NULL};
+static char *scaling_labels[] = {"Native", "Aspect", "Aspect Screen", "Fullscreen", "Cropped", NULL};
+static char *resample_labels[] = {"Low", "Medium", "High", "Max", NULL};
+static char *ambient_labels[] = {"Off", "All", "Top", "FN", "LR", "Top/LR", NULL};
 
-static char* effect_labels[] = {
-	"None",
-	"Line",
-	"Grid",
-	NULL
-};
-static char* overlay_labels[] = {
-	"None",
-	NULL
-};
+static char *effect_labels[] = {"None", "Line", "Grid", NULL};
+static char *overlay_labels[] = {"None", NULL};
 // static char* sharpness_labels[] = {
 // 	"Sharp",
 // 	"Crisp",
 // 	"Soft",
 // 	NULL
 // };
-static char* sharpness_labels[] = {
-	"NEAREST",
-	"LINEAR",
-	NULL
-};
-static char* tearing_labels[] = {
-	"Off",
-	"Lenient",
-	"Strict",
-	NULL
-};
-static char* sync_ref_labels[] = {
-	"Auto",
-	"Screen",
-	"Native",
-	NULL
-};
-static char* max_ff_labels[] = {
-	"None",
-	"2x",
-	"3x",
-	"4x",
-	"5x",
-	"6x",
-	"7x",
-	"8x",
-	NULL,
+static char *sharpness_labels[] = {"NEAREST", "LINEAR", NULL};
+static char *tearing_labels[] = {"Off", "Lenient", "Strict", NULL};
+static char *sync_ref_labels[] = {"Auto", "Screen", "Native", NULL};
+static char *max_ff_labels[] = {
+	"None", "2x", "3x", "4x", "5x", "6x", "7x", "8x", NULL,
 };
-static char* offset_labels[] = {
-	"-64",
-	"-63",
-	"-62",
-	"-61",
-	"-60",
-	"-59",
-	"-58",
-	"-57",
-	"-56",
-	"-55",
-	"-54",
-	"-53",
-	"-52",
-	"-51",
-	"-50",
-	"-49",
-	"-48",
-	"-47",
-	"-46",
-	"-45",
-	"-44",
-	"-43",
-	"-42",
-	"-41",
-	"-40",
-	"-39",
-	"-38",
-	"-37",
-	"-36",
-	"-35",
-	"-34",
-	"-33",
-	"-32",
-	"-31",
-	"-30",
-	"-29",
-	"-28",
-	"-27",
-	"-26",
-	"-25",
-	"-24",
-	"-23",
-	"-22",
-	"-21",
-	"-20",
-	"-19",
-	"-18",
-	"-17",
-	"-16",
-	"-15",
-	"-14",
-	"-13",
-	"-12",
-	"-11",
-	"-10",
-	"-9",
-	"-8",
-	"-7",
-	"-6",
-	"-5",
-	"-4",
-	"-3",
-	"-2",
-	"-1",
-	"0",
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"14",
-	"15",
-	"16",
-	"17",
-	"18",
-	"19",
-	"20",
-	"21",
-	"22",
-	"23",
-	"24",
-	"25",
-	"26",
-	"27",
-	"28",
-	"29",
-	"30",
-	"31",
-	"32",
-	"33",
-	"34",
-	"35",
-	"36",
-	"37",
-	"38",
-	"39",
-	"40",
-	"41",
-	"42",
-	"43",
-	"44",
-	"45",
-	"46",
-	"47",
-	"48",
-	"49",
-	"50",
-	"51",
-	"52",
-	"53",
-	"54",
-	"55",
-	"56",
-	"57",
-	"58",
-	"59",
-	"60",
-	"61",
-	"62",
-	"63",
-	"64",
-	NULL,
-};
-static char* nrofshaders_labels[] = {
-	"off",
-	"1",
-	"2",
-	"3",
-	NULL
-};
-static char* shupscale_labels[] = {
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
-	"8",
-	"screen",
-	NULL
-};
-static char* shfilter_labels[] = {
-	"NEAREST",
-	"LINEAR",
-	NULL
-};
-static char* shscaletype_labels[] = {
-	"source",
-	"relative",
-	NULL
+static char *offset_labels[] = {
+	"-64", "-63", "-62", "-61", "-60", "-59", "-58", "-57", "-56", "-55", "-54", "-53", "-52", "-51", "-50",
+	"-49", "-48", "-47", "-46", "-45", "-44", "-43", "-42", "-41", "-40", "-39", "-38", "-37", "-36", "-35",
+	"-34", "-33", "-32", "-31", "-30", "-29", "-28", "-27", "-26", "-25", "-24", "-23", "-22", "-21", "-20",
+	"-19", "-18", "-17", "-16", "-15", "-14", "-13", "-12", "-11", "-10", "-9",	 "-8",	"-7",  "-6",  "-5",
+	"-4",  "-3",  "-2",	 "-1",	"0",   "1",	  "2",	 "3",	"4",   "5",	  "6",	 "7",	"8",   "9",	  "10",
+	"11",  "12",  "13",	 "14",	"15",  "16",  "17",	 "18",	"19",  "20",  "21",	 "22",	"23",  "24",  "25",
+	"26",  "27",  "28",	 "29",	"30",  "31",  "32",	 "33",	"34",  "35",  "36",	 "37",	"38",  "39",  "40",
+	"41",  "42",  "43",	 "44",	"45",  "46",  "47",	 "48",	"49",  "50",  "51",	 "52",	"53",  "54",  "55",
+	"56",  "57",  "58",	 "59",	"60",  "61",  "62",	 "63",	"64",  NULL,
 };
+static char *nrofshaders_labels[] = {"off", "1", "2", "3", NULL};
+static char *shupscale_labels[] = {"1", "2", "3", "4", "5", "6", "7", "8", "screen", NULL};
+static char *shfilter_labels[] = {"NEAREST", "LINEAR", NULL};
+static char *shscaletype_labels[] = {"source", "relative", NULL};
 
 ///////////////////////////////
 
@@ -1379,15 +1221,11 @@ enum {
 	SHORTCUT_TOGGLE_TURBO_L2,
 	SHORTCUT_TOGGLE_TURBO_R,
 	SHORTCUT_TOGGLE_TURBO_R2,
-	// 
+	//
 	SHORTCUT_COUNT,
 };
 
-enum {
-	SYNC_SRC_AUTO,
-	SYNC_SRC_SCREEN,
-	SYNC_SRC_CORE
-};
+enum { SYNC_SRC_AUTO, SYNC_SRC_SCREEN, SYNC_SRC_CORE };
 enum {
 	SH_EXTRASETTINGS,
 	SH_SHADERS_PRESET,
@@ -1411,10 +1249,11 @@ enum {
 };
 
 #define LOCAL_BUTTON_COUNT 16 // depends on device
-#define RETRO_BUTTON_COUNT 16 // allow L3/R3 to be remapped by user if desired, eg. Virtual Boy uses extra buttons for right d-pad
+#define RETRO_BUTTON_COUNT                                                                                             \
+	16 // allow L3/R3 to be remapped by user if desired, eg. Virtual Boy uses extra buttons for right d-pad
 
-typedef struct ButtonMapping { 
-	char* name;
+typedef struct ButtonMapping {
+	char *name;
 	int retro;
 	int local; // TODO: dislike this name...
 	int mod;
@@ -1423,118 +1262,83 @@ typedef struct ButtonMapping {
 } ButtonMapping;
 
 static ButtonMapping default_button_mapping[] = { // used if pak.cfg doesn't exist or doesn't have bindings
-	{"Up",			RETRO_DEVICE_ID_JOYPAD_UP,		BTN_ID_DPAD_UP},
-	{"Down",		RETRO_DEVICE_ID_JOYPAD_DOWN,	BTN_ID_DPAD_DOWN},
-	{"Left",		RETRO_DEVICE_ID_JOYPAD_LEFT,	BTN_ID_DPAD_LEFT},
-	{"Right",		RETRO_DEVICE_ID_JOYPAD_RIGHT,	BTN_ID_DPAD_RIGHT},
-	{"A Button",	RETRO_DEVICE_ID_JOYPAD_A,		BTN_ID_A},
-	{"B Button",	RETRO_DEVICE_ID_JOYPAD_B,		BTN_ID_B},
-	{"X Button",	RETRO_DEVICE_ID_JOYPAD_X,		BTN_ID_X},
-	{"Y Button",	RETRO_DEVICE_ID_JOYPAD_Y,		BTN_ID_Y},
-	{"Start",		RETRO_DEVICE_ID_JOYPAD_START,	BTN_ID_START},
-	{"Select",		RETRO_DEVICE_ID_JOYPAD_SELECT,	BTN_ID_SELECT},
-	{"L1 Button",	RETRO_DEVICE_ID_JOYPAD_L,		BTN_ID_L1},
-	{"R1 Button",	RETRO_DEVICE_ID_JOYPAD_R,		BTN_ID_R1},
-	{"L2 Button",	RETRO_DEVICE_ID_JOYPAD_L2,		BTN_ID_L2},
-	{"R2 Button",	RETRO_DEVICE_ID_JOYPAD_R2,		BTN_ID_R2},
-	{"L3 Button",	RETRO_DEVICE_ID_JOYPAD_L3,		BTN_ID_L3},
-	{"R3 Button",	RETRO_DEVICE_ID_JOYPAD_R3,		BTN_ID_R3},
-	{NULL,0,0}
-};
+	{"Up", RETRO_DEVICE_ID_JOYPAD_UP, BTN_ID_DPAD_UP},
+	{"Down", RETRO_DEVICE_ID_JOYPAD_DOWN, BTN_ID_DPAD_DOWN},
+	{"Left", RETRO_DEVICE_ID_JOYPAD_LEFT, BTN_ID_DPAD_LEFT},
+	{"Right", RETRO_DEVICE_ID_JOYPAD_RIGHT, BTN_ID_DPAD_RIGHT},
+	{"A Button", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A},
+	{"B Button", RETRO_DEVICE_ID_JOYPAD_B, BTN_ID_B},
+	{"X Button", RETRO_DEVICE_ID_JOYPAD_X, BTN_ID_X},
+	{"Y Button", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_Y},
+	{"Start", RETRO_DEVICE_ID_JOYPAD_START, BTN_ID_START},
+	{"Select", RETRO_DEVICE_ID_JOYPAD_SELECT, BTN_ID_SELECT},
+	{"L1 Button", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1},
+	{"R1 Button", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
+	{"L2 Button", RETRO_DEVICE_ID_JOYPAD_L2, BTN_ID_L2},
+	{"R2 Button", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_R2},
+	{"L3 Button", RETRO_DEVICE_ID_JOYPAD_L3, BTN_ID_L3},
+	{"R3 Button", RETRO_DEVICE_ID_JOYPAD_R3, BTN_ID_R3},
+	{NULL, 0, 0}};
 static ButtonMapping button_label_mapping[] = { // used to lookup the retro_id and local btn_id from button name
-	{"NONE",	-1,								BTN_ID_NONE},
-	{"UP",		RETRO_DEVICE_ID_JOYPAD_UP,		BTN_ID_DPAD_UP},
-	{"DOWN",	RETRO_DEVICE_ID_JOYPAD_DOWN,	BTN_ID_DPAD_DOWN},
-	{"LEFT",	RETRO_DEVICE_ID_JOYPAD_LEFT,	BTN_ID_DPAD_LEFT},
-	{"RIGHT",	RETRO_DEVICE_ID_JOYPAD_RIGHT,	BTN_ID_DPAD_RIGHT},
-	{"A",		RETRO_DEVICE_ID_JOYPAD_A,		BTN_ID_A},
-	{"B",		RETRO_DEVICE_ID_JOYPAD_B,		BTN_ID_B},
-	{"X",		RETRO_DEVICE_ID_JOYPAD_X,		BTN_ID_X},
-	{"Y",		RETRO_DEVICE_ID_JOYPAD_Y,		BTN_ID_Y},
-	{"START",	RETRO_DEVICE_ID_JOYPAD_START,	BTN_ID_START},
-	{"SELECT",	RETRO_DEVICE_ID_JOYPAD_SELECT,	BTN_ID_SELECT},
-	{"L1",		RETRO_DEVICE_ID_JOYPAD_L,		BTN_ID_L1},
-	{"R1",		RETRO_DEVICE_ID_JOYPAD_R,		BTN_ID_R1},
-	{"L2",		RETRO_DEVICE_ID_JOYPAD_L2,		BTN_ID_L2},
-	{"R2",		RETRO_DEVICE_ID_JOYPAD_R2,		BTN_ID_R2},
-	{"L3",		RETRO_DEVICE_ID_JOYPAD_L3,		BTN_ID_L3},
-	{"R3",		RETRO_DEVICE_ID_JOYPAD_R3,		BTN_ID_R3},
-	{NULL,0,0}
-};
-static ButtonMapping core_button_mapping[RETRO_BUTTON_COUNT+1] = {0};
-
-static const char* device_button_names[LOCAL_BUTTON_COUNT] = {
-	[BTN_ID_DPAD_UP]	= "UP",
-	[BTN_ID_DPAD_DOWN]	= "DOWN",
-	[BTN_ID_DPAD_LEFT]	= "LEFT",
-	[BTN_ID_DPAD_RIGHT]	= "RIGHT",
-	[BTN_ID_SELECT]		= "SELECT",
-	[BTN_ID_START]		= "START",
-	[BTN_ID_Y]			= "Y",
-	[BTN_ID_X]			= "X",
-	[BTN_ID_B]			= "B",
-	[BTN_ID_A]			= "A",
-	[BTN_ID_L1]			= "L1",
-	[BTN_ID_R1]			= "R1",
-	[BTN_ID_L2]			= "L2",
-	[BTN_ID_R2]			= "R2",
-	[BTN_ID_L3]			= "L3",
-	[BTN_ID_R3]			= "R3",
+	{"NONE", -1, BTN_ID_NONE},
+	{"UP", RETRO_DEVICE_ID_JOYPAD_UP, BTN_ID_DPAD_UP},
+	{"DOWN", RETRO_DEVICE_ID_JOYPAD_DOWN, BTN_ID_DPAD_DOWN},
+	{"LEFT", RETRO_DEVICE_ID_JOYPAD_LEFT, BTN_ID_DPAD_LEFT},
+	{"RIGHT", RETRO_DEVICE_ID_JOYPAD_RIGHT, BTN_ID_DPAD_RIGHT},
+	{"A", RETRO_DEVICE_ID_JOYPAD_A, BTN_ID_A},
+	{"B", RETRO_DEVICE_ID_JOYPAD_B, BTN_ID_B},
+	{"X", RETRO_DEVICE_ID_JOYPAD_X, BTN_ID_X},
+	{"Y", RETRO_DEVICE_ID_JOYPAD_Y, BTN_ID_Y},
+	{"START", RETRO_DEVICE_ID_JOYPAD_START, BTN_ID_START},
+	{"SELECT", RETRO_DEVICE_ID_JOYPAD_SELECT, BTN_ID_SELECT},
+	{"L1", RETRO_DEVICE_ID_JOYPAD_L, BTN_ID_L1},
+	{"R1", RETRO_DEVICE_ID_JOYPAD_R, BTN_ID_R1},
+	{"L2", RETRO_DEVICE_ID_JOYPAD_L2, BTN_ID_L2},
+	{"R2", RETRO_DEVICE_ID_JOYPAD_R2, BTN_ID_R2},
+	{"L3", RETRO_DEVICE_ID_JOYPAD_L3, BTN_ID_L3},
+	{"R3", RETRO_DEVICE_ID_JOYPAD_R3, BTN_ID_R3},
+	{NULL, 0, 0}};
+static ButtonMapping core_button_mapping[RETRO_BUTTON_COUNT + 1] = {0};
+
+static const char *device_button_names[LOCAL_BUTTON_COUNT] = {
+	[BTN_ID_DPAD_UP] = "UP",
+	[BTN_ID_DPAD_DOWN] = "DOWN",
+	[BTN_ID_DPAD_LEFT] = "LEFT",
+	[BTN_ID_DPAD_RIGHT] = "RIGHT",
+	[BTN_ID_SELECT] = "SELECT",
+	[BTN_ID_START] = "START",
+	[BTN_ID_Y] = "Y",
+	[BTN_ID_X] = "X",
+	[BTN_ID_B] = "B",
+	[BTN_ID_A] = "A",
+	[BTN_ID_L1] = "L1",
+	[BTN_ID_R1] = "R1",
+	[BTN_ID_L2] = "L2",
+	[BTN_ID_R2] = "R2",
+	[BTN_ID_L3] = "L3",
+	[BTN_ID_R3] = "R3",
 };
 
 
 // NOTE: these must be in BTN_ID_ order also off by 1 because of NONE (which is -1 in BTN_ID_ land)
-static char* button_labels[] = {
+static char *button_labels[] = {
 	"NONE", // displayed by default
-	"UP",
-	"DOWN",
-	"LEFT",
-	"RIGHT",
-	"A",
-	"B",
-	"X",
-	"Y",
-	"START",
-	"SELECT",
-	"L1",
-	"R1",
-	"L2",
-	"R2",
-	"L3",
-	"R3",
-	"MENU+UP",
-	"MENU+DOWN",
-	"MENU+LEFT",
-	"MENU+RIGHT",
-	"MENU+A",
-	"MENU+B",
-	"MENU+X",
-	"MENU+Y",
-	"MENU+START",
-	"MENU+SELECT",
-	"MENU+L1",
-	"MENU+R1",
-	"MENU+L2",
-	"MENU+R2",
-	"MENU+L3",
-	"MENU+R3",
-	NULL,
+	"UP",		 "DOWN",	   "LEFT",	  "RIGHT",	 "A",		"B",	  "X",			"Y",		   "START",
+	"SELECT",	 "L1",		   "R1",	  "L2",		 "R2",		"L3",	  "R3",			"MENU+UP",	   "MENU+DOWN",
+	"MENU+LEFT", "MENU+RIGHT", "MENU+A",  "MENU+B",	 "MENU+X",	"MENU+Y", "MENU+START", "MENU+SELECT", "MENU+L1",
+	"MENU+R1",	 "MENU+L2",	   "MENU+R2", "MENU+L3", "MENU+R3", NULL,
 };
-static char* overclock_labels[] = {
-	"Powersave",
-	"Normal",
-	"Performance",
-	"Auto",
-	NULL,
+static char *overclock_labels[] = {
+	"Powersave", "Normal", "Performance", "Auto", NULL,
 };
 
 // TODO: this should be provided by the core
-static char* gamepad_labels[] = {
+static char *gamepad_labels[] = {
 	"Standard",
 	"DualShock",
 	NULL,
 };
-static char* gamepad_values[] = {
+static char *gamepad_values[] = {
 	"1",
 	"517",
 	NULL,
@@ -1546,489 +1350,579 @@ enum {
 	CONFIG_GAME,
 };
 
-static inline char* getScreenScalingDesc(void) {
+static inline char *getScreenScalingDesc(void)
+{
 	if (GFX_supportsOverscan()) {
-		return "Native uses integer scaling. Aspect uses core nreported aspect ratio.\nAspect screen uses screen aspect ratio\n Fullscreen has non-square\npixels. Cropped is integer scaled then cropped.";
-	}
-	else {
-		return "Native uses integer scaling.\nAspect uses core reported aspect ratio.\nAspect screen uses screen aspect ratio\nFullscreen has non-square pixels.";
+		return "Native uses integer scaling. Aspect uses core nreported aspect ratio.\nAspect screen uses screen "
+			   "aspect ratio\n Fullscreen has non-square\npixels. Cropped is integer scaled then cropped.";
+	} else {
+		return "Native uses integer scaling.\nAspect uses core reported aspect ratio.\nAspect screen uses screen "
+			   "aspect ratio\nFullscreen has non-square pixels.";
 	}
 }
-static inline int getScreenScalingCount(void) {
+static inline int getScreenScalingCount(void)
+{
 	return GFX_supportsOverscan() ? 5 : 4;
 }
-	
+
 
 static struct Config {
-	char* system_cfg; // system.cfg based on system limitations
-	char* default_cfg; // pak.cfg based on platform limitations
-	char* user_cfg; // minarch.cfg or game.cfg based on user preference
-	char* shaders_preset; // minarch.cfg or game.cfg based on user preference
-	char* device_tag;
+	char *system_cfg;	  // system.cfg based on system limitations
+	char *default_cfg;	  // pak.cfg based on platform limitations
+	char *user_cfg;		  // minarch.cfg or game.cfg based on user preference
+	char *shaders_preset; // minarch.cfg or game.cfg based on user preference
+	char *device_tag;
 	OptionList frontend;
 	OptionList core;
 	OptionList shaders;
 	OptionList shaderpragmas[3];
-	ButtonMapping* controls;
-	ButtonMapping* shortcuts;
+	ButtonMapping *controls;
+	ButtonMapping *shortcuts;
 	int loaded;
 	int initialized;
 } config = {
-	.frontend = { // (OptionList)
-		.count = FE_OPT_COUNT,
-		.options = (Option[]){
-			[FE_OPT_SCALING] = {
-				.key	= "minarch_screen_scaling", 
-				.name	= "Screen Scaling",
-				.desc	= NULL, // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 3, // will call getScreenScalingCount()
-				.values = scaling_labels,
-				.labels = scaling_labels,
-			},
-			[FE_OPT_RESAMPLING] = {
-				.key	= "minarch__resampling_quality", 
-				.name	= "Audio Resampling Quality",
-				.desc	= "Resampling quality higher takes more CPU", // will call getScreenScalingDesc()
-				.default_value = 2,
-				.value = 2,
-				.count = 4,
-				.values = resample_labels,
-				.labels = resample_labels,
-			},
-			[FE_OPT_AMBIENT] = {
-				.key	= "minarch_ambient", 
-				.name	= "Ambient Mode",
-				.desc	= "Makes your leds follow on screen colors", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 6,
-				.values = ambient_labels,
-				.labels = ambient_labels,
-			},
-			[FE_OPT_EFFECT] = {
-				.key	= "minarch_screen_effect",
-				.name	= "Screen Effect",
-				.desc	= "Grid simulates an LCD grid.\nLine simulates CRT scanlines.\nEffects usually look best at native scaling.",
-				.default_value = 0,
-				.value = 0,
-				.count = 3,
-				.values = effect_labels,
-				.labels = effect_labels,
-			},
-			[FE_OPT_OVERLAY] = {
-				.key	= "minarch_overlay",
-				.name	= "Overlay",
-				.desc	= "Choose a custom overlay png from the Overlays folder",
-				.default_value = 0,
-				.value = 0,
-				.count = 1,
-				.values = overlay_labels,
-				.labels = overlay_labels,
-			},
-			[FE_OPT_SCREENX] = {
-				.key	= "minarch_screen_offsetx",
-				.name	= "Offset screen X",
-				.desc	= "Offset X pixels",
-				.default_value = 64,
-				.value = 64,
-				.count = 129,
-				.values = offset_labels,
-				.labels = offset_labels,
-			},
-			[FE_OPT_SCREENY] = {
-				.key	= "minarch_screen_offsety",
-				.name	= "Offset screen Y",
-				.desc	= "Offset Y pixels",
-				.default_value = 64,
-				.value = 64,
-				.count = 129,
-				.values = offset_labels,
-				.labels = offset_labels,
-			},
-			[FE_OPT_SHARPNESS] = {
-				// 	.key	= "minarch_screen_sharpness",
-				.key	= "minarch_scale_filter",
-				.name	= "Screen Sharpness",
-				.desc	= "LINEAR smooths lines, but works better when final image is at higher resolution, so either core that outputs higher resolution or upscaling with shaders",
-				.default_value = 1,
-				.value = 1,
-				.count = 3,
-				.values = sharpness_labels,
-				.labels = sharpness_labels,
-			},
-			[FE_OPT_TEARING] = {
-				.key	= "minarch_prevent_tearing",
-				.name	= "VSync",
-				.desc	= "Wait for vsync before drawing the next frame.\nLenient only waits when within frame budget.\nStrict always waits.",
-				.default_value = VSYNC_LENIENT,
-				.value = VSYNC_LENIENT,
-				.count = 3,
-				.values = tearing_labels,
-				.labels = tearing_labels,
-			},
-			[FE_OPT_SYNC_REFERENCE] = {
-				.key	= "minarch_sync_reference",
-				.name	= "Core Sync",
-				.desc	= "Choose what should be used as a\nreference for the frame rate.\n\"Native\" uses the emulator frame rate,\n\"Screen\" uses the frame rate of the screen.",
-				.default_value = SYNC_SRC_AUTO,
-				.value = SYNC_SRC_AUTO,
-				.count = 3,
-				.values = sync_ref_labels,
-				.labels = sync_ref_labels,
-			},
-			[FE_OPT_OVERCLOCK] = {
-				.key	= "minarch_cpu_speed",
-				.name	= "CPU Speed",
-				.desc	= "Over- or underclock the CPU to prioritize\npure performance or power savings.",
-				.default_value = 3,
-				.value = 3,
-				.count = 4,
-				.values = overclock_labels,
-				.labels = overclock_labels,
-			},
-			[FE_OPT_DEBUG] = {
-				.key	= "minarch_debug_hud",
-				.name	= "Debug HUD",
-				.desc	= "Show frames per second, cpu load,\nresolution, and scaler information.",
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = onoff_labels,
-				.labels = onoff_labels,
-			},
-			[FE_OPT_MAXFF] = {
-				.key	= "minarch_max_ff_speed",
-				.name	= "Max FF Speed",
-				.desc	= "Fast forward will not exceed the\nselected speed (but may be less\ndepending on game and emulator).",
-				.default_value = 3, // 4x
-				.value = 3, // 4x
-				.count = 8,
-				.values = max_ff_labels,
-				.labels = max_ff_labels,
-			},
-			[FE_OPT_FF_AUDIO] = {
-				.key	= "minarch__ff_audio", 
-				.name	= "Fast forward audio",
-				.desc	= "Play or mute audio when fast forwarding.",
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = onoff_labels,
-				.labels = onoff_labels,
-			},
-			[FE_OPT_COUNT] = {NULL}
-		}
-	},
-	.core = { // (OptionList)
-		.count = 0,
-		.options = (Option[]){
-			{NULL},
+	.frontend =
+		{// (OptionList)
+		 .count = FE_OPT_COUNT,
+		 .options =
+			 (Option[]){[FE_OPT_SCALING] =
+							{
+								.key = "minarch_screen_scaling",
+								.name = "Screen Scaling",
+								.desc = NULL, // will call getScreenScalingDesc()
+								.default_value = 1,
+								.value = 1,
+								.count = 3, // will call getScreenScalingCount()
+								.values = scaling_labels,
+								.labels = scaling_labels,
+							},
+						[FE_OPT_RESAMPLING] =
+							{
+								.key = "minarch__resampling_quality",
+								.name = "Audio Resampling Quality",
+								.desc = "Resampling quality higher takes more CPU", // will call getScreenScalingDesc()
+								.default_value = 2,
+								.value = 2,
+								.count = 4,
+								.values = resample_labels,
+								.labels = resample_labels,
+							},
+						[FE_OPT_AMBIENT] =
+							{
+								.key = "minarch_ambient",
+								.name = "Ambient Mode",
+								.desc = "Makes your leds follow on screen colors", // will call getScreenScalingDesc()
+								.default_value = 0,
+								.value = 0,
+								.count = 6,
+								.values = ambient_labels,
+								.labels = ambient_labels,
+							},
+						[FE_OPT_EFFECT] =
+							{
+								.key = "minarch_screen_effect",
+								.name = "Screen Effect",
+								.desc = "Grid simulates an LCD grid.\nLine simulates CRT scanlines.\nEffects usually "
+										"look best at native scaling.",
+								.default_value = 0,
+								.value = 0,
+								.count = 3,
+								.values = effect_labels,
+								.labels = effect_labels,
+							},
+						[FE_OPT_OVERLAY] =
+							{
+								.key = "minarch_overlay",
+								.name = "Overlay",
+								.desc = "Choose a custom overlay png from the Overlays folder",
+								.default_value = 0,
+								.value = 0,
+								.count = 1,
+								.values = overlay_labels,
+								.labels = overlay_labels,
+							},
+						[FE_OPT_SCREENX] =
+							{
+								.key = "minarch_screen_offsetx",
+								.name = "Offset screen X",
+								.desc = "Offset X pixels",
+								.default_value = 64,
+								.value = 64,
+								.count = 129,
+								.values = offset_labels,
+								.labels = offset_labels,
+							},
+						[FE_OPT_SCREENY] =
+							{
+								.key = "minarch_screen_offsety",
+								.name = "Offset screen Y",
+								.desc = "Offset Y pixels",
+								.default_value = 64,
+								.value = 64,
+								.count = 129,
+								.values = offset_labels,
+								.labels = offset_labels,
+							},
+						[FE_OPT_SHARPNESS] =
+							{
+								// 	.key	= "minarch_screen_sharpness",
+								.key = "minarch_scale_filter",
+								.name = "Screen Sharpness",
+								.desc =
+									"LINEAR smooths lines, but works better when final image is at higher resolution, "
+									"so either core that outputs higher resolution or upscaling with shaders",
+								.default_value = 1,
+								.value = 1,
+								.count = 3,
+								.values = sharpness_labels,
+								.labels = sharpness_labels,
+							},
+						[FE_OPT_TEARING] =
+							{
+								.key = "minarch_prevent_tearing",
+								.name = "VSync",
+								.desc = "Wait for vsync before drawing the next frame.\nLenient only waits when within "
+										"frame budget.\nStrict always waits.",
+								.default_value = VSYNC_LENIENT,
+								.value = VSYNC_LENIENT,
+								.count = 3,
+								.values = tearing_labels,
+								.labels = tearing_labels,
+							},
+						[FE_OPT_SYNC_REFERENCE] =
+							{
+								.key = "minarch_sync_reference",
+								.name = "Core Sync",
+								.desc = "Choose what should be used as a\nreference for the frame rate.\n\"Native\" "
+										"uses the emulator frame rate,\n\"Screen\" uses the frame rate of the screen.",
+								.default_value = SYNC_SRC_AUTO,
+								.value = SYNC_SRC_AUTO,
+								.count = 3,
+								.values = sync_ref_labels,
+								.labels = sync_ref_labels,
+							},
+						[FE_OPT_OVERCLOCK] =
+							{
+								.key = "minarch_cpu_speed",
+								.name = "CPU Speed",
+								.desc = "Over- or underclock the CPU to prioritize\npure performance or power savings.",
+								.default_value = 3,
+								.value = 3,
+								.count = 4,
+								.values = overclock_labels,
+								.labels = overclock_labels,
+							},
+						[FE_OPT_DEBUG] =
+							{
+								.key = "minarch_debug_hud",
+								.name = "Debug HUD",
+								.desc = "Show frames per second, cpu load,\nresolution, and scaler information.",
+								.default_value = 0,
+								.value = 0,
+								.count = 2,
+								.values = onoff_labels,
+								.labels = onoff_labels,
+							},
+						[FE_OPT_MAXFF] =
+							{
+								.key = "minarch_max_ff_speed",
+								.name = "Max FF Speed",
+								.desc = "Fast forward will not exceed the\nselected speed (but may be less\ndepending "
+										"on game and emulator).",
+								.default_value = 3, // 4x
+								.value = 3,			// 4x
+								.count = 8,
+								.values = max_ff_labels,
+								.labels = max_ff_labels,
+							},
+						[FE_OPT_FF_AUDIO] =
+							{
+								.key = "minarch__ff_audio",
+								.name = "Fast forward audio",
+								.desc = "Play or mute audio when fast forwarding.",
+								.default_value = 0,
+								.value = 0,
+								.count = 2,
+								.values = onoff_labels,
+								.labels = onoff_labels,
+							},
+						[FE_OPT_COUNT] = {NULL}}},
+	.core =
+		{
+			// (OptionList)
+			.count = 0,
+			.options =
+				(Option[]){
+					{NULL},
+				},
 		},
-	},
-	.shaders = { // (OptionList)
-		.count = 18,
-		.options = (Option[]){
-			[SH_EXTRASETTINGS] = {
-				.key	= "minarch_shaders_settings", 
-				.name	= "Optional Shaders Settings",
-				.desc	= "If shaders have extra settings they will show up in this settings menu", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 0,
-				.values = NULL,
-				.labels = NULL,
-			},
-			[SH_SHADERS_PRESET] = {
-				.key	= "minarch_shaders_preset", 
-				.name	= "Shader / Emulator Settings Preset",
-				.desc	= "Load a premade shaders/emulators config.\nTo try out a preset, exit the game without saving settings!", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 0,
-				.values = NULL,
-				.labels = NULL,
-			},
-			[SH_NROFSHADERS] = {
-				.key	= "minarch_nrofshaders", 
-				.name	= "Number of Shaders",
-				.desc	= "Number of shaders 1 to 3", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 4,
-				.values = nrofshaders_labels,
-				.labels = nrofshaders_labels,
-			},
-			
-			[SH_SHADER1] = {
-				.key	= "minarch_shader1", 
-				.name	= "Shader 1",
-				.desc	= "Shader 1 program to run", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 0,
-				.values = NULL,
-				.labels = NULL,
-			},
-			[SH_SHADER1_FILTER] = {
-				.key	= "minarch_shader1_filter", 
-				.name	= "Shader 1 Filter",
-				.desc	= "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 2,
-				.values = shfilter_labels,
-				.labels = shfilter_labels,
-			},
-			[SH_SRCTYPE1] = {
-				.key	= "minarch_shader1_srctype", 
-				.name	= "Shader 1 Source type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_SCALETYPE1] = {
-				.key	= "minarch_shader1_scaletype", 
-				.name	= "Shader 1 Texture Type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_UPSCALE1] = {
-				.key	= "minarch_shader1_upscale", 
-				.name	= "Shader 1 Scale",
-				.desc	= "This will scale images x times,\nscreen scales to screens resolution (can hit performance)", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 9,
-				.values = shupscale_labels,
-				.labels = shupscale_labels,
-			},
-			[SH_SHADER2] = {
-				.key	= "minarch_shader2", 
-				.name	= "Shader 2",
-				.desc	= "Shader 2 program to run", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 0,
-				.values = NULL,
-				.labels = NULL,
-
-			},
-			[SH_SHADER2_FILTER] = {
-				.key	= "minarch_shader2_filter", 
-				.name	= "Shader 2 Filter",
-				.desc	= "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = shfilter_labels,
-				.labels = shfilter_labels,
-			},
-			[SH_SRCTYPE2] = {
-				.key	= "minarch_shader2_srctype", 
-				.name	= "Shader 2 Source type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_SCALETYPE2] = {
-				.key	= "minarch_shader2_scaletype", 
-				.name	= "Shader 2 Texture Type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_UPSCALE2] = {
-				.key	= "minarch_shader2_upscale", 
-				.name	= "Shader 2 Scale",
-				.desc	= "This will scale images x times,\nscreen scales to screens resolution (can hit performance)", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 9,
-				.values = shupscale_labels,
-				.labels = shupscale_labels,
-			},
-			[SH_SHADER3] = {
-				.key	= "minarch_shader3", 
-				.name	= "Shader 3",
-				.desc	= "Shader 3 program to run", // will call getScreenScalingDesc()
-				.default_value = 2,
-				.value = 2,
-				.count = 0,
-				.values = NULL,
-				.labels = NULL,
-
-			},
-			[SH_SHADER3_FILTER] = {
-				.key	= "minarch_shader3_filter", 
-				.name	= "Shader 3 Filter",
-				.desc	= "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = shfilter_labels,
-				.labels = shfilter_labels,
-			},
-			[SH_SRCTYPE3] = {
-				.key	= "minarch_shader3_srctype", 
-				.name	= "Shader 3 Source type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_SCALETYPE3] = {
-				.key	= "minarch_shader3_scaletype", 
-				.name	= "Shader 3 Texture Type",
-				.desc	= "This will choose resolution source to scale from", // will call getScreenScalingDesc()
-				.default_value = 1,
-				.value = 1,
-				.count = 2,
-				.values = shscaletype_labels,
-				.labels = shscaletype_labels,
-			},
-			[SH_UPSCALE3] = {
-				.key	= "minarch_shader3_upscale", 
-				.name	= "Shader 3 Scale",
-				.desc	= "This will scale images x times,\nscreen scales to screens resolution (can hit performance)", // will call getScreenScalingDesc()
-				.default_value = 0,
-				.value = 0,
-				.count = 9,
-				.values = shupscale_labels,
-				.labels = shupscale_labels,
-			},
-			{NULL}
+	.shaders =
+		{
+			// (OptionList)
+			.count = 18,
+			.options =
+				(Option
+					 []){[SH_EXTRASETTINGS] =
+							 {
+								 .key =
+									 "minarch_shaders_settings",
+								 .name = "Optional Shaders Settings",
+								 .desc = "If shaders have extra settings they will show up in this settings menu", // will
+																												   // call
+																												   // getScreenScalingDesc()
+								 .default_value = 1,
+								 .value = 1,
+								 .count = 0,
+								 .values = NULL,
+								 .labels = NULL,
+							 },
+						 [SH_SHADERS_PRESET] =
+							 {
+								 .key =
+									 "minarch_shaders_preset",
+								 .name = "Shader / Emulator Settings Preset",
+								 .desc = "Load a premade shaders/emulators config.\nTo try out a preset, exit the game "
+										 "without saving settings!", // will call getScreenScalingDesc()
+								 .default_value = 1,
+								 .value =
+									 1,
+								 .count =
+									 0,
+								 .values = NULL,
+								 .labels = NULL,
+							 },
+						 [SH_NROFSHADERS] =
+							 {
+								 .key =
+									 "minarch_nrofshaders",
+								 .name = "Number of Shaders",
+								 .desc = "Number of shaders 1 to 3", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value =
+									 0,
+								 .count =
+									 4,
+								 .values = nrofshaders_labels,
+								 .labels = nrofshaders_labels,
+							 },
+
+						 [SH_SHADER1] =
+							 {
+								 .key =
+									 "minarch_shader1",
+								 .name = "Shader 1",
+								 .desc = "Shader 1 program to run", // will call getScreenScalingDesc()
+								 .default_value = 1,
+								 .value =
+									 1,
+								 .count =
+									 0,
+								 .values = NULL,
+								 .labels = NULL,
+							 },
+						 [SH_SHADER1_FILTER] =
+							 {
+								 .key =
+									 "minarch_shader1_filter",
+								 .name = "Shader 1 Filter",
+								 .desc = "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
+								 .default_value = 1,
+								 .value =
+									 1,
+								 .count =
+									 2,
+								 .values = shfilter_labels,
+								 .labels = shfilter_labels,
+							 },
+						 [SH_SRCTYPE1] =
+							 {
+								 .key =
+									 "minarch_shader1_srctype",
+								 .name = "Shader 1 Source type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 0,
+								 .value =
+									 0,
+								 .count =
+									 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_SCALETYPE1] =
+							 {
+								 .key =
+									 "minarch_shader1_scaletype",
+								 .name = "Shader 1 Texture Type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 1,
+								 .value =
+									 1,
+								 .count =
+									 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_UPSCALE1] =
+							 {
+								 .key =
+									 "minarch_shader1_upscale",
+								 .name = "Shader 1 Scale",
+								 .desc = "This will scale images x times,\nscreen scales to screens resolution (can "
+										 "hit performance)", // will call getScreenScalingDesc()
+								 .default_value = 1,
+								 .value =
+									 1,
+								 .count =
+									 9,
+								 .values = shupscale_labels,
+								 .labels = shupscale_labels,
+							 },
+						 [SH_SHADER2] =
+							 {
+								 .key =
+									 "minarch_shader2",
+								 .name = "Shader 2",
+								 .desc = "Shader 2 program to run", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value =
+									 0,
+								 .count =
+									 0,
+								 .values = NULL,
+								 .labels = NULL,
+
+							 },
+						 [SH_SHADER2_FILTER] =
+							 {
+								 .key =
+									 "minarch_shader2_filter",
+								 .name = "Shader 2 Filter",
+								 .desc = "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value =
+									 0,
+								 .count =
+									 2,
+								 .values = shfilter_labels,
+								 .labels = shfilter_labels,
+							 },
+						 [SH_SRCTYPE2] =
+							 {
+								 .key =
+									 "minarch_shader2_srctype",
+								 .name = "Shader 2 Source type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 0,
+								 .value = 0,
+								 .count = 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_SCALETYPE2] =
+							 {
+								 .key =
+									 "minarch_shader2_scaletype",
+								 .name = "Shader 2 Texture Type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 1,
+								 .value = 1,
+								 .count = 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_UPSCALE2] =
+							 {
+								 .key =
+									 "minarch_shader2_upscale",
+								 .name = "Shader 2 Scale",
+								 .desc = "This will scale images x times,\nscreen scales to screens resolution (can "
+										 "hit performance)", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value = 0,
+								 .count = 9,
+								 .values = shupscale_labels,
+								 .labels = shupscale_labels,
+							 },
+						 [SH_SHADER3] =
+							 {
+								 .key =
+									 "minarch_shader3",
+								 .name = "Shader 3",
+								 .desc = "Shader 3 program to run", // will call getScreenScalingDesc()
+								 .default_value = 2,
+								 .value = 2,
+								 .count = 0,
+								 .values = NULL,
+								 .labels = NULL,
+
+							 },
+						 [SH_SHADER3_FILTER] =
+							 {
+								 .key =
+									 "minarch_shader3_filter",
+								 .name = "Shader 3 Filter",
+								 .desc = "Method of upscaling, NEAREST or LINEAR", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value = 0,
+								 .count = 2,
+								 .values = shfilter_labels,
+								 .labels = shfilter_labels,
+							 },
+						 [SH_SRCTYPE3] =
+							 {
+								 .key =
+									 "minarch_shader3_srctype",
+								 .name = "Shader 3 Source type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 0,
+								 .value = 0,
+								 .count = 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_SCALETYPE3] =
+							 {
+								 .key = "minarch_shader3_scaletype",
+								 .name = "Shader 3 Texture Type",
+								 .desc = "This will choose resolution source to scale from", // will call
+																							 // getScreenScalingDesc()
+								 .default_value = 1,
+								 .value = 1,
+								 .count = 2,
+								 .values = shscaletype_labels,
+								 .labels = shscaletype_labels,
+							 },
+						 [SH_UPSCALE3] =
+							 {
+								 .key = "minarch_shader3_upscale",
+								 .name = "Shader 3 Scale",
+								 .desc = "This will scale images x times,\nscreen scales to screens resolution (can "
+										 "hit performance)", // will call getScreenScalingDesc()
+								 .default_value = 0,
+								 .value = 0,
+								 .count = 9,
+								 .values = shupscale_labels,
+								 .labels = shupscale_labels,
+							 },
+						 {NULL}},
 		},
-	},
 	.shaderpragmas = {{
 		.count = 0,
 		.options = NULL,
 	}},
 	.controls = default_button_mapping,
-	.shortcuts = (ButtonMapping[]){
-		[SHORTCUT_SAVE_STATE]			= {"Save State",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_LOAD_STATE]			= {"Load State",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_RESET_GAME]			= {"Reset Game",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_SAVE_QUIT]			= {"Save & Quit",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_CYCLE_SCALE]			= {"Cycle Scaling",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_CYCLE_EFFECT]			= {"Cycle Effect",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_FF]			= {"Toggle FF",			-1, BTN_ID_NONE, 0},
-		[SHORTCUT_HOLD_FF]				= {"Hold FF",			-1, BTN_ID_NONE, 0},
-		[SHORTCUT_GAMESWITCHER]			= {"Game Switcher",		-1, BTN_ID_NONE, 0},
-		[SHORTCUT_SCREENSHOT]           = {"Screenshot",        -1, BTN_ID_NONE, 0},
-		// Trimui only
-		[SHORTCUT_TOGGLE_TURBO_A]		= {"Toggle Turbo A",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_B]		= {"Toggle Turbo B",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_X]		= {"Toggle Turbo X",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_Y]		= {"Toggle Turbo Y",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_L]		= {"Toggle Turbo L",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_L2]		= {"Toggle Turbo L2",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_R]		= {"Toggle Turbo R",	-1, BTN_ID_NONE, 0},
-		[SHORTCUT_TOGGLE_TURBO_R2]		= {"Toggle Turbo R2",	-1, BTN_ID_NONE, 0},
-		// -----
-		{NULL}
-	},
+	.shortcuts = (ButtonMapping[]){[SHORTCUT_SAVE_STATE] = {"Save State", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_LOAD_STATE] = {"Load State", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_RESET_GAME] = {"Reset Game", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_SAVE_QUIT] = {"Save & Quit", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_CYCLE_SCALE] = {"Cycle Scaling", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_CYCLE_EFFECT] = {"Cycle Effect", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_FF] = {"Toggle FF", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_HOLD_FF] = {"Hold FF", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_GAMESWITCHER] = {"Game Switcher", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_SCREENSHOT] = {"Screenshot", -1, BTN_ID_NONE, 0},
+								   // Trimui only
+								   [SHORTCUT_TOGGLE_TURBO_A] = {"Toggle Turbo A", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_B] = {"Toggle Turbo B", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_X] = {"Toggle Turbo X", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_Y] = {"Toggle Turbo Y", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_L] = {"Toggle Turbo L", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_L2] = {"Toggle Turbo L2", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_R] = {"Toggle Turbo R", -1, BTN_ID_NONE, 0},
+								   [SHORTCUT_TOGGLE_TURBO_R2] = {"Toggle Turbo R2", -1, BTN_ID_NONE, 0},
+								   // -----
+								   {NULL}},
 };
-static int Config_getValue(char* cfg, const char* key, char* out_value, int* lock) { // gets value from string
-	char* tmp = cfg;
+static int Config_getValue(char *cfg, const char *key, char *out_value, int *lock)
+{ // gets value from string
+	char *tmp = cfg;
 	while ((tmp = strstr(tmp, key))) {
-		if (lock!=NULL && tmp>cfg && *(tmp-1)=='-') *lock = 1; // prefixed with a `-` means lock
+		if (lock != NULL && tmp > cfg && *(tmp - 1) == '-')
+			*lock = 1; // prefixed with a `-` means lock
 		tmp += strlen(key);
-		if (!strncmp(tmp, " = ", 3)) break; // matched
+		if (!strncmp(tmp, " = ", 3))
+			break; // matched
 	};
-	if (!tmp) return 0;
+	if (!tmp)
+		return 0;
 	tmp += 3;
-	
+
 	strncpy(out_value, tmp, 256);
 	out_value[256 - 1] = '\0';
 	tmp = strchr(out_value, '\n');
-	if (!tmp) tmp = strchr(out_value, '\r');
-	if (tmp) *tmp = '\0';
+	if (!tmp)
+		tmp = strchr(out_value, '\r');
+	if (tmp)
+		*tmp = '\0';
 
 	// LOG_info("\t%s = %s (%s)\n", key, out_value, (lock && *lock) ? "hidden":"shown");
 	return 1;
 }
 
 
-
-
-
-static void setOverclock(int i) {
-    overclock = i;
-    switch (i) {
-        case 0: {
-			useAutoCpu = 0;
-            PWR_setCPUSpeed(CPU_SPEED_POWERSAVE);
-            break;
-		}
-        case 1:  {
-			useAutoCpu = 0;
-            PWR_setCPUSpeed(CPU_SPEED_NORMAL);
-            break;
-		}
-        case 2:  {
-			useAutoCpu = 0;
-            PWR_setCPUSpeed(CPU_SPEED_PERFORMANCE);
-            break;
-		}
-        case 3:  {
-            PWR_setCPUSpeed(CPU_SPEED_NORMAL);
-			useAutoCpu = 1;
-            break;
-		}
-    }
+static void setOverclock(int i)
+{
+	overclock = i;
+	switch (i) {
+	case 0: {
+		useAutoCpu = 0;
+		PWR_setCPUSpeed(CPU_SPEED_POWERSAVE);
+		break;
+	}
+	case 1: {
+		useAutoCpu = 0;
+		PWR_setCPUSpeed(CPU_SPEED_NORMAL);
+		break;
+	}
+	case 2: {
+		useAutoCpu = 0;
+		PWR_setCPUSpeed(CPU_SPEED_PERFORMANCE);
+		break;
+	}
+	case 3: {
+		PWR_setCPUSpeed(CPU_SPEED_NORMAL);
+		useAutoCpu = 1;
+		break;
+	}
+	}
 }
 static int toggle_thread = 0;
 static int shadersreload = 0;
-static void Config_syncFrontend(char* key, int value) {
+static void Config_syncFrontend(char *key, int value)
+{
 	int i = -1;
-	if (exactMatch(key,config.frontend.options[FE_OPT_SCALING].key)) {
-		screen_scaling 	= value;
-		
+	if (exactMatch(key, config.frontend.options[FE_OPT_SCALING].key)) {
+		screen_scaling = value;
+
 		renderer.dst_p = 0;
 		i = FE_OPT_SCALING;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_RESAMPLING].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_RESAMPLING].key)) {
 		resampling_quality = value;
 		SND_setQuality(resampling_quality);
 		i = FE_OPT_RESAMPLING;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_AMBIENT].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_AMBIENT].key)) {
 		ambient_mode = value;
-		if(ambient_mode > 0)
+		if (ambient_mode > 0)
 			LEDS_pushProfileOverride(LIGHT_PROFILE_AMBIENT);
-		else 
+		else
 			LEDS_popProfileOverride(LIGHT_PROFILE_AMBIENT);
 		i = FE_OPT_AMBIENT;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_EFFECT].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_EFFECT].key)) {
 		screen_effect = value;
 		GFX_setEffect(value);
 		renderer.dst_p = 0;
 		i = FE_OPT_EFFECT;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_OVERLAY].key)) {
-		char** overlayList = config.frontend.options[FE_OPT_OVERLAY].values;
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_OVERLAY].key)) {
+		char **overlayList = config.frontend.options[FE_OPT_OVERLAY].values;
 		if (overlayList) {
-			
 			int count = 0;
-			while (overlayList && overlayList[count]) count++;
+			while (overlayList && overlayList[count])
+				count++;
 			if (value >= 0 && value < count) {
 				LOG_info("minarch: updating overlay - %s\n", overlayList[value]);
 				GFX_setOverlay(overlayList[value], core.tag);
@@ -2037,130 +1931,127 @@ static void Config_syncFrontend(char* key, int value) {
 				i = FE_OPT_OVERLAY;
 			}
 		}
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_SCREENX].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_SCREENX].key)) {
 		screenx = value;
 		GFX_setOffsetX(value);
 		i = FE_OPT_SCREENX;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_SCREENY].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_SCREENY].key)) {
 		screeny = value;
 		GFX_setOffsetY(value);
 		i = FE_OPT_SCREENY;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_SHARPNESS].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_SHARPNESS].key)) {
 		GFX_setSharpness(value);
 		i = FE_OPT_SHARPNESS;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_TEARING].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_TEARING].key)) {
 		prevent_tearing = value;
 		i = FE_OPT_TEARING;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_SYNC_REFERENCE].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_SYNC_REFERENCE].key)) {
 		sync_ref = value;
 		i = FE_OPT_SYNC_REFERENCE;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_OVERCLOCK].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_OVERCLOCK].key)) {
 		overclock = value;
 		i = FE_OPT_OVERCLOCK;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_DEBUG].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_DEBUG].key)) {
 		show_debug = value;
 		i = FE_OPT_DEBUG;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_MAXFF].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_MAXFF].key)) {
 		max_ff_speed = value;
 		i = FE_OPT_MAXFF;
-	}
-	else if (exactMatch(key,config.frontend.options[FE_OPT_FF_AUDIO].key)) {
+	} else if (exactMatch(key, config.frontend.options[FE_OPT_FF_AUDIO].key)) {
 		ff_audio = value;
 		i = FE_OPT_FF_AUDIO;
 	}
-	if (i==-1) return;
-	Option* option = &config.frontend.options[i];
+	if (i == -1)
+		return;
+	Option *option = &config.frontend.options[i];
 	option->value = value;
 }
 
-char** list_files_in_folder(const char* folderPath, int* fileCount, const char* extensionFilter) {
-    DIR* dir = opendir(folderPath);
-    if (!dir) {
-        perror("opendir");
-        return NULL;
-    }
-
-    struct dirent* entry;
-    struct stat fileStat;
-    char** fileList = NULL;
-    *fileCount = 0;
-
-    while ((entry = readdir(dir)) != NULL) {
-        char fullPath[1024];
-        snprintf(fullPath, sizeof(fullPath), "%s/%s", folderPath, entry->d_name);
-
-        if (stat(fullPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode)) {
-            if (extensionFilter) {
-                const char* ext = strrchr(entry->d_name, '.');
-                if (!ext || strcmp(ext, extensionFilter) != 0) {
-                    continue;
-                }
-            }
-
-            char** temp = realloc(fileList, sizeof(char*) * (*fileCount + 2)); 
-            if (!temp) {
-                perror("realloc");
-                for (int i = 0; i < *fileCount; ++i) {
-                    free(fileList[i]);
-                }
-                free(fileList);
-                closedir(dir);
-                return NULL;
-            }
-            fileList = temp;
-            fileList[*fileCount] = strdup(entry->d_name);
-            fileList[*fileCount + 1] = NULL;
-            (*fileCount)++;
-        }
-    }
-
-    closedir(dir);
-
-    // Alphabetical sort
-    for (int i = 0; i < *fileCount - 1; ++i) {
-        for (int j = i + 1; j < *fileCount; ++j) {
-            if (strcmp(fileList[i], fileList[j]) > 0) {
-                char* temp = fileList[i];
-                fileList[i] = fileList[j];
-                fileList[j] = temp;
-            }
-        }
-    }
-
-    return fileList;
-}
-
-
-
-
-static void OptionList_setOptionValue(OptionList* list, const char* key, const char* value);
+char **list_files_in_folder(const char *folderPath, int *fileCount, const char *extensionFilter)
+{
+	DIR *dir = opendir(folderPath);
+	if (!dir) {
+		perror("opendir");
+		return NULL;
+	}
+
+	struct dirent *entry;
+	struct stat fileStat;
+	char **fileList = NULL;
+	*fileCount = 0;
+
+	while ((entry = readdir(dir)) != NULL) {
+		char fullPath[1024];
+		snprintf(fullPath, sizeof(fullPath), "%s/%s", folderPath, entry->d_name);
+
+		if (stat(fullPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode)) {
+			if (extensionFilter) {
+				const char *ext = strrchr(entry->d_name, '.');
+				if (!ext || strcmp(ext, extensionFilter) != 0) {
+					continue;
+				}
+			}
+
+			char **temp = realloc(fileList, sizeof(char *) * (*fileCount + 2));
+			if (!temp) {
+				perror("realloc");
+				for (int i = 0; i < *fileCount; ++i) {
+					free(fileList[i]);
+				}
+				free(fileList);
+				closedir(dir);
+				return NULL;
+			}
+			fileList = temp;
+			fileList[*fileCount] = strdup(entry->d_name);
+			fileList[*fileCount + 1] = NULL;
+			(*fileCount)++;
+		}
+	}
+
+	closedir(dir);
+
+	// Alphabetical sort
+	for (int i = 0; i < *fileCount - 1; ++i) {
+		for (int j = i + 1; j < *fileCount; ++j) {
+			if (strcmp(fileList[i], fileList[j]) > 0) {
+				char *temp = fileList[i];
+				fileList[i] = fileList[j];
+				fileList[j] = temp;
+			}
+		}
+	}
+
+	return fileList;
+}
+
+
+static void OptionList_setOptionValue(OptionList *list, const char *key, const char *value);
 enum {
 	CONFIG_WRITE_ALL,
 	CONFIG_WRITE_GAME,
 };
-static void Config_getPath(char* filename, int override) {
+static void Config_getPath(char *filename, int override)
+{
 	char device_tag[64] = {0};
-	if (config.device_tag) sprintf(device_tag,"-%s",config.device_tag);
-	if (override) sprintf(filename, "%s/%s%s.cfg", core.config_dir, game.alt_name, device_tag);
-	else sprintf(filename, "%s/minarch%s.cfg", core.config_dir, device_tag);
+	if (config.device_tag)
+		sprintf(device_tag, "-%s", config.device_tag);
+	if (override)
+		sprintf(filename, "%s/%s%s.cfg", core.config_dir, game.alt_name, device_tag);
+	else
+		sprintf(filename, "%s/minarch%s.cfg", core.config_dir, device_tag);
 	LOG_info("Config_getPath %s\n", filename);
 }
-static void Config_init(void) {
-	if (!config.default_cfg || config.initialized) return;
-	
+static void Config_init(void)
+{
+	if (!config.default_cfg || config.initialized)
+		return;
+
 	LOG_info("Config_init\n");
-	char* tmp = config.default_cfg;
-	char* tmp2;
-	char* key;
-	
+	char *tmp = config.default_cfg;
+	char *tmp2;
+	char *key;
+
 	char button_name[128];
 	char button_id[128];
 	int i = 0;
@@ -2168,61 +2059,65 @@ static void Config_init(void) {
 		tmp += 5; // tmp now points to the button name (plus the rest of the line)
 		key = tmp;
 		tmp = strstr(tmp, " = ");
-		if (!tmp) break;
-		
-		int len = tmp-key;
+		if (!tmp)
+			break;
+
+		int len = tmp - key;
 		strncpy(button_name, key, len);
 		button_name[len] = '\0';
-		
+
 		tmp += 3;
 		strncpy(button_id, tmp, 128);
 		tmp2 = strchr(button_id, '\n');
-		if (!tmp2) tmp2 = strchr(button_id, '\r');
-		if (tmp2) *tmp2 = '\0';
-		
+		if (!tmp2)
+			tmp2 = strchr(button_id, '\r');
+		if (tmp2)
+			*tmp2 = '\0';
+
 		int retro_id = -1;
 		int local_id = -1;
-		
+
 		tmp2 = strrchr(button_id, ':');
 		int remap = 0;
 		if (tmp2) {
-			for (int j=0; button_label_mapping[j].name; j++) {
-				ButtonMapping* button = &button_label_mapping[j];
-				if (!strcmp(tmp2+1,button->name)) {
+			for (int j = 0; button_label_mapping[j].name; j++) {
+				ButtonMapping *button = &button_label_mapping[j];
+				if (!strcmp(tmp2 + 1, button->name)) {
 					retro_id = button->retro;
 					break;
 				}
 			}
 			*tmp2 = '\0';
 		}
-		for (int j=0; button_label_mapping[j].name; j++) {
-			ButtonMapping* button = &button_label_mapping[j];
-			if (!strcmp(button_id,button->name)) {
+		for (int j = 0; button_label_mapping[j].name; j++) {
+			ButtonMapping *button = &button_label_mapping[j];
+			if (!strcmp(button_id, button->name)) {
 				local_id = button->local;
-				if (retro_id==-1) retro_id = button->retro;
+				if (retro_id == -1)
+					retro_id = button->retro;
 				break;
 			}
 		}
-		
+
 		tmp += strlen(button_id); // prepare to continue search
-		
+
 		LOG_info("\tbind %s (%s) %i:%i\n", button_name, button_id, local_id, retro_id);
-		
+
 		// TODO: test this without a final line return
-		tmp2 = calloc(strlen(button_name)+1, sizeof(char));
+		tmp2 = calloc(strlen(button_name) + 1, sizeof(char));
 		strcpy(tmp2, button_name);
-		ButtonMapping* button = &core_button_mapping[i++];
+		ButtonMapping *button = &core_button_mapping[i++];
 		button->name = tmp2;
 		button->retro = retro_id;
 		button->local = local_id;
 	};
-	
+
 	// populate shader options
 	int filecount;
-	char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount,NULL);
+	char **filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount, NULL);
 	int preset_filecount;
-	char** preset_filelist = list_files_in_folder(SHADERS_FOLDER, &preset_filecount,".cfg");
-	
+	char **preset_filelist = list_files_in_folder(SHADERS_FOLDER, &preset_filecount, ".cfg");
+
 	config.shaders.options[SH_SHADER1].values = filelist;
 	config.shaders.options[SH_SHADER2].values = filelist;
 	config.shaders.options[SH_SHADER3].values = filelist;
@@ -2237,14 +2132,14 @@ static void Config_init(void) {
 	config.shaders.options[SH_SHADER2].count = filecount;
 	config.shaders.options[SH_SHADER3].count = filecount;
 	config.shaders.options[SH_SHADERS_PRESET].count = preset_filecount;
-	
+
 	char overlaypath[255];
 	snprintf(overlaypath, sizeof(overlaypath), "%s/%s", OVERLAYS_FOLDER, core.tag);
-	char** overlaylist = list_files_in_folder(overlaypath, &filecount,NULL);
+	char **overlaylist = list_files_in_folder(overlaypath, &filecount, NULL);
 
 	if (overlaylist) {
 		int newcount = filecount + 1;
-		char** newlist = malloc(sizeof(char*) * (newcount + 1)); // +1 for NULL terminator
+		char **newlist = malloc(sizeof(char *) * (newcount + 1)); // +1 for NULL terminator
 		if (!newlist) {
 			LOG_info("failed to make newlist");
 			return;
@@ -2253,9 +2148,9 @@ static void Config_init(void) {
 			newlist[i + 1] = overlaylist[i];
 		}
 
-		newlist[0] = strdup("None");  
-		newlist[newcount] = NULL;  
-		
+		newlist[0] = strdup("None");
+		newlist[newcount] = NULL;
+
 		free(overlaylist);
 
 		overlaylist = newlist;
@@ -2267,103 +2162,116 @@ static void Config_init(void) {
 	}
 	config.initialized = 1;
 }
-static void Config_quit(void) {
-	if (!config.initialized) return;
-	for (int i=0; core_button_mapping[i].name; i++) {
+static void Config_quit(void)
+{
+	if (!config.initialized)
+		return;
+	for (int i = 0; core_button_mapping[i].name; i++) {
 		free(core_button_mapping[i].name);
 	}
 }
-static void Config_readOptionsString(char* cfg) {
-	if (!cfg) return;
+static void Config_readOptionsString(char *cfg)
+{
+	if (!cfg)
+		return;
 
 	LOG_info("Config_readOptions\n");
 	char key[256];
 	char value[256];
-	for (int i=0; config.frontend.options[i].key; i++) {
-		Option* option = &config.frontend.options[i];
-		if (!Config_getValue(cfg, option->key, value, &option->lock)) continue;
+	for (int i = 0; config.frontend.options[i].key; i++) {
+		Option *option = &config.frontend.options[i];
+		if (!Config_getValue(cfg, option->key, value, &option->lock))
+			continue;
 		OptionList_setOptionValue(&config.frontend, option->key, value);
 		Config_syncFrontend(option->key, option->value);
 	}
-	
-	if (has_custom_controllers && Config_getValue(cfg,"minarch_gamepad_type",value,NULL)) {
+
+	if (has_custom_controllers && Config_getValue(cfg, "minarch_gamepad_type", value, NULL)) {
 		gamepad_type = strtol(value, NULL, 0);
 		int device = strtol(gamepad_values[gamepad_type], NULL, 0);
 		core.set_controller_port_device(0, device);
 	}
-	for (int i=0; config.core.options[i].key; i++) {
-		Option* option = &config.core.options[i];
+	for (int i = 0; config.core.options[i].key; i++) {
+		Option *option = &config.core.options[i];
 		// LOG_info("%s\n",option->key);
-		if (!Config_getValue(cfg, option->key, value, &option->lock)) continue;
+		if (!Config_getValue(cfg, option->key, value, &option->lock))
+			continue;
 		OptionList_setOptionValue(&config.core, option->key, value);
 	}
-	for (int i=0; config.shaders.options[i].key; i++) {
-		Option* option = &config.shaders.options[i];
-		if (!Config_getValue(cfg, option->key, value, &option->lock)) continue;
+	for (int i = 0; config.shaders.options[i].key; i++) {
+		Option *option = &config.shaders.options[i];
+		if (!Config_getValue(cfg, option->key, value, &option->lock))
+			continue;
 		OptionList_setOptionValue(&config.shaders, option->key, value);
 	}
-	for (int y=0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
-		if(config.shaderpragmas[y].count > 0) {
-			for (int i=0; config.shaderpragmas[y].options[i].key; i++) {
-				Option* option = &config.shaderpragmas[y].options[i];
-				if (!Config_getValue(cfg, option->key, value, &option->lock)) continue;
+	for (int y = 0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
+		if (config.shaderpragmas[y].count > 0) {
+			for (int i = 0; config.shaderpragmas[y].options[i].key; i++) {
+				Option *option = &config.shaderpragmas[y].options[i];
+				if (!Config_getValue(cfg, option->key, value, &option->lock))
+					continue;
 				OptionList_setOptionValue(&config.shaderpragmas[y], option->key, value);
 			}
 		}
 	}
 }
-static void Config_readControlsString(char* cfg) {
-	if (!cfg) return;
+static void Config_readControlsString(char *cfg)
+{
+	if (!cfg)
+		return;
 
 	LOG_info("Config_readControlsString\n");
-	
+
 	char key[256];
 	char value[256];
-	char* tmp;
-	for (int i=0; config.controls[i].name; i++) {
-		ButtonMapping* mapping = &config.controls[i];
+	char *tmp;
+	for (int i = 0; config.controls[i].name; i++) {
+		ButtonMapping *mapping = &config.controls[i];
 		sprintf(key, "bind %s", mapping->name);
 		sprintf(value, "NONE");
-		
-		if (!Config_getValue(cfg, key, value, NULL)) continue;
-		if ((tmp = strrchr(value, ':'))) *tmp = '\0'; // this is a binding artifact in default.cfg, ignore
-		
+
+		if (!Config_getValue(cfg, key, value, NULL))
+			continue;
+		if ((tmp = strrchr(value, ':')))
+			*tmp = '\0'; // this is a binding artifact in default.cfg, ignore
+
 		int id = -1;
-		for (int j=0; button_labels[j]; j++) {
-			if (!strcmp(button_labels[j],value)) {
+		for (int j = 0; button_labels[j]; j++) {
+			if (!strcmp(button_labels[j], value)) {
 				id = j - 1;
 				break;
 			}
 		}
 		// LOG_info("\t%s (%i)\n", value, id);
-		
+
 		int mod = 0;
-		if (id>=LOCAL_BUTTON_COUNT) {
+		if (id >= LOCAL_BUTTON_COUNT) {
 			id -= LOCAL_BUTTON_COUNT;
 			mod = 1;
 		}
-		
+
 		mapping->local = id;
 		mapping->mod = mod;
 	}
-	
-	for (int i=0; config.shortcuts[i].name; i++) {
-		ButtonMapping* mapping = &config.shortcuts[i];
+
+	for (int i = 0; config.shortcuts[i].name; i++) {
+		ButtonMapping *mapping = &config.shortcuts[i];
 		sprintf(key, "bind %s", mapping->name);
 		sprintf(value, "NONE");
 
-		if (!Config_getValue(cfg, key, value, NULL)) continue;
-		
+		if (!Config_getValue(cfg, key, value, NULL))
+			continue;
+
 		int id = -1;
-		for (int j=0; button_labels[j]; j++) {
-			if (!strcmp(button_labels[j],value)) {
+		for (int j = 0; button_labels[j]; j++) {
+			if (!strcmp(button_labels[j], value)) {
 				id = j - 1;
 				break;
 			}
 		}
-		
+
 		int mod = 0;
-		if (id>=LOCAL_BUTTON_COUNT) {
+		if (id >= LOCAL_BUTTON_COUNT) {
 			id -= LOCAL_BUTTON_COUNT;
 			mod = 1;
 		}
@@ -2373,225 +2281,249 @@ static void Config_readControlsString(char* cfg) {
 		mapping->mod = mod;
 	}
 }
-static void Config_load(void) {
+static void Config_load(void)
+{
 	LOG_info("Config_load\n");
-	
+
 	config.device_tag = getenv("DEVICE");
 	LOG_info("config.device_tag %s\n", config.device_tag);
-	
+
 	// update for crop overscan support
-	Option* scaling_option = &config.frontend.options[FE_OPT_SCALING];
+	Option *scaling_option = &config.frontend.options[FE_OPT_SCALING];
 	scaling_option->desc = getScreenScalingDesc();
 	scaling_option->count = getScreenScalingCount();
 	if (!GFX_supportsOverscan()) {
 		scaling_labels[4] = NULL;
 	}
-	
-	char* system_path = SYSTEM_PATH "/system.cfg";
-	
+
+	char *system_path = SYSTEM_PATH "/system.cfg";
+
 	char device_system_path[MAX_PATH] = {0};
-	if (config.device_tag) sprintf(device_system_path, SYSTEM_PATH "/system-%s.cfg", config.device_tag);
-	
+	if (config.device_tag)
+		sprintf(device_system_path, SYSTEM_PATH "/system-%s.cfg", config.device_tag);
+
 	if (config.device_tag && exists(device_system_path)) {
 		LOG_info("usng device_system_path: %s\n", device_system_path);
 		config.system_cfg = allocFile(device_system_path);
-	}
-	else if (exists(system_path)) config.system_cfg = allocFile(system_path);
-	else config.system_cfg = NULL;
-	
-	
-	
+	} else if (exists(system_path))
+		config.system_cfg = allocFile(system_path);
+	else
+		config.system_cfg = NULL;
+
+
 	// LOG_info("config.system_cfg: %s\n", config.system_cfg);
-	
+
 	char default_path[MAX_PATH];
 	getEmuPath((char *)core.tag, default_path);
-	char* tmp = strrchr(default_path, '/');
-	strcpy(tmp,"/default.cfg");
+	char *tmp = strrchr(default_path, '/');
+	strcpy(tmp, "/default.cfg");
 
 	char device_default_path[MAX_PATH] = {0};
 	if (config.device_tag) {
 		getEmuPath((char *)core.tag, device_default_path);
 		tmp = strrchr(device_default_path, '/');
 		char filename[64];
-		sprintf(filename,"/default-%s.cfg", config.device_tag);
-		strcpy(tmp,filename);
+		sprintf(filename, "/default-%s.cfg", config.device_tag);
+		strcpy(tmp, filename);
 	}
-	
+
 	if (config.device_tag && exists(device_default_path)) {
 		LOG_info("usng device_default_path: %s\n", device_default_path);
 		config.default_cfg = allocFile(device_default_path);
-	}
-	else if (exists(default_path)) config.default_cfg = allocFile(default_path);
-	else config.default_cfg = NULL;
-	
+	} else if (exists(default_path))
+		config.default_cfg = allocFile(default_path);
+	else
+		config.default_cfg = NULL;
+
 	// LOG_info("config.default_cfg: %s\n", config.default_cfg);
-	
+
 	char path[MAX_PATH];
 	config.loaded = CONFIG_NONE;
 	int override = 0;
 	Config_getPath(path, CONFIG_WRITE_GAME);
-	if (exists(path)) override = 1; 
-	if (!override) Config_getPath(path, CONFIG_WRITE_ALL);
-	
+	if (exists(path))
+		override = 1;
+	if (!override)
+		Config_getPath(path, CONFIG_WRITE_ALL);
+
 	config.user_cfg = allocFile(path);
-	if (!config.user_cfg) return;
-	
+	if (!config.user_cfg)
+		return;
+
 	LOG_info("using user config: %s\n", path);
-	
+
 	config.loaded = override ? CONFIG_GAME : CONFIG_CONSOLE;
 }
-static void Config_free(void) {
-	if (config.system_cfg) free(config.system_cfg);
-	if (config.default_cfg) free(config.default_cfg);
-	if (config.user_cfg) free(config.user_cfg);
-}
-static void Config_readOptions(void) {
+static void Config_free(void)
+{
+	if (config.system_cfg)
+		free(config.system_cfg);
+	if (config.default_cfg)
+		free(config.default_cfg);
+	if (config.user_cfg)
+		free(config.user_cfg);
+}
+static void Config_readOptions(void)
+{
 	Config_readOptionsString(config.system_cfg);
 	Config_readOptionsString(config.default_cfg);
 	Config_readOptionsString(config.user_cfg);
 }
-static void Config_readControls(void) {
+static void Config_readControls(void)
+{
 	Config_readControlsString(config.default_cfg);
 	Config_readControlsString(config.user_cfg);
 }
-static void Config_write(int override) {
+static void Config_write(int override)
+{
 	char path[MAX_PATH];
 	// sprintf(path, "%s/%s.cfg", core.config_dir, game.alt_name);
 	Config_getPath(path, CONFIG_WRITE_GAME);
-	
+
 	if (!override) {
-		if (config.loaded==CONFIG_GAME) unlink(path);
+		if (config.loaded == CONFIG_GAME)
+			unlink(path);
 		Config_getPath(path, CONFIG_WRITE_ALL);
 	}
 	config.loaded = override ? CONFIG_GAME : CONFIG_CONSOLE;
-	
+
 	FILE *file = fopen(path, "wb");
-	if (!file) return;
-	
-	for (int i=0; config.frontend.options[i].key; i++) {
-		Option* option = &config.frontend.options[i];
+	if (!file)
+		return;
+
+	for (int i = 0; config.frontend.options[i].key; i++) {
+		Option *option = &config.frontend.options[i];
 		int count = 0;
-		while ( option->values &&  option->values[count]) count++;
+		while (option->values && option->values[count])
+			count++;
 		if (option->value >= 0 && option->value < count) {
 			fprintf(file, "%s = %s\n", option->key, option->values[option->value]);
 		}
 	}
-	for (int i=0; config.core.options[i].key; i++) {
-		Option* option = &config.core.options[i];
+	for (int i = 0; config.core.options[i].key; i++) {
+		Option *option = &config.core.options[i];
 		fprintf(file, "%s = %s\n", option->key, option->values[option->value]);
 	}
-	for (int i=0; config.shaders.options[i].key; i++) {
-		Option* option = &config.shaders.options[i];
+	for (int i = 0; config.shaders.options[i].key; i++) {
+		Option *option = &config.shaders.options[i];
 		int count = 0;
-		while ( option->values &&  option->values[count]) count++;
+		while (option->values && option->values[count])
+			count++;
 		if (option->value >= 0 && option->value < count) {
 			fprintf(file, "%s = %s\n", option->key, option->values[option->value]);
 		}
 	}
-	for (int y=0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
-		for (int i=0; config.shaderpragmas[y].options[i].key; i++) {
-			Option* option = &config.shaderpragmas[y].options[i];
+	for (int y = 0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
+		for (int i = 0; config.shaderpragmas[y].options[i].key; i++) {
+			Option *option = &config.shaderpragmas[y].options[i];
 			int count = 0;
-			while ( option->values &&  option->values[count]) count++;
+			while (option->values && option->values[count])
+				count++;
 			if (option->value >= 0 && option->value < count) {
 				fprintf(file, "%s = %s\n", option->key, option->values[option->value]);
 			}
 		}
 	}
-	
-	if (has_custom_controllers) fprintf(file, "%s = %i\n", "minarch_gamepad_type", gamepad_type);
-	
-	for (int i=0; config.controls[i].name; i++) {
-		ButtonMapping* mapping = &config.controls[i];
+
+	if (has_custom_controllers)
+		fprintf(file, "%s = %i\n", "minarch_gamepad_type", gamepad_type);
+
+	for (int i = 0; config.controls[i].name; i++) {
+		ButtonMapping *mapping = &config.controls[i];
 		int j = mapping->local + 1;
-		if (mapping->mod) j += LOCAL_BUTTON_COUNT;
+		if (mapping->mod)
+			j += LOCAL_BUTTON_COUNT;
 		fprintf(file, "bind %s = %s\n", mapping->name, button_labels[j]);
 	}
-	for (int i=0; config.shortcuts[i].name; i++) {
-		ButtonMapping* mapping = &config.shortcuts[i];
+	for (int i = 0; config.shortcuts[i].name; i++) {
+		ButtonMapping *mapping = &config.shortcuts[i];
 		int j = mapping->local + 1;
-		if (mapping->mod) j += LOCAL_BUTTON_COUNT;
+		if (mapping->mod)
+			j += LOCAL_BUTTON_COUNT;
 		fprintf(file, "bind %s = %s\n", mapping->name, button_labels[j]);
 	}
-	
+
 	fclose(file);
 	sync();
 }
-static void Config_restore(void) {
+static void Config_restore(void)
+{
 	char path[MAX_PATH];
-	if (config.loaded==CONFIG_GAME) {
-		if (config.device_tag) sprintf(path, "%s/%s-%s.cfg", core.config_dir, game.alt_name, config.device_tag);
-		else sprintf(path, "%s/%s.cfg", core.config_dir, game.alt_name);
+	if (config.loaded == CONFIG_GAME) {
+		if (config.device_tag)
+			sprintf(path, "%s/%s-%s.cfg", core.config_dir, game.alt_name, config.device_tag);
+		else
+			sprintf(path, "%s/%s.cfg", core.config_dir, game.alt_name);
 		unlink(path);
 		LOG_info("deleted game config: %s\n", path);
-	}
-	else if (config.loaded==CONFIG_CONSOLE) {
-		if (config.device_tag) sprintf(path, "%s/minarch-%s.cfg", core.config_dir, config.device_tag);
-		else sprintf(path, "%s/minarch.cfg", core.config_dir);
+	} else if (config.loaded == CONFIG_CONSOLE) {
+		if (config.device_tag)
+			sprintf(path, "%s/minarch-%s.cfg", core.config_dir, config.device_tag);
+		else
+			sprintf(path, "%s/minarch.cfg", core.config_dir);
 		unlink(path);
 		LOG_info("deleted console config: %s\n", path);
 	}
 	config.loaded = CONFIG_NONE;
-	
-	for (int i=0; config.frontend.options[i].key; i++) {
-		Option* option = &config.frontend.options[i];
+
+	for (int i = 0; config.frontend.options[i].key; i++) {
+		Option *option = &config.frontend.options[i];
 		option->value = option->default_value;
 		Config_syncFrontend(option->key, option->value);
 	}
-	for (int i=0; config.core.options[i].key; i++) {
-		Option* option = &config.core.options[i];
+	for (int i = 0; config.core.options[i].key; i++) {
+		Option *option = &config.core.options[i];
 		option->value = option->default_value;
 	}
-	for (int i=0; config.shaders.options[i].key; i++) {
-		Option* option = &config.shaders.options[i];
+	for (int i = 0; config.shaders.options[i].key; i++) {
+		Option *option = &config.shaders.options[i];
 		option->value = option->default_value;
 	}
 	config.core.changed = 1; // let the core know
-	
+
 	if (has_custom_controllers) {
 		gamepad_type = 0;
 		core.set_controller_port_device(0, RETRO_DEVICE_JOYPAD);
 	}
 
-	for (int i=0; config.controls[i].name; i++) {
-		ButtonMapping* mapping = &config.controls[i];
+	for (int i = 0; config.controls[i].name; i++) {
+		ButtonMapping *mapping = &config.controls[i];
 		mapping->local = mapping->default_;
 		mapping->mod = 0;
 	}
-	for (int i=0; config.shortcuts[i].name; i++) {
-		ButtonMapping* mapping = &config.shortcuts[i];
+	for (int i = 0; config.shortcuts[i].name; i++) {
+		ButtonMapping *mapping = &config.shortcuts[i];
 		mapping->local = BTN_ID_NONE;
 		mapping->mod = 0;
 	}
-	
+
 	Config_load();
 	Config_readOptions();
 	Config_readControls();
 	Config_free();
-	
+
 	renderer.dst_p = 0;
 }
 
-void readShadersPreset(int i) {
-		char shaderspath[MAX_PATH] = {0};
-		sprintf(shaderspath, SHADERS_FOLDER "/%s", config.shaders.options[SH_SHADERS_PRESET].values[i]);
-		LOG_info("read shaders preset %s\n",shaderspath);
-		if (exists(shaderspath)) {
-			config.shaders_preset = allocFile(shaderspath);
-			Config_readOptionsString(config.shaders_preset);
-		}
-		else config.shaders_preset = NULL;
-		
-
-		
-}
-void loadShaderSettings(int i) {
+void readShadersPreset(int i)
+{
+	char shaderspath[MAX_PATH] = {0};
+	sprintf(shaderspath, SHADERS_FOLDER "/%s", config.shaders.options[SH_SHADERS_PRESET].values[i]);
+	LOG_info("read shaders preset %s\n", shaderspath);
+	if (exists(shaderspath)) {
+		config.shaders_preset = allocFile(shaderspath);
+		Config_readOptionsString(config.shaders_preset);
+	} else
+		config.shaders_preset = NULL;
+}
+void loadShaderSettings(int i)
+{
 	int menucount = 0;
 	config.shaderpragmas[i].options = calloc(32 + 1, sizeof(Option));
 	ShaderParam *params = PLAT_getShaderPragmas(i);
-	if(params == NULL) return;
+	if (params == NULL)
+		return;
 	for (int j = 0; j < 32; j++) {
-	
 		if (params[j].step == 0.0f) {
 			// Prevent division by zero; skip this parameter or set steps to 1
 			continue;
@@ -2605,7 +2537,7 @@ void loadShaderSettings(int i) {
 		config.shaderpragmas[i].options[menucount].name = params[j].name;
 		config.shaderpragmas[i].options[menucount].desc = params[j].name;
 		config.shaderpragmas[i].options[menucount].default_value = params[j].def;
-		
+
 		int steps = (int)((params[j].max - params[j].min) / params[j].step) + 1;
 		config.shaderpragmas[i].options[menucount].values = malloc(sizeof(char *) * (steps + 1));
 		config.shaderpragmas[i].options[menucount].labels = malloc(sizeof(char *) * (steps + 1));
@@ -2622,138 +2554,146 @@ void loadShaderSettings(int i) {
 		config.shaderpragmas[i].options[menucount].values[steps] = NULL;
 		config.shaderpragmas[i].options[menucount].labels[steps] = NULL;
 		menucount++;
-		
 	}
 	config.shaderpragmas[i].count = menucount;
 }
 
-static void Config_syncShaders(char* key, int value) {
+static void Config_syncShaders(char *key, int value)
+{
 	int i = -1;
-	if (exactMatch(key,config.shaders.options[SH_SHADERS_PRESET].key)) {
+	if (exactMatch(key, config.shaders.options[SH_SHADERS_PRESET].key)) {
 		readShadersPreset(value);
 		i = SH_SHADERS_PRESET;
 	}
-	if (exactMatch(key,config.shaders.options[SH_NROFSHADERS].key)) {
+	if (exactMatch(key, config.shaders.options[SH_NROFSHADERS].key)) {
 		GFX_setShaders(value);
 		shadersreload = 1;
 		i = SH_NROFSHADERS;
 	}
 
 	if (exactMatch(key, config.shaders.options[SH_SHADER1].key)) {
-		char** shaderList = config.shaders.options[SH_SHADER1].values;
+		char **shaderList = config.shaders.options[SH_SHADER1].values;
 		if (shaderList) {
-			LOG_info("minarch: updating shader 1 - %i\n",value);
+			LOG_info("minarch: updating shader 1 - %i\n", value);
 			int count = 0;
-			while (shaderList && shaderList[count]) count++;
+			while (shaderList && shaderList[count])
+				count++;
 			if (value >= 0 && value < count) {
-				GFX_updateShader(0, shaderList[value], NULL, NULL,NULL,NULL);
+				GFX_updateShader(0, shaderList[value], NULL, NULL, NULL, NULL);
 				i = SH_SHADER1;
-			} 
+			}
 		}
 		loadShaderSettings(0);
 	}
-	if (exactMatch(key,config.shaders.options[SH_SHADER1_FILTER].key)) {
-		GFX_updateShader(0,NULL,NULL,&value,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SHADER1_FILTER].key)) {
+		GFX_updateShader(0, NULL, NULL, &value, NULL, NULL);
 		i = SH_SHADER1_FILTER;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SRCTYPE1].key)) {
-		GFX_updateShader(0,NULL,NULL,NULL,NULL,&value);
+	if (exactMatch(key, config.shaders.options[SH_SRCTYPE1].key)) {
+		GFX_updateShader(0, NULL, NULL, NULL, NULL, &value);
 		i = SH_SRCTYPE1;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SCALETYPE1].key)) {
-		GFX_updateShader(0,NULL,NULL,NULL,&value,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SCALETYPE1].key)) {
+		GFX_updateShader(0, NULL, NULL, NULL, &value, NULL);
 		i = SH_SCALETYPE1;
 	}
-	if (exactMatch(key,config.shaders.options[SH_UPSCALE1].key)) {
-		GFX_updateShader(0,NULL,&value,NULL,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_UPSCALE1].key)) {
+		GFX_updateShader(0, NULL, &value, NULL, NULL, NULL);
 		i = SH_UPSCALE1;
 	}
 	if (exactMatch(key, config.shaders.options[SH_SHADER2].key)) {
-		char** shaderList = config.shaders.options[SH_SHADER2].values;
+		char **shaderList = config.shaders.options[SH_SHADER2].values;
 		if (shaderList) {
-			LOG_info("minarch: updating shader 2 - %i\n",value);
+			LOG_info("minarch: updating shader 2 - %i\n", value);
 			int count = 0;
-			while (shaderList && shaderList[count]) count++;
+			while (shaderList && shaderList[count])
+				count++;
 			if (value >= 0 && value < count) {
-				GFX_updateShader(1, shaderList[value], NULL, NULL,NULL,NULL);
+				GFX_updateShader(1, shaderList[value], NULL, NULL, NULL, NULL);
 				i = SH_SHADER2;
 			}
 		}
 		loadShaderSettings(1);
 	}
-	if (exactMatch(key,config.shaders.options[SH_SHADER2_FILTER].key)) {
-		GFX_updateShader(1,NULL,NULL,&value,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SHADER2_FILTER].key)) {
+		GFX_updateShader(1, NULL, NULL, &value, NULL, NULL);
 		i = SH_SHADER2_FILTER;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SRCTYPE2].key)) {
-		GFX_updateShader(1,NULL,NULL,NULL,NULL,&value);
+	if (exactMatch(key, config.shaders.options[SH_SRCTYPE2].key)) {
+		GFX_updateShader(1, NULL, NULL, NULL, NULL, &value);
 		i = SH_SRCTYPE2;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SCALETYPE2].key)) {
-		GFX_updateShader(1,NULL,NULL,NULL,&value,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SCALETYPE2].key)) {
+		GFX_updateShader(1, NULL, NULL, NULL, &value, NULL);
 		i = SH_SCALETYPE2;
 	}
-	if (exactMatch(key,config.shaders.options[SH_UPSCALE2].key)) {
-		GFX_updateShader(1,NULL,&value,NULL,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_UPSCALE2].key)) {
+		GFX_updateShader(1, NULL, &value, NULL, NULL, NULL);
 		i = SH_UPSCALE2;
 	}
 	if (exactMatch(key, config.shaders.options[SH_SHADER3].key)) {
-		char** shaderList = config.shaders.options[SH_SHADER3].values;
+		char **shaderList = config.shaders.options[SH_SHADER3].values;
 		if (shaderList) {
-			LOG_info("minarch: updating shader 3 - %i\n",value);
+			LOG_info("minarch: updating shader 3 - %i\n", value);
 			int count = 0;
-			while (shaderList && shaderList[count]) count++;
+			while (shaderList && shaderList[count])
+				count++;
 			if (value >= 0 && value < count) {
-				GFX_updateShader(2, shaderList[value], NULL, NULL,NULL,NULL);
+				GFX_updateShader(2, shaderList[value], NULL, NULL, NULL, NULL);
 				i = SH_SHADER3;
 			}
 		}
 		loadShaderSettings(2);
 	}
-	if (exactMatch(key,config.shaders.options[SH_SHADER3_FILTER].key)) {
-		GFX_updateShader(2,NULL,NULL,&value,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SHADER3_FILTER].key)) {
+		GFX_updateShader(2, NULL, NULL, &value, NULL, NULL);
 		i = SH_SHADER3_FILTER;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SRCTYPE3].key)) {
-		GFX_updateShader(2,NULL,NULL,NULL,NULL,&value);
+	if (exactMatch(key, config.shaders.options[SH_SRCTYPE3].key)) {
+		GFX_updateShader(2, NULL, NULL, NULL, NULL, &value);
 		i = SH_SRCTYPE3;
 	}
-	if (exactMatch(key,config.shaders.options[SH_SCALETYPE3].key)) {
-		GFX_updateShader(2,NULL,NULL,NULL,&value,NULL);
+	if (exactMatch(key, config.shaders.options[SH_SCALETYPE3].key)) {
+		GFX_updateShader(2, NULL, NULL, NULL, &value, NULL);
 		i = SH_SCALETYPE3;
 	}
-	if (exactMatch(key,config.shaders.options[SH_UPSCALE3].key)) {
-		GFX_updateShader(2,NULL,&value,NULL,NULL,NULL);
+	if (exactMatch(key, config.shaders.options[SH_UPSCALE3].key)) {
+		GFX_updateShader(2, NULL, &value, NULL, NULL, NULL);
 		i = SH_UPSCALE3;
 	}
-	
-	if (i==-1) return;
-	Option* option = &config.shaders.options[i];
+
+	if (i == -1)
+		return;
+	Option *option = &config.shaders.options[i];
 	option->value = value;
 	shadersreload = 1;
 }
 
 ////////
 
-void applyShaderSettings() {
-	for (int y=0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
+void applyShaderSettings()
+{
+	for (int y = 0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
 		ShaderParam *params = PLAT_getShaderPragmas(y);
 		if (params == NULL) {
 			break;
 		}
-		for (int i=0; i < config.shaderpragmas[y].count; i++) {
+		for (int i = 0; i < config.shaderpragmas[y].count; i++) {
 			for (int j = 0; j < 32; j++) {
 				if (exactMatch(params[j].name, config.shaderpragmas[y].options[i].key)) {
-					params[j].value = strtof(config.shaderpragmas[y].options[i].values[config.shaderpragmas[y].options[i].value], NULL);
+					params[j].value = strtof(
+						config.shaderpragmas[y].options[i].values[config.shaderpragmas[y].options[i].value], NULL);
 				}
 			}
 		}
 	}
 }
-void initShaders() {
-	for (int i=0; config.shaders.options[i].key; i++) {
-		if(i!=SH_SHADERS_PRESET) {
-			Option* option = &config.shaders.options[i];;
+void initShaders()
+{
+	for (int i = 0; config.shaders.options[i].key; i++) {
+		if (i != SH_SHADERS_PRESET) {
+			Option *option = &config.shaders.options[i];
+			;
 			Config_syncShaders(option->key, option->value);
 		}
 	}
@@ -2764,87 +2704,100 @@ void initShaders() {
 static struct Special {
 	int palette_updated;
 } special;
-static void Special_updatedDMGPalette(int frames) {
+static void Special_updatedDMGPalette(int frames)
+{
 	// LOG_info("Special_updatedDMGPalette(%i)\n", frames);
 	special.palette_updated = frames; // must wait a few frames
 }
-static void Special_refreshDMGPalette(void) {
+static void Special_refreshDMGPalette(void)
+{
 	special.palette_updated -= 1;
-	if (special.palette_updated>0) return;
-	
+	if (special.palette_updated > 0)
+		return;
+
 	int rgb = getInt("/tmp/dmg_grid_color");
 	GFX_setEffectColor(rgb);
 }
-static void Special_init(void) {
-	if (special.palette_updated>1) special.palette_updated = 1;
+static void Special_init(void)
+{
+	if (special.palette_updated > 1)
+		special.palette_updated = 1;
 	// else if (exactMatch((char*)core.tag, "GBC"))  {
 	// 	putInt("/tmp/dmg_grid_color",0xF79E);
 	// 	special.palette_updated = 1;
 	// }
 }
-static void Special_render(void) {
-	if (special.palette_updated) Special_refreshDMGPalette();
+static void Special_render(void)
+{
+	if (special.palette_updated)
+		Special_refreshDMGPalette();
 }
-static void Special_quit(void) {
+static void Special_quit(void)
+{
 	system("rm -f /tmp/dmg_grid_color");
 }
 ///////////////////////////////
 
-static  int Option_getValueIndex(Option* item, const char* value) {
-	if (!value || !item || !item->values) return 0;
+static int Option_getValueIndex(Option *item, const char *value)
+{
+	if (!value || !item || !item->values)
+		return 0;
 	int i = 0;
 	while (item->values[i]) {
-		if (!strcmp(item->values[i], value)) return i;
+		if (!strcmp(item->values[i], value))
+			return i;
 		i++;
 	}
 	return 0;
 }
-static void Option_setValue(Option* item, const char* value) {
+static void Option_setValue(Option *item, const char *value)
+{
 	// TODO: store previous value?
 	item->value = Option_getValueIndex(item, value);
 }
 
 // TODO: does this also need to be applied to OptionList_vars()?
-static const char* option_key_name[] = {
-	"pcsx_rearmed_analog_combo", "DualShock Toggle Combo",
-	NULL
-};
-static const char* getOptionNameFromKey(const char* key, const char* name) {
-	char* _key = NULL;
-	for (int i=0; (_key = (char*)option_key_name[i]); i+=2) {
-		if (exactMatch((char*)key,_key)) return option_key_name[i+1];
+static const char *option_key_name[] = {"pcsx_rearmed_analog_combo", "DualShock Toggle Combo", NULL};
+static const char *getOptionNameFromKey(const char *key, const char *name)
+{
+	char *_key = NULL;
+	for (int i = 0; (_key = (char *)option_key_name[i]); i += 2) {
+		if (exactMatch((char *)key, _key))
+			return option_key_name[i + 1];
 	}
 	return name;
 }
 
 // the following 3 functions always touch config.core, the rest can operate on arbitrary OptionLists
-static void OptionList_init(const struct retro_core_option_definition *defs) {
+static void OptionList_init(const struct retro_core_option_definition *defs)
+{
 	LOG_info("OptionList_init\n");
 	int count;
-	for (count=0; defs[count].key; count++);
-	
+	for (count = 0; defs[count].key; count++)
+		;
+
 	// LOG_info("count: %i\n", count);
-	
+
 	// TODO: add frontend options to this? so the can use the same override method? eg. minarch_*
 
 	config.core.count = count;
 	config.core.categories = NULL; // There is no categories in v1 definition
 	if (count) {
-		config.core.options = calloc(count+1, sizeof(Option));
-		
-		for (int i=0; i<config.core.count; i++) {
+		config.core.options = calloc(count + 1, sizeof(Option));
+
+		for (int i = 0; i < config.core.count; i++) {
 			int len;
 			const struct retro_core_option_definition *def = &defs[i];
-			Option* item = &config.core.options[i];
+			Option *item = &config.core.options[i];
 			len = strlen(def->key) + 1;
-		
+
 			item->key = calloc(len, sizeof(char));
 			strcpy(item->key, def->key);
-			
+
 			len = strlen(def->desc) + 1;
 			item->name = calloc(len, sizeof(char));
-			strcpy(item->name, getOptionNameFromKey(def->key,def->desc));
-			
+			strcpy(item->name, getOptionNameFromKey(def->key, def->desc));
+
 			if (def->info) {
 				len = strlen(def->info) + 1;
 				item->desc = calloc(len, sizeof(char));
@@ -2853,176 +2806,184 @@ static void OptionList_init(const struct retro_core_option_definition *defs) {
 				item->full = calloc(len, sizeof(char));
 				strncpy(item->full, item->desc, len);
 				// item->desc[len-1] = '\0';
-				
-				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2*PADDING), 2);
-				GFX_wrapText(font.medium, item->full, DEVICE_WIDTH - SCALE1(2*PADDING), 16);
+
+				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2 * PADDING), 2);
+				GFX_wrapText(font.medium, item->full, DEVICE_WIDTH - SCALE1(2 * PADDING), 16);
 			}
-		
-			for (count=0; def->values[count].value; count++);
-		
+
+			for (count = 0; def->values[count].value; count++)
+				;
+
 			item->count = count;
-			item->values = calloc(count+1, sizeof(char*));
-			item->labels = calloc(count+1, sizeof(char*));
-	
-			for (int j=0; j<count; j++) {
-				const char* value = def->values[j].value;
-				const char* label = def->values[j].label;
-		
+			item->values = calloc(count + 1, sizeof(char *));
+			item->labels = calloc(count + 1, sizeof(char *));
+
+			for (int j = 0; j < count; j++) {
+				const char *value = def->values[j].value;
+				const char *label = def->values[j].label;
+
 				len = strlen(value) + 1;
 				item->values[j] = calloc(len, sizeof(char));
 				strcpy(item->values[j], value);
-		
+
 				if (label) {
 					len = strlen(label) + 1;
 					item->labels[j] = calloc(len, sizeof(char));
 					strcpy(item->labels[j], label);
-				}
-				else {
+				} else {
 					item->labels[j] = item->values[j];
 				}
 				// printf("\t%s\n", item->labels[j]);
 			}
-			
+
 			item->value = Option_getValueIndex(item, def->default_value);
 			item->default_value = item->value;
-			
-			// LOG_info("\tINIT %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value], item->values[item->value]);
+
+			// LOG_info("\tINIT %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value],
+			// item->values[item->value]);
 		}
 	}
 	// fflush(stdout);
 }
 
-static void OptionList_v2_init(const struct retro_core_options_v2 *opt_defs) {
+static void OptionList_v2_init(const struct retro_core_options_v2 *opt_defs)
+{
 	LOG_info("OptionList_v2_init\n");
-	struct retro_core_option_v2_category   *cats = opt_defs->categories;
+	struct retro_core_option_v2_category *cats = opt_defs->categories;
 	struct retro_core_option_v2_definition *defs = opt_defs->definitions;
 
 	int cat_count = 0;
-	while (cats[cat_count].key) cat_count++;
+	while (cats[cat_count].key)
+		cat_count++;
 
 	int count = 0;
-	while (defs[count].key) count++;
-	
+	while (defs[count].key)
+		count++;
+
 	// LOG_info("%i categories, %i options\n", cat_count, count);
-	
+
 	// TODO: add frontend options to this? so the can use the same override method? eg. minarch_*
-	
+
 	if (cat_count) {
 		config.core.categories = calloc(cat_count + 1, sizeof(OptionCategory));
 
-		for (int i=0; i<cat_count; i++) {
+		for (int i = 0; i < cat_count; i++) {
 			const struct retro_core_option_v2_category *cat = &cats[i];
-			OptionCategory* item = &config.core.categories[i];
+			OptionCategory *item = &config.core.categories[i];
 
-			item->key  = strdup(cat->key);
+			item->key = strdup(cat->key);
 			item->desc = strdup(cat->desc);
 			item->info = cat->info ? strdup(cat->info) : NULL;
 			printf("CATEGORY %s\n", item->key);
 		}
-	}
-	else {
+	} else {
 		config.core.categories = NULL;
 	}
 
 	config.core.count = count;
 	if (count) {
-		config.core.options = calloc(count+1, sizeof(Option));
-		
-		for (int i=0; i<config.core.count; i++) {
+		config.core.options = calloc(count + 1, sizeof(Option));
+
+		for (int i = 0; i < config.core.count; i++) {
 			const struct retro_core_option_v2_definition *def = &defs[i];
-			Option* item = &config.core.options[i];
-		
+			Option *item = &config.core.options[i];
+
 			item->key = strdup(def->key);
-			item->name = strdup(getOptionNameFromKey(def->key, def->desc_categorized ? def->desc_categorized : def->desc));
+			item->name =
+				strdup(getOptionNameFromKey(def->key, def->desc_categorized ? def->desc_categorized : def->desc));
 			item->category = def->category_key ? strdup(def->category_key) : NULL;
 
 			if (def->info) {
 				item->desc = strdup(def->info);
 				item->full = strdup(item->desc);
-				
-				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2*PADDING), 2);
-				GFX_wrapText(font.medium, item->full, DEVICE_WIDTH - SCALE1(2*PADDING), 16);
+
+				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2 * PADDING), 2);
+				GFX_wrapText(font.medium, item->full, DEVICE_WIDTH - SCALE1(2 * PADDING), 16);
 			}
-		
-			for (count=0; def->values[count].value; count++);
-		
+
+			for (count = 0; def->values[count].value; count++)
+				;
+
 			item->count = count;
-			item->values = calloc(count+1, sizeof(char*));
-			item->labels = calloc(count+1, sizeof(char*));
-	
-			for (int j=0; j<count; j++) {
-				const char* value = def->values[j].value;
-				const char* label = def->values[j].label;
-		
+			item->values = calloc(count + 1, sizeof(char *));
+			item->labels = calloc(count + 1, sizeof(char *));
+
+			for (int j = 0; j < count; j++) {
+				const char *value = def->values[j].value;
+				const char *label = def->values[j].label;
+
 				item->values[j] = strdup(value);
-		
+
 				if (label) {
 					item->labels[j] = strdup(label);
-				}
-				else {
+				} else {
 					item->labels[j] = item->values[j];
 				}
 				// printf("\t%s\n", item->labels[j]);
 			}
-			
+
 			item->value = Option_getValueIndex(item, def->default_value);
 			item->default_value = item->value;
-			
-			// LOG_info("\tINIT %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value], item->values[item->value]);
+
+			// LOG_info("\tINIT %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value],
+			// item->values[item->value]);
 		}
 	}
 	// fflush(stdout);
 }
 
-static void OptionList_vars(const struct retro_variable *vars) {
+static void OptionList_vars(const struct retro_variable *vars)
+{
 	LOG_info("OptionList_vars\n");
 	int count;
-	for (count=0; vars[count].key; count++);
-	
+	for (count = 0; vars[count].key; count++)
+		;
+
 	config.core.count = count;
 	if (count) {
-		config.core.options = calloc(count+1, sizeof(Option));
-	
-		for (int i=0; i<config.core.count; i++) {
+		config.core.options = calloc(count + 1, sizeof(Option));
+
+		for (int i = 0; i < config.core.count; i++) {
 			int len;
 			const struct retro_variable *var = &vars[i];
-			Option* item = &config.core.options[i];
+			Option *item = &config.core.options[i];
 
 			len = strlen(var->key) + 1;
 			item->key = calloc(len, sizeof(char));
 			strcpy(item->key, var->key);
-			
+
 			len = strlen(var->value) + 1;
 			item->var = calloc(len, sizeof(char));
 			strcpy(item->var, var->value);
-			
-			char* tmp = strchr(item->var, ';');
-			if (tmp && *(tmp+1)==' ') {
+
+			char *tmp = strchr(item->var, ';');
+			if (tmp && *(tmp + 1) == ' ') {
 				*tmp = '\0';
 				item->name = item->var;
 				tmp += 2;
 			}
-			
-			char* opt = tmp;
-			for (count=0; (tmp=strchr(tmp, '|')); tmp++, count++);
+
+			char *opt = tmp;
+			for (count = 0; (tmp = strchr(tmp, '|')); tmp++, count++)
+				;
 			count += 1; // last entry after final '|'
-		
+
 			item->count = count;
-			item->values = calloc(count+1, sizeof(char*));
-			item->labels = calloc(count+1, sizeof(char*));
+			item->values = calloc(count + 1, sizeof(char *));
+			item->labels = calloc(count + 1, sizeof(char *));
 
 			tmp = opt;
 			int j;
-			for (j=0; (tmp=strchr(tmp, '|')); j++) {
+			for (j = 0; (tmp = strchr(tmp, '|')); j++) {
 				item->values[j] = opt;
 				item->labels[j] = opt;
 				*tmp = '\0';
 				tmp += 1;
-				opt = tmp; 
+				opt = tmp;
 			}
 			item->values[j] = opt;
 			item->labels[j] = opt;
-			
+
 			// no native default_value support for retro vars
 			item->value = 0;
 			item->default_value = item->value;
@@ -3031,23 +2992,27 @@ static void OptionList_vars(const struct retro_variable *vars) {
 	}
 	// fflush(stdout);
 }
-static void OptionList_reset(void) {
-	if (!config.core.count) return;
-	
-	for (int i=0; i<config.core.count; i++) {
-		Option* item = &config.core.options[i];
+static void OptionList_reset(void)
+{
+	if (!config.core.count)
+		return;
+
+	for (int i = 0; i < config.core.count; i++) {
+		Option *item = &config.core.options[i];
 		if (item->var) {
 			// values/labels are all points to var
 			// so no need to free individually
 			free(item->var);
-		}
-		else {
-			if (item->desc) free(item->desc);
-			if (item->full) free(item->full);
-			for (int j=0; j<item->count; j++) {
-				char* value = item->values[j];
-				char* label = item->labels[j];
-				if (label!=value) free(label);
+		} else {
+			if (item->desc)
+				free(item->desc);
+			if (item->full)
+				free(item->full);
+			for (int j = 0; j < item->count; j++) {
+				char *value = item->values[j];
+				char *label = item->labels[j];
+				if (label != value)
+					free(label);
 				free(value);
 			}
 		}
@@ -3056,24 +3021,30 @@ static void OptionList_reset(void) {
 		free(item->key);
 		free(item->name);
 	}
-	if (config.core.enabled_options) free(config.core.enabled_options);
+	if (config.core.enabled_options)
+		free(config.core.enabled_options);
 	config.core.enabled_count = 0;
 	free(config.core.options);
 }
 
-static Option* OptionList_getOption(OptionList* list, const char* key) {
-	for (int i=0; i<list->count; i++) {
-		Option* item = &list->options[i];
-		if (!strcmp(item->key, key)) return item;
+static Option *OptionList_getOption(OptionList *list, const char *key)
+{
+	for (int i = 0; i < list->count; i++) {
+		Option *item = &list->options[i];
+		if (!strcmp(item->key, key))
+			return item;
 	}
 	return NULL;
 }
-static char* OptionList_getOptionValue(OptionList* list, const char* key) {
-	Option* item = OptionList_getOption(list, key);
-	// if (item) LOG_info("\tGET %s (%s) = %s (%s)\n", item->name, item->key, item->labels[item->value], item->values[item->value]);
+static char *OptionList_getOptionValue(OptionList *list, const char *key)
+{
+	Option *item = OptionList_getOption(list, key);
+	// if (item) LOG_info("\tGET %s (%s) = %s (%s)\n", item->name, item->key, item->labels[item->value],
+	// item->values[item->value]);
 	if (item) {
 		int count = 0;
-		while ( item->values && item->values[count]) count++;
+		while (item->values && item->values[count])
+			count++;
 		if (item->value >= 0 && item->value < count) {
 			return item->values[item->value];
 		}
@@ -3081,34 +3052,42 @@ static char* OptionList_getOptionValue(OptionList* list, const char* key) {
 	// else LOG_warn("unknown option %s \n", key);
 	return NULL;
 }
-static void OptionList_setOptionRawValue(OptionList* list, const char* key, int value) {
-	Option* item = OptionList_getOption(list, key);
+static void OptionList_setOptionRawValue(OptionList *list, const char *key, int value)
+{
+	Option *item = OptionList_getOption(list, key);
 	if (item) {
 		item->value = value;
 		list->changed = 1;
-		// LOG_info("\tRAW SET %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value], item->values[item->value]);
-		// if (list->on_set) list->on_set(list, key);
+		// LOG_info("\tRAW SET %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value],
+		// item->values[item->value]); if (list->on_set) list->on_set(list, key);
 
-		if (exactMatch((char*)core.tag, "GB") && containsString(item->key, "palette")) Special_updatedDMGPalette(3); // from options
-	}
-	else LOG_info("unknown option %s \n", key);
+		if (exactMatch((char *)core.tag, "GB") && containsString(item->key, "palette"))
+			Special_updatedDMGPalette(3); // from options
+	} else
+		LOG_info("unknown option %s \n", key);
 }
-static void OptionList_setOptionValue(OptionList* list, const char* key, const char* value) {
-	Option* item = OptionList_getOption(list, key);
+static void OptionList_setOptionValue(OptionList *list, const char *key, const char *value)
+{
+	Option *item = OptionList_getOption(list, key);
 	if (item) {
 		Option_setValue(item, value);
 		list->changed = 1;
-		// LOG_info("\tSET %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value], item->values[item->value]);
-		// if (list->on_set) list->on_set(list, key);
-		
-		if (exactMatch((char*)core.tag, "GB") && containsString(item->key, "palette")) Special_updatedDMGPalette(2); // from core
-	}
-	else LOG_info("unknown option %s \n", key);
+		// LOG_info("\tSET %s (%s) TO %s (%s)\n", item->name, item->key, item->labels[item->value],
+		// item->values[item->value]); if (list->on_set) list->on_set(list, key);
+
+		if (exactMatch((char *)core.tag, "GB") && containsString(item->key, "palette"))
+			Special_updatedDMGPalette(2); // from core
+	} else
+		LOG_info("unknown option %s \n", key);
 }
-static void OptionList_setOptionVisibility(OptionList* list, const char* key, int visible) {
-	Option* item = OptionList_getOption(list, key);
-	if (item) item->hidden = !visible;
-	else printf("unknown option %s \n", key); fflush(stdout);
+static void OptionList_setOptionVisibility(OptionList *list, const char *key, int visible)
+{
+	Option *item = OptionList_getOption(list, key);
+	if (item)
+		item->hidden = !visible;
+	else
+		printf("unknown option %s \n", key);
+	fflush(stdout);
 }
 
 ///////////////////////////////
@@ -3121,14 +3100,16 @@ static void Menu_screenshot(void);
 static void Menu_saveState(void);
 static void Menu_loadState(void);
 
-static int setFastForward(int enable) {
+static int setFastForward(int enable)
+{
 	fast_forward = enable;
 	return enable;
 }
 
 static uint32_t buttons = 0; // RETRO_DEVICE_ID_JOYPAD_* buttons
 static int ignore_menu = 0;
-static void input_poll_callback(void) {
+static void input_poll_callback(void)
+{
 	PAD_poll();
 
 	int show_setting = 0;
@@ -3148,106 +3129,127 @@ static void input_poll_callback(void) {
 		Menu_saveState();
 		putFile(GAME_SWITCHER_PERSIST_PATH, game.path + strlen(SDCARD_PATH));
 		GFX_clear(screen);
-		
 	}
-	
+
 	if (PAD_justPressed(BTN_POWER)) {
-		
-	}
-	else if (PAD_justReleased(BTN_POWER)) {
-		
+	} else if (PAD_justReleased(BTN_POWER)) {
 	}
-	
+
 	static int toggled_ff_on = 0; // this logic only works because TOGGLE_FF is before HOLD_FF in the menu...
-	for (int i=0; i<SHORTCUT_COUNT; i++) {
-		ButtonMapping* mapping = &config.shortcuts[i];
+	for (int i = 0; i < SHORTCUT_COUNT; i++) {
+		ButtonMapping *mapping = &config.shortcuts[i];
 		int btn = 1 << mapping->local;
-		if (btn==BTN_NONE) continue; // not bound
+		if (btn == BTN_NONE)
+			continue; // not bound
 		if (!mapping->mod || PAD_isPressed(BTN_MENU)) {
-			if (i==SHORTCUT_TOGGLE_FF) {
+			if (i == SHORTCUT_TOGGLE_FF) {
 				if (PAD_justPressed(btn)) {
 					toggled_ff_on = setFastForward(!fast_forward);
-					if (mapping->mod) ignore_menu = 1;
+					if (mapping->mod)
+						ignore_menu = 1;
 					break;
-				}
-				else if (PAD_justReleased(btn)) {
-					if (mapping->mod) ignore_menu = 1;
+				} else if (PAD_justReleased(btn)) {
+					if (mapping->mod)
+						ignore_menu = 1;
 					break;
 				}
-			}
-			else if (i==SHORTCUT_HOLD_FF) {
-				// don't allow turn off fast_forward with a release of the hold button 
+			} else if (i == SHORTCUT_HOLD_FF) {
+				// don't allow turn off fast_forward with a release of the hold button
 				// if it was initially turned on with the toggle button
 				if (PAD_justPressed(btn) || (!toggled_ff_on && PAD_justReleased(btn))) {
 					fast_forward = setFastForward(PAD_isPressed(btn));
-					if (mapping->mod) ignore_menu = 1; // very unlikely but just in case
+					if (mapping->mod)
+						ignore_menu = 1; // very unlikely but just in case
 				}
 			}
 			// Trimui only
-			else if (PLAT_canTurbo() && i>=SHORTCUT_TOGGLE_TURBO_A && i<=SHORTCUT_TOGGLE_TURBO_R2) {
+			else if (PLAT_canTurbo() && i >= SHORTCUT_TOGGLE_TURBO_A && i <= SHORTCUT_TOGGLE_TURBO_R2) {
 				if (PAD_justPressed(btn)) {
-					switch(i) {
-						case SHORTCUT_TOGGLE_TURBO_A:  PLAT_toggleTurbo(BTN_ID_A); break;
-						case SHORTCUT_TOGGLE_TURBO_B:  PLAT_toggleTurbo(BTN_ID_B); break;
-						case SHORTCUT_TOGGLE_TURBO_X:  PLAT_toggleTurbo(BTN_ID_X); break;
-						case SHORTCUT_TOGGLE_TURBO_Y:  PLAT_toggleTurbo(BTN_ID_Y); break;
-						case SHORTCUT_TOGGLE_TURBO_L:  PLAT_toggleTurbo(BTN_ID_L1); break;
-						case SHORTCUT_TOGGLE_TURBO_L2: PLAT_toggleTurbo(BTN_ID_L2); break;
-						case SHORTCUT_TOGGLE_TURBO_R:  PLAT_toggleTurbo(BTN_ID_R1); break;
-						case SHORTCUT_TOGGLE_TURBO_R2: PLAT_toggleTurbo(BTN_ID_R2); break;
-						default: break;
-					}
-					break;
-				}
-				else if (PAD_justReleased(btn)) {
-					break;
-				}
-			}
-			else if (PAD_justPressed(btn)) {
-				switch (i) {
-					case SHORTCUT_SAVE_STATE: 
-						newScreenshot = 1;
-						Menu_saveState(); 
+					switch (i) {
+					case SHORTCUT_TOGGLE_TURBO_A:
+						PLAT_toggleTurbo(BTN_ID_A);
+						break;
+					case SHORTCUT_TOGGLE_TURBO_B:
+						PLAT_toggleTurbo(BTN_ID_B);
+						break;
+					case SHORTCUT_TOGGLE_TURBO_X:
+						PLAT_toggleTurbo(BTN_ID_X);
 						break;
-					case SHORTCUT_LOAD_STATE: Menu_loadState(); break;
-					case SHORTCUT_SCREENSHOT:
-						Menu_screenshot();
+					case SHORTCUT_TOGGLE_TURBO_Y:
+						PLAT_toggleTurbo(BTN_ID_Y);
 						break;
-					case SHORTCUT_RESET_GAME: core.reset(); break;
-					case SHORTCUT_SAVE_QUIT:
-						newScreenshot = 1;
-						quit = 1;
-						Menu_saveState();
+					case SHORTCUT_TOGGLE_TURBO_L:
+						PLAT_toggleTurbo(BTN_ID_L1);
 						break;
-					case SHORTCUT_GAMESWITCHER:
-						newScreenshot = 1;
-						quit = 1;
-						Menu_saveState();
-						putFile(GAME_SWITCHER_PERSIST_PATH, game.path + strlen(SDCARD_PATH));
+					case SHORTCUT_TOGGLE_TURBO_L2:
+						PLAT_toggleTurbo(BTN_ID_L2);
 						break;
-					case SHORTCUT_CYCLE_SCALE:
-						screen_scaling += 1;
-						int count = config.frontend.options[FE_OPT_SCALING].count;
-						if (screen_scaling>=count) screen_scaling -= count;
-						Config_syncFrontend(config.frontend.options[FE_OPT_SCALING].key, screen_scaling);
+					case SHORTCUT_TOGGLE_TURBO_R:
+						PLAT_toggleTurbo(BTN_ID_R1);
 						break;
-					case SHORTCUT_CYCLE_EFFECT:
-						screen_effect += 1;
-						if (screen_effect>=EFFECT_COUNT) screen_effect -= EFFECT_COUNT;
-						Config_syncFrontend(config.frontend.options[FE_OPT_EFFECT].key, screen_effect);
+					case SHORTCUT_TOGGLE_TURBO_R2:
+						PLAT_toggleTurbo(BTN_ID_R2);
 						break;
-					default: break;
+					default:
+						break;
+					}
+					break;
+				} else if (PAD_justReleased(btn)) {
+					break;
+				}
+			} else if (PAD_justPressed(btn)) {
+				switch (i) {
+				case SHORTCUT_SAVE_STATE:
+					newScreenshot = 1;
+					Menu_saveState();
+					break;
+				case SHORTCUT_LOAD_STATE:
+					Menu_loadState();
+					break;
+				case SHORTCUT_SCREENSHOT:
+					Menu_screenshot();
+					break;
+				case SHORTCUT_RESET_GAME:
+					core.reset();
+					break;
+				case SHORTCUT_SAVE_QUIT:
+					newScreenshot = 1;
+					quit = 1;
+					Menu_saveState();
+					break;
+				case SHORTCUT_GAMESWITCHER:
+					newScreenshot = 1;
+					quit = 1;
+					Menu_saveState();
+					putFile(GAME_SWITCHER_PERSIST_PATH, game.path + strlen(SDCARD_PATH));
+					break;
+				case SHORTCUT_CYCLE_SCALE:
+					screen_scaling += 1;
+					int count = config.frontend.options[FE_OPT_SCALING].count;
+					if (screen_scaling >= count)
+						screen_scaling -= count;
+					Config_syncFrontend(config.frontend.options[FE_OPT_SCALING].key, screen_scaling);
+					break;
+				case SHORTCUT_CYCLE_EFFECT:
+					screen_effect += 1;
+					if (screen_effect >= EFFECT_COUNT)
+						screen_effect -= EFFECT_COUNT;
+					Config_syncFrontend(config.frontend.options[FE_OPT_EFFECT].key, screen_effect);
+					break;
+				default:
+					break;
 				}
-				
-				if (mapping->mod) ignore_menu = 1;
+
+				if (mapping->mod)
+					ignore_menu = 1;
 			}
 		}
 	}
-	
+
 	if (!ignore_menu && PAD_justReleased(BTN_MENU)) {
 		show_menu = 1;
 	}
-	
+
 	// TODO: figure out how to ignore button when MENU+button is handled first
 	// TODO: array size of LOCAL_ whatever that macro is
 	// TODO: then split it into two loops
@@ -3256,93 +3258,111 @@ static void input_poll_callback(void) {
 	// TODO: then check for button
 	// TODO: only modify if absent from array
 	// TODO: the shortcuts loop above should also contribute to the array
-	
+
 	buttons = 0;
-	for (int i=0; config.controls[i].name; i++) {
-		ButtonMapping* mapping = &config.controls[i];
+	for (int i = 0; config.controls[i].name; i++) {
+		ButtonMapping *mapping = &config.controls[i];
 		int btn = 1 << mapping->local;
-		if (btn==BTN_NONE) continue; // present buttons can still be unbound
-		if (gamepad_type==0) {
-			switch(btn) {
-				case BTN_DPAD_UP: 		btn = BTN_UP; break;
-				case BTN_DPAD_DOWN: 	btn = BTN_DOWN; break;
-				case BTN_DPAD_LEFT: 	btn = BTN_LEFT; break;
-				case BTN_DPAD_RIGHT: 	btn = BTN_RIGHT; break;
+		if (btn == BTN_NONE)
+			continue; // present buttons can still be unbound
+		if (gamepad_type == 0) {
+			switch (btn) {
+			case BTN_DPAD_UP:
+				btn = BTN_UP;
+				break;
+			case BTN_DPAD_DOWN:
+				btn = BTN_DOWN;
+				break;
+			case BTN_DPAD_LEFT:
+				btn = BTN_LEFT;
+				break;
+			case BTN_DPAD_RIGHT:
+				btn = BTN_RIGHT;
+				break;
 			}
 		}
 		if (PAD_isPressed(btn) && (!mapping->mod || PAD_isPressed(BTN_MENU))) {
 			buttons |= 1 << mapping->retro;
-			if (mapping->mod) ignore_menu = 1;
+			if (mapping->mod)
+				ignore_menu = 1;
 		}
 		//  && !PWR_ignoreSettingInput(btn, show_setting)
 	}
-	
+
 	// if (buttons) LOG_info("buttons: %i\n", buttons);
 }
-static int16_t input_state_callback(unsigned port, unsigned device, unsigned index, unsigned id) {
-	if (port==0 && device==RETRO_DEVICE_JOYPAD && index==0) {
-		if (id == RETRO_DEVICE_ID_JOYPAD_MASK) return buttons;
+static int16_t input_state_callback(unsigned port, unsigned device, unsigned index, unsigned id)
+{
+	if (port == 0 && device == RETRO_DEVICE_JOYPAD && index == 0) {
+		if (id == RETRO_DEVICE_ID_JOYPAD_MASK)
+			return buttons;
 		return (buttons >> id) & 1;
-	}
-	else if (port==0 && device==RETRO_DEVICE_ANALOG) {
-		if (index==RETRO_DEVICE_INDEX_ANALOG_LEFT) {
-			if (id==RETRO_DEVICE_ID_ANALOG_X) return pad.laxis.x;
-			else if (id==RETRO_DEVICE_ID_ANALOG_Y) return pad.laxis.y;
-		}
-		else if (index==RETRO_DEVICE_INDEX_ANALOG_RIGHT) {
-			if (id==RETRO_DEVICE_ID_ANALOG_X) return pad.raxis.x;
-			else if (id==RETRO_DEVICE_ID_ANALOG_Y) return pad.raxis.y;
+	} else if (port == 0 && device == RETRO_DEVICE_ANALOG) {
+		if (index == RETRO_DEVICE_INDEX_ANALOG_LEFT) {
+			if (id == RETRO_DEVICE_ID_ANALOG_X)
+				return pad.laxis.x;
+			else if (id == RETRO_DEVICE_ID_ANALOG_Y)
+				return pad.laxis.y;
+		} else if (index == RETRO_DEVICE_INDEX_ANALOG_RIGHT) {
+			if (id == RETRO_DEVICE_ID_ANALOG_X)
+				return pad.raxis.x;
+			else if (id == RETRO_DEVICE_ID_ANALOG_Y)
+				return pad.raxis.y;
 		}
 	}
 	return 0;
 }
 ///////////////////////////////
 
-static void Input_init(const struct retro_input_descriptor *vars) {
+static void Input_init(const struct retro_input_descriptor *vars)
+{
 	static int input_initialized = 0;
-	if (input_initialized) return;
+	if (input_initialized)
+		return;
 
 	LOG_info("Input_init\n");
-	
+
 	config.controls = core_button_mapping[0].name ? core_button_mapping : default_button_mapping;
-	
+
 	puts("---------------------------------");
 
-	const char* core_button_names[RETRO_BUTTON_COUNT] = {0};
+	const char *core_button_names[RETRO_BUTTON_COUNT] = {0};
 	int present[RETRO_BUTTON_COUNT];
 	int core_mapped = 0;
 	if (vars) {
 		core_mapped = 1;
 		// identify buttons available in this core
-		for (int i=0; vars[i].description; i++) {
-			const struct retro_input_descriptor* var = &vars[i];
-			if (var->port!=0 || var->device!=RETRO_DEVICE_JOYPAD || var->index!=0) continue;
+		for (int i = 0; vars[i].description; i++) {
+			const struct retro_input_descriptor *var = &vars[i];
+			if (var->port != 0 || var->device != RETRO_DEVICE_JOYPAD || var->index != 0)
+				continue;
 
 			// TODO: don't ignore unavailable buttons, just override them to BTN_ID_NONE!
-			if (var->id>=RETRO_BUTTON_COUNT) {
-				//printf("UNAVAILABLE: %s\n", var->description); fflush(stdout);
+			if (var->id >= RETRO_BUTTON_COUNT) {
+				// printf("UNAVAILABLE: %s\n", var->description); fflush(stdout);
 				continue;
-			}
-			else {
-				//printf("PRESENT    : %s\n", var->description); fflush(stdout);
+			} else {
+				// printf("PRESENT    : %s\n", var->description); fflush(stdout);
 			}
 			present[var->id] = 1;
 			core_button_names[var->id] = var->description;
 		}
 	}
-	
+
 	puts("---------------------------------");
 
-	for (int i=0;default_button_mapping[i].name; i++) {
-		ButtonMapping* mapping = &default_button_mapping[i];
-		//LOG_info("DEFAULT %s (%s): <%s>\n", core_button_names[mapping->retro], mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
-		if (core_button_names[mapping->retro]) mapping->name = (char*)core_button_names[mapping->retro];
+	for (int i = 0; default_button_mapping[i].name; i++) {
+		ButtonMapping *mapping = &default_button_mapping[i];
+		// LOG_info("DEFAULT %s (%s): <%s>\n", core_button_names[mapping->retro], mapping->name,
+		// (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]));
+		if (core_button_names[mapping->retro])
+			mapping->name = (char *)core_button_names[mapping->retro];
 	}
-	
+
 	puts("---------------------------------");
 
-	for (int i=0; config.controls[i].name; i++) {
-		ButtonMapping* mapping = &config.controls[i];
+	for (int i = 0; config.controls[i].name; i++) {
+		ButtonMapping *mapping = &config.controls[i];
 		mapping->default_ = mapping->local;
 
 		// ignore mappings that aren't available in this core
@@ -3350,22 +3370,25 @@ static void Input_init(const struct retro_input_descriptor *vars) {
 			mapping->ignore = 1;
 			continue;
 		}
-		//LOG_info("%s: <%s> (%i:%i)\n", mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" : device_button_names[mapping->local]), mapping->local, mapping->retro);
+		// LOG_info("%s: <%s> (%i:%i)\n", mapping->name, (mapping->local==BTN_ID_NONE ? "NONE" :
+		// device_button_names[mapping->local]), mapping->local, mapping->retro);
 	}
-	
+
 	puts("---------------------------------");
 	input_initialized = 1;
 }
 
-static bool set_rumble_state(unsigned port, enum retro_rumble_effect effect, uint16_t strength) {
+static bool set_rumble_state(unsigned port, enum retro_rumble_effect effect, uint16_t strength)
+{
 	// TODO: handle other args? not sure I can
 	VIB_setStrength(strength);
 	return 1;
 }
-static bool environment_callback(unsigned cmd, void *data) { // copied from picoarch initially
+static bool environment_callback(unsigned cmd, void *data)
+{ // copied from picoarch initially
 	// LOG_info("environment_callback: %i\n", cmd);
-	
-	switch(cmd) {
+
+	switch (cmd) {
 	// case RETRO_ENVIRONMENT_SET_ROTATION: { /* 1 */
 	// 	LOG_info("RETRO_ENVIRONMENT_SET_ROTATION %i\n", *(int *)data); // core requests frontend to handle rotation
 	// 	break;
@@ -3383,13 +3406,14 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_MESSAGE: { /* 6 */
-		const struct retro_message *message = (const struct retro_message*)data;
-		if (message) LOG_info("%s\n", message->msg);
+		const struct retro_message *message = (const struct retro_message *)data;
+		if (message)
+			LOG_info("%s\n", message->msg);
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL: { /* 8 */
-		// puts("RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL");
-		// TODO: used by fceumm at least
+													// puts("RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL");
+													// TODO: used by fceumm at least
 	}
 	case RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY: { /* 9 */
 		const char **out = (const char **)data;
@@ -3401,31 +3425,30 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 	case RETRO_ENVIRONMENT_SET_PIXEL_FORMAT: { /* 10 */
 		const enum retro_pixel_format *format = (const enum retro_pixel_format *)data;
 		LOG_info("Requested pixel format by core: %d\n", *format); // Log the requested format (raw integer value)
-	
+
 		// Check if the requested format is supported
 		if (*format == RETRO_PIXEL_FORMAT_XRGB8888) {
 			fmt = RETRO_PIXEL_FORMAT_XRGB8888;
 			LOG_info("Format supported: RETRO_PIXEL_FORMAT_XRGB8888\n");
-			return true;  // Indicate success
+			return true; // Indicate success
 		} else if (*format == RETRO_PIXEL_FORMAT_RGB565) {
 			fmt = RETRO_PIXEL_FORMAT_RGB565;
 			LOG_info("Format supported: RETRO_PIXEL_FORMAT_RGB565\n");
-			return true;  // Indicate success
-		} 
+			return true; // Indicate success
+		}
 		// Log unsupported formats
 		LOG_info("Format not supported, defaulting to RGB565\n");
 		fmt = RETRO_PIXEL_FORMAT_RGB565;
-		return false;  // Indicate failure
+		return false; // Indicate failure
 	}
 	case RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS: { /* 11 */
 		// puts("RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS\n");
 		Input_init((const struct retro_input_descriptor *)data);
 		return false;
 		break;
-	} 
+	}
 	case RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE: { /* 13 */
-		const struct retro_disk_control_callback *var =
-			(const struct retro_disk_control_callback *)data;
+		const struct retro_disk_control_callback *var = (const struct retro_disk_control_callback *)data;
 
 		if (var) {
 			memset(&disk_control_ext, 0, sizeof(struct retro_disk_control_ext_callback));
@@ -3458,7 +3481,7 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME: { /* 18 */
-		bool flag = *(bool*)data;
+		bool flag = *(bool *)data;
 		// LOG_info("%i: RETRO_ENVIRONMENT_SET_SUPPORT_NO_GAME: %i\n", cmd, flag);
 		break;
 	}
@@ -3479,10 +3502,10 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		break;
 	}
 	case RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE: { /* 23 */
-	        struct retro_rumble_interface *iface = (struct retro_rumble_interface*)data;
+		struct retro_rumble_interface *iface = (struct retro_rumble_interface *)data;
 
-	        // LOG_info("Setup rumble interface.\n");
-	        iface->set_rumble_state = set_rumble_state;
+		// LOG_info("Setup rumble interface.\n");
+		iface->set_rumble_state = set_rumble_state;
 		break;
 	}
 	case RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES: {
@@ -3494,7 +3517,7 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 	case RETRO_ENVIRONMENT_GET_LOG_INTERFACE: { /* 27 */
 		struct retro_log_callback *log_cb = (struct retro_log_callback *)data;
 		if (log_cb)
-			log_cb->log = (void (*)(enum retro_log_level, const char*, ...))LOG_note; // same difference
+			log_cb->log = (void (*)(enum retro_log_level, const char *, ...))LOG_note; // same difference
 		break;
 	}
 	case RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY: { /* 31 */
@@ -3509,9 +3532,9 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		if (infos) {
 			// TODO: store to gamepad_values/gamepad_labels for gamepad_device
 			const struct retro_controller_info *info = &infos[0];
-			for (int i=0; i<info->num_types; i++) {
+			for (int i = 0; i < info->num_types; i++) {
 				const struct retro_controller_description *type = &info->types[i];
-				if (exactMatch((char*)type->desc,"dualshock")) { // currently only enabled for PlayStation
+				if (exactMatch((char *)type->desc, "dualshock")) { // currently only enabled for PlayStation
 					has_custom_controllers = 1;
 					break;
 				}
@@ -3525,14 +3548,15 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 	// RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL)
 	case RETRO_ENVIRONMENT_GET_LANGUAGE: { /* 39 */
 		// puts("RETRO_ENVIRONMENT_GET_LANGUAGE");
-		if (data) *(int *) data = RETRO_LANGUAGE_ENGLISH;
+		if (data)
+			*(int *)data = RETRO_LANGUAGE_ENGLISH;
 		break;
 	}
 	case RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER: { /* (40 | RETRO_ENVIRONMENT_EXPERIMENTAL) */
 		// puts("RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER");
 		break;
 	}
-	
+
 	case RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE: {
 		// fixes fbneo save state graphics corruption
 		// puts("RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE");
@@ -3545,7 +3569,7 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		}
 		break;
 	}
-	
+
 	// RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL)
 	// RETRO_ENVIRONMENT_GET_VFS_INTERFACE (45 | RETRO_ENVIRONMENT_EXPERIMENTAL)
 	// RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE (47 | RETRO_ENVIRONMENT_EXPERIMENTAL)
@@ -3558,7 +3582,8 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 	}
 	case RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION: { /* 52 */
 		// puts("RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION");
-		if (data) *(unsigned *)data = 2;
+		if (data)
+			*(unsigned *)data = 2;
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_CORE_OPTIONS: { /* 53 */
@@ -3581,22 +3606,23 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY: { /* 55 */
-		// puts("RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY");
-	 	if (data) {
+													   // puts("RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY");
+		if (data) {
 			const struct retro_core_option_display *display = (const struct retro_core_option_display *)data;
-			LOG_info("Core asked for option key %s to be %s\n", display->key, display->visible ? "visible" : "invisible");
+			LOG_info("Core asked for option key %s to be %s\n", display->key,
+					 display->visible ? "visible" : "invisible");
 			OptionList_setOptionVisibility(&config.core, display->key, display->visible);
 		}
 		break;
 	}
 	case RETRO_ENVIRONMENT_GET_DISK_CONTROL_INTERFACE_VERSION: { /* 57 */
-		unsigned *out =	(unsigned *)data;
-		if (out) *out = 1;
+		unsigned *out = (unsigned *)data;
+		if (out)
+			*out = 1;
 		break;
 	}
 	case RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE: { /* 58 */
-		const struct retro_disk_control_ext_callback *var =
-			(const struct retro_disk_control_ext_callback *)data;
+		const struct retro_disk_control_ext_callback *var = (const struct retro_disk_control_ext_callback *)data;
 
 		if (var) {
 			memcpy(&disk_control_ext, var, sizeof(struct retro_disk_control_ext_callback));
@@ -3635,8 +3661,8 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 
 	// TODO: RETRO_ENVIRONMENT_SET_FASTFORWARDING_OVERRIDE 64
 	case RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE: { /* 65 */
-		// const struct retro_system_content_info_override* info = (const struct retro_system_content_info_override* )data;
-		// if (info) LOG_info("has overrides");
+		// const struct retro_system_content_info_override* info = (const struct retro_system_content_info_override*
+		// )data; if (info) LOG_info("has overrides");
 		break;
 	}
 	// RETRO_ENVIRONMENT_GET_GAME_INFO_EXT 66
@@ -3644,7 +3670,7 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		// puts("RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2");
 		if (data) {
 			OptionList_reset();
-			OptionList_v2_init((const struct retro_core_options_v2 *)data); 
+			OptionList_v2_init((const struct retro_core_options_v2 *)data);
 		}
 		break;
 	}
@@ -3657,19 +3683,20 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		}
 		break;
 	}
-	case RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK: {  /* 69 */
+	case RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK: { /* 69 */
 		// puts("RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK");
 		if (data) {
-			struct retro_core_options_update_display_callback *update_display_cb = (struct retro_core_options_update_display_callback *) data;
+			struct retro_core_options_update_display_callback *update_display_cb =
+				(struct retro_core_options_update_display_callback *)data;
 			core.update_visibility_callback = update_display_cb->callback;
-		}
-		else {
+		} else {
 			core.update_visibility_callback = NULL;
 		}
 		break;
 	}
 	// used by fceumm
-	// TODO: used by gambatte for L/R palette switching (seems like it needs to return true even if data is NULL to indicate support)
+	// TODO: used by gambatte for L/R palette switching (seems like it needs to return true even if data is NULL to
+	// indicate support)
 	case RETRO_ENVIRONMENT_SET_VARIABLE: {
 		// puts("RETRO_ENVIRONMENT_SET_VARIABLE");
 		const struct retro_variable *var = (const struct retro_variable *)data;
@@ -3680,11 +3707,12 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 		}
 
 		int *out = (int *)data;
-		if (out) *out = 1;
-		
+		if (out)
+			*out = 1;
+
 		break;
 	}
-	
+
 	// unused
 	// case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK: {
 	// 	puts("RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK"); fflush(stdout);
@@ -3698,13 +3726,12 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 	// 	puts("RETRO_ENVIRONMENT_GET_FASTFORWARDING"); fflush(stdout);
 	// 	break;
 	// };
-	case RETRO_ENVIRONMENT_SET_HW_RENDER:
-	{
-		struct retro_hw_render_callback *cb = (struct retro_hw_render_callback*)data;
-		
+	case RETRO_ENVIRONMENT_SET_HW_RENDER: {
+		struct retro_hw_render_callback *cb = (struct retro_hw_render_callback *)data;
+
 		// Log the requested context
-		LOG_info("Core requested GL context type: %d, version %d.%d\n", 
-			cb->context_type, cb->version_major, cb->version_minor);
+		LOG_info("Core requested GL context type: %d, version %d.%d\n", cb->context_type, cb->version_major,
+				 cb->version_minor);
 
 		// Fallback if version is 0.0 or other unexpected values
 		if (cb->context_type == 4 && cb->version_major == 0 && cb->version_minor == 0) {
@@ -3725,12 +3752,14 @@ static bool environment_callback(unsigned cmd, void *data) { // copied from pico
 
 ///////////////////////////////
 
-static void hdmimon(void) {
+static void hdmimon(void)
+{
 	// handle HDMI change
 	static int had_hdmi = -1;
 	int has_hdmi = GetHDMI();
-	if (had_hdmi==-1) had_hdmi = has_hdmi;
-	if (has_hdmi!=had_hdmi) {
+	if (had_hdmi == -1)
+		had_hdmi = has_hdmi;
+	if (has_hdmi != had_hdmi) {
 		had_hdmi = has_hdmi;
 
 		LOG_info("restarting after HDMI change...\n");
@@ -3744,7 +3773,7 @@ static void hdmimon(void) {
 ///////////////////////////////
 
 // TODO: this is a dumb API
-SDL_Surface* digits;
+SDL_Surface *digits;
 #define DIGIT_WIDTH 9
 #define DIGIT_HEIGHT 8
 #define DIGIT_TRACKING -2
@@ -3758,385 +3787,376 @@ enum {
 	DIGIT_COUNT,
 };
 #define DIGIT_SPACE DIGIT_COUNT
-static void MSG_init(void) {
-	digits = SDL_CreateRGBSurface(SDL_SWSURFACE,SCALE2(DIGIT_WIDTH*DIGIT_COUNT,DIGIT_HEIGHT),FIXED_DEPTH, 0,0,0,0);
+static void MSG_init(void)
+{
+	digits =
+		SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(DIGIT_WIDTH * DIGIT_COUNT, DIGIT_HEIGHT), FIXED_DEPTH, 0, 0, 0, 0);
 	SDL_FillRect(digits, NULL, RGB_BLACK);
-	
-	SDL_Surface* digit;
-	char* chars[] = { "0","1","2","3","4","5","6","7","8","9","/",".","%","x","(",")", NULL };
-	char* c;
+
+	SDL_Surface *digit;
+	char *chars[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "/", ".", "%", "x", "(", ")", NULL};
+	char *c;
 	int i = 0;
 	while ((c = chars[i])) {
 		digit = TTF_RenderUTF8_Blended(font.tiny, c, COLOR_WHITE);
-		SDL_BlitSurface(digit, NULL, digits, &(SDL_Rect){ (i * SCALE1(DIGIT_WIDTH)) + (SCALE1(DIGIT_WIDTH) - digit->w)/2, (SCALE1(DIGIT_HEIGHT) - digit->h)/2});
+		SDL_BlitSurface(digit, NULL, digits,
+						&(SDL_Rect){(i * SCALE1(DIGIT_WIDTH)) + (SCALE1(DIGIT_WIDTH) - digit->w) / 2,
+									(SCALE1(DIGIT_HEIGHT) - digit->h) / 2});
 		SDL_FreeSurface(digit);
 		i += 1;
 	}
 }
-static int MSG_blitChar(int n, int x, int y) {
-	if (n!=DIGIT_SPACE) SDL_BlitSurface(digits, &(SDL_Rect){n*SCALE1(DIGIT_WIDTH),0,SCALE2(DIGIT_WIDTH,DIGIT_HEIGHT)}, screen, &(SDL_Rect){x,y});
+static int MSG_blitChar(int n, int x, int y)
+{
+	if (n != DIGIT_SPACE)
+		SDL_BlitSurface(digits, &(SDL_Rect){n * SCALE1(DIGIT_WIDTH), 0, SCALE2(DIGIT_WIDTH, DIGIT_HEIGHT)}, screen,
+						&(SDL_Rect){x, y});
 	return x + SCALE1(DIGIT_WIDTH + DIGIT_TRACKING);
 }
-static int MSG_blitInt(int num, int x, int y) {
+static int MSG_blitInt(int num, int x, int y)
+{
 	int i = num;
 	int n;
-	
+
 	if (i > 999) {
 		n = i / 1000;
 		i -= n * 1000;
-		x = MSG_blitChar(n,x,y);
+		x = MSG_blitChar(n, x, y);
 	}
 	if (i > 99) {
 		n = i / 100;
 		i -= n * 100;
-		x = MSG_blitChar(n,x,y);
-	}
-	else if (num>99) {
-		x = MSG_blitChar(0,x,y);
+		x = MSG_blitChar(n, x, y);
+	} else if (num > 99) {
+		x = MSG_blitChar(0, x, y);
 	}
 	if (i > 9) {
 		n = i / 10;
 		i -= n * 10;
-		x = MSG_blitChar(n,x,y);
-	}
-	else if (num>9) {
-		x = MSG_blitChar(0,x,y);
+		x = MSG_blitChar(n, x, y);
+	} else if (num > 9) {
+		x = MSG_blitChar(0, x, y);
 	}
-	
+
 	n = i;
-	x = MSG_blitChar(n,x,y);
-	
+	x = MSG_blitChar(n, x, y);
+
 	return x;
 }
-static int MSG_blitDouble(double num, int x, int y) {
+static int MSG_blitDouble(double num, int x, int y)
+{
 	int i = num;
-	int r = (num-i) * 10;
+	int r = (num - i) * 10;
 	int n;
-	
-	x = MSG_blitInt(i, x,y);
+
+	x = MSG_blitInt(i, x, y);
 
 	n = DIGIT_DOT;
-	x = MSG_blitChar(n,x,y);
-	
+	x = MSG_blitChar(n, x, y);
+
 	n = r;
-	x = MSG_blitChar(n,x,y);
+	x = MSG_blitChar(n, x, y);
 	return x;
 }
-static void MSG_quit(void) {
+static void MSG_quit(void)
+{
 	SDL_FreeSurface(digits);
 }
 
 ///////////////////////////////
 
-static const char* bitmap_font[] = {
-	['0'] = 
-		" 111 "
-		"1   1"
-		"1   1"
-		"1  11"
-		"1 1 1"
-		"11  1"
-		"1   1"
-		"1   1"
-		" 111 ",
-	['1'] =
-		"   1 "
-		" 111 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 ",
-	['2'] =
-		" 111 "
-		"1   1"
-		"    1"
-		"   1 "
-		"  1  "
-		" 1   "
-		"1    "
-		"1    "
-		"11111",
-	['3'] =
-		" 111 "
-		"1   1"
-		"    1"
-		"    1"
-		" 111 "
-		"    1"
-		"    1"
-		"1   1"
-		" 111 ",
-	['4'] =
-		"1   1"
-		"1   1"
-		"1   1"
-		"1   1"
-		"1   1"
-		"1   1"
-		"11111"
-		"    1"
-		"    1",
-	['5'] =
-		"11111"
-		"1    "
-		"1    "
-		"1111 "
-		"    1"
-		"    1"
-		"    1"
-		"1   1"
-		" 111 ",
-	['6'] =
-		" 111 "
-		"1    "
-		"1    "
-		"1111 "
-		"1   1"
-		"1   1"
-		"1   1"
-		"1   1"
-		" 111 ",
-	['7'] =
-		"11111"
-		"    1"
-		"    1"
-		"   1 "
-		"  1  "
-		"  1  "
-		"  1  "
-		"  1  "
-		"  1  ",
-	['8'] =
-		" 111 "
-		"1   1"
-		"1   1"
-		"1   1"
-		" 111 "
-		"1   1"
-		"1   1"
-		"1   1"
-		" 111 ",
-	['9'] =
-		" 111 "
-		"1   1"
-		"1   1"
-		"1   1"
-		"1   1"
-		" 1111"
-		"    1"
-		"    1"
-		" 111 ",
-	['.'] = 
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		" 11  "
-		" 11  ",
-	[','] = 
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"  1  "
-		"  1  "
-		" 1   ",
-	[' '] = 
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     "
-		"     ",
-	['('] = 
-		"   1 "
-		"  1  "
-		" 1   "
-		" 1   "
-		" 1   "
-		" 1   "
-		" 1   "
-		"  1  "
-		"   1 ",
-	[')'] = 
-		" 1   "
-		"  1  "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"   1 "
-		"  1  "
-		" 1   ",
-	['/'] = 
-		"   1 "
-		"   1 "
-		"   1 "
-		"  1  "
-		"  1  "
-		"  1  "
-		" 1   "
-		" 1   "
-		" 1   ",
-	['x'] = 
-		"     "
-		"     "
-		"1   1"
-		"1   1"
-		" 1 1 "
-		"  1  "
-		" 1 1 "
-		"1   1"
-		"1   1",
-	['%'] = 
-		" 1   "
-		"1 1  "
-		"1 1 1"
-		" 1 1 "
-		"  1  "
-		" 1 1 "
-		"1 1 1"
-		"  1 1"
-		"   1 ",
-	['-'] =
-		"     "
-		"     "
-		"     "
-		"     "
-		" 111 "
-		"     "
-		"     "
-		"     "
-		"     ",
-	['c'] = 
-        "     "
-        "     "
-        " 111 "
-        "1   1"
-        "1    "
-        "1    "
-        "1    "
-        "1   1"
-        " 111 ",
-	['m'] = 
-        "     "
-        "     "
-        "11 11"
-        "1 1 1"
-        "1 1 1"
-        "1   1"
-        "1   1"
-        "1   1"
-        "1   1",
-	['z'] =
-		"     "
-        "     "
-        "     "
-        "11111"
-        "   1 "
-        "  1  "
-        " 1   "
-        "1    "
-        "11111",
-	['h'] =
-		"     "
-        "1    "
-        "1    "
-        "1    "
-        "1111 "
-        "1   1"
-        "1   1"
-        "1   1"
-        "1   1",
+static const char *bitmap_font[] = {
+	['0'] = " 111 "
+			"1   1"
+			"1   1"
+			"1  11"
+			"1 1 1"
+			"11  1"
+			"1   1"
+			"1   1"
+			" 111 ",
+	['1'] = "   1 "
+			" 111 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 ",
+	['2'] = " 111 "
+			"1   1"
+			"    1"
+			"   1 "
+			"  1  "
+			" 1   "
+			"1    "
+			"1    "
+			"11111",
+	['3'] = " 111 "
+			"1   1"
+			"    1"
+			"    1"
+			" 111 "
+			"    1"
+			"    1"
+			"1   1"
+			" 111 ",
+	['4'] = "1   1"
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1"
+			"11111"
+			"    1"
+			"    1",
+	['5'] = "11111"
+			"1    "
+			"1    "
+			"1111 "
+			"    1"
+			"    1"
+			"    1"
+			"1   1"
+			" 111 ",
+	['6'] = " 111 "
+			"1    "
+			"1    "
+			"1111 "
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1"
+			" 111 ",
+	['7'] = "11111"
+			"    1"
+			"    1"
+			"   1 "
+			"  1  "
+			"  1  "
+			"  1  "
+			"  1  "
+			"  1  ",
+	['8'] = " 111 "
+			"1   1"
+			"1   1"
+			"1   1"
+			" 111 "
+			"1   1"
+			"1   1"
+			"1   1"
+			" 111 ",
+	['9'] = " 111 "
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1"
+			" 1111"
+			"    1"
+			"    1"
+			" 111 ",
+	['.'] = "     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			" 11  "
+			" 11  ",
+	[','] = "     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"  1  "
+			"  1  "
+			" 1   ",
+	[' '] = "     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     "
+			"     ",
+	['('] = "   1 "
+			"  1  "
+			" 1   "
+			" 1   "
+			" 1   "
+			" 1   "
+			" 1   "
+			"  1  "
+			"   1 ",
+	[')'] = " 1   "
+			"  1  "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"   1 "
+			"  1  "
+			" 1   ",
+	['/'] = "   1 "
+			"   1 "
+			"   1 "
+			"  1  "
+			"  1  "
+			"  1  "
+			" 1   "
+			" 1   "
+			" 1   ",
+	['x'] = "     "
+			"     "
+			"1   1"
+			"1   1"
+			" 1 1 "
+			"  1  "
+			" 1 1 "
+			"1   1"
+			"1   1",
+	['%'] = " 1   "
+			"1 1  "
+			"1 1 1"
+			" 1 1 "
+			"  1  "
+			" 1 1 "
+			"1 1 1"
+			"  1 1"
+			"   1 ",
+	['-'] = "     "
+			"     "
+			"     "
+			"     "
+			" 111 "
+			"     "
+			"     "
+			"     "
+			"     ",
+	['c'] = "     "
+			"     "
+			" 111 "
+			"1   1"
+			"1    "
+			"1    "
+			"1    "
+			"1   1"
+			" 111 ",
+	['m'] = "     "
+			"     "
+			"11 11"
+			"1 1 1"
+			"1 1 1"
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1",
+	['z'] = "     "
+			"     "
+			"     "
+			"11111"
+			"   1 "
+			"  1  "
+			" 1   "
+			"1    "
+			"11111",
+	['h'] = "     "
+			"1    "
+			"1    "
+			"1    "
+			"1111 "
+			"1   1"
+			"1   1"
+			"1   1"
+			"1   1",
 
-	};
+};
 
 
-	void drawRect(int x, int y, int w, int h, uint32_t c, uint32_t *data, int stride) {
-		for (int _x = x; _x < x + w; _x++) {
-			data[_x + y * stride] = c;
-			data[_x + (y + h - 1) * stride] = c;
-		}
-		for (int _y = y; _y < y + h; _y++) {
-			data[x + _y * stride] = c;
-			data[x + w - 1 + _y * stride] = c;
-		}
+void drawRect(int x, int y, int w, int h, uint32_t c, uint32_t *data, int stride)
+{
+	for (int _x = x; _x < x + w; _x++) {
+		data[_x + y * stride] = c;
+		data[_x + (y + h - 1) * stride] = c;
 	}
-	
-	
-	void fillRect(int x, int y, int w, int h, uint32_t c, uint32_t *data, int stride) {
-		for (int _y = y; _y < y + h; _y++) {
-			for (int _x = x; _x < x + w; _x++) {
-				data[_x + _y * stride] = c;
-			}
+	for (int _y = y; _y < y + h; _y++) {
+		data[x + _y * stride] = c;
+		data[x + w - 1 + _y * stride] = c;
+	}
+}
+
+
+void fillRect(int x, int y, int w, int h, uint32_t c, uint32_t *data, int stride)
+{
+	for (int _y = y; _y < y + h; _y++) {
+		for (int _x = x; _x < x + w; _x++) {
+			data[_x + _y * stride] = c;
 		}
 	}
-	
-	static void blitBitmapText(char* text, int ox, int oy, uint32_t* data, int stride, int width, int height) {
-		#define CHAR_WIDTH 5
-		#define CHAR_HEIGHT 9
-		#define LETTERSPACING 1
-	
-		int len = strlen(text);
-		int w = ((CHAR_WIDTH + LETTERSPACING) * len) - 1;
-		int h = CHAR_HEIGHT;
-	
-		if (ox < 0) ox = width - w + ox;
-		if (oy < 0) oy = height - h + oy;
-	
-		// Clamp to screen bounds (optional but recommended)
-		if (ox + w > width) w = width - ox;
-		if (oy + h > height) h = height - oy;
-	
-		// Draw background rectangle (black RGBA8888)
-		fillRect(ox, oy, w, h, 0x000000FF, data, stride);
-	
-		data += oy * stride + ox;
-	
-		for (int y = 0; y < CHAR_HEIGHT; y++) {
-			uint32_t* row = data + y * stride;
-			for (int i = 0; i < len; i++) {
-				const char* c = bitmap_font[(unsigned char)text[i]];
-				for (int x = 0; x < CHAR_WIDTH; x++) {
-					if (c[y * CHAR_WIDTH + x] == '1') {
-						*row = 0xFFFFFFFF;  // white RGBA8888
-					}
-					row++;
+}
+
+static void blitBitmapText(char *text, int ox, int oy, uint32_t *data, int stride, int width, int height)
+{
+#define CHAR_WIDTH 5
+#define CHAR_HEIGHT 9
+#define LETTERSPACING 1
+
+	int len = strlen(text);
+	int w = ((CHAR_WIDTH + LETTERSPACING) * len) - 1;
+	int h = CHAR_HEIGHT;
+
+	if (ox < 0)
+		ox = width - w + ox;
+	if (oy < 0)
+		oy = height - h + oy;
+
+	// Clamp to screen bounds (optional but recommended)
+	if (ox + w > width)
+		w = width - ox;
+	if (oy + h > height)
+		h = height - oy;
+
+	// Draw background rectangle (black RGBA8888)
+	fillRect(ox, oy, w, h, 0x000000FF, data, stride);
+
+	data += oy * stride + ox;
+
+	for (int y = 0; y < CHAR_HEIGHT; y++) {
+		uint32_t *row = data + y * stride;
+		for (int i = 0; i < len; i++) {
+			const char *c = bitmap_font[(unsigned char)text[i]];
+			for (int x = 0; x < CHAR_WIDTH; x++) {
+				if (c[y * CHAR_WIDTH + x] == '1') {
+					*row = 0xFFFFFFFF; // white RGBA8888
 				}
-				row += LETTERSPACING;
+				row++;
 			}
+			row += LETTERSPACING;
 		}
 	}
-	
-	
-	
-
+}
 
 
-void drawGauge(int x, int y, float percent, int width, int height, uint32_t *data, int stride) {
+void drawGauge(int x, int y, float percent, int width, int height, uint32_t *data, int stride)
+{
 	// Clamp percent to 0.0 - 1.0
-	if (percent < 0.0f) percent = 0.0f;
-	if (percent > 1.0f) percent = 1.0f;
+	if (percent < 0.0f)
+		percent = 0.0f;
+	if (percent > 1.0f)
+		percent = 1.0f;
 
-	uint8_t red   = (uint8_t)(percent * 255.0f);
+	uint8_t red = (uint8_t)(percent * 255.0f);
 	uint8_t green = (uint8_t)((1.0f - percent) * 255.0f);
-	uint8_t blue  = 0;
+	uint8_t blue = 0;
 	uint8_t alpha = 255;
 
 	uint32_t fillColor = (red << 24) | (green << 16) | (blue << 8) | alpha;
-	uint32_t borderColor = 0xFFFFFFFF;  // White RGBA
-	uint32_t bgColor = 0x000000FF;      // Black RGBA
+	uint32_t borderColor = 0xFFFFFFFF; // White RGBA
+	uint32_t bgColor = 0x000000FF;	   // Black RGBA
 
 	// Background
 	fillRect(x, y, width, height, bgColor, data, stride);
@@ -4150,7 +4170,6 @@ void drawGauge(int x, int y, float percent, int width, int height, uint32_t *dat
 }
 
 
-
 ///////////////////////////////
 
 static int cpu_ticks = 0;
@@ -4162,27 +4181,28 @@ static double use_double = 0;
 static uint32_t sec_start = 0;
 
 #ifdef USES_SWSCALER
-	static int fit = 1;
+static int fit = 1;
 #else
-	static int fit = 0;
-#endif	
+static int fit = 0;
+#endif
 
-static void selectScaler(int src_w, int src_h, int src_p) {
-	int src_x,src_y,dst_x,dst_y,dst_w,dst_h,dst_p,scale;
+static void selectScaler(int src_w, int src_h, int src_p)
+{
+	int src_x, src_y, dst_x, dst_y, dst_w, dst_h, dst_p, scale;
 	double aspect;
-	
+
 	int aspect_w = src_w;
 	int aspect_h = CEIL_DIV(aspect_w, core.aspect_ratio);
-	
+
 	// TODO: make sure this doesn't break fit==1 devices
-	if (aspect_h<src_h) {
+	if (aspect_h < src_h) {
 		aspect_h = src_h;
 		aspect_w = aspect_h * core.aspect_ratio;
 		aspect_w += aspect_w % 2;
 	}
 
 	char scaler_name[16];
-	
+
 	src_x = 0;
 	src_y = 0;
 	dst_x = 0;
@@ -4191,36 +4211,40 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 	// unmodified by crop
 	renderer.true_w = src_w;
 	renderer.true_h = src_h;
-	
+
 	// TODO: this is saving non-rgb30 devices from themselves...or rather, me
 	int scaling = screen_scaling;
-	if (scaling==SCALE_CROPPED && DEVICE_WIDTH==HDMI_WIDTH) {
+	if (scaling == SCALE_CROPPED && DEVICE_WIDTH == HDMI_WIDTH) {
 		scaling = SCALE_NATIVE;
 	}
-	
-	if (scaling==SCALE_NATIVE || scaling==SCALE_CROPPED) {
+
+	if (scaling == SCALE_NATIVE || scaling == SCALE_CROPPED) {
 		// this is the same whether fit or oversized
-		scale = MIN(DEVICE_WIDTH/src_w, DEVICE_HEIGHT/src_h);
+		scale = MIN(DEVICE_WIDTH / src_w, DEVICE_HEIGHT / src_h);
 		if (!scale) {
 			sprintf(scaler_name, "forced crop");
 			dst_w = DEVICE_WIDTH;
 			dst_h = DEVICE_HEIGHT;
 			dst_p = DEVICE_PITCH;
-			
-			int ox = (DEVICE_WIDTH  - src_w) / 2; // may be negative
+
+			int ox = (DEVICE_WIDTH - src_w) / 2;  // may be negative
 			int oy = (DEVICE_HEIGHT - src_h) / 2; // may be negative
-			
-			if (ox<0) src_x = -ox;
-			else dst_x = ox;
-			
-			if (oy<0) src_y = -oy;
-			else dst_y = oy;
+
+			if (ox < 0)
+				src_x = -ox;
+			else
+				dst_x = ox;
+
+			if (oy < 0)
+				src_y = -oy;
+			else
+				dst_y = oy;
 		}
 		// TODO: this is all kinds of messed up
 		// TODO: is this blowing up because the smart has to rotate before scaling?
 		// TODO: or is it just that I'm trying to cram 4 logical rects into 2 rect arguments
 		// TODO: eg. src.size + src.clip + dst.size + dst.clip
-		else if (scaling==SCALE_CROPPED) {
+		else if (scaling == SCALE_CROPPED) {
 			int scale_x = CEIL_DIV(DEVICE_WIDTH, src_w);
 			int scale_y = CEIL_DIV(DEVICE_HEIGHT, src_h);
 			scale = MIN(scale_x, scale_y);
@@ -4233,127 +4257,119 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 			int scaled_w = src_w * scale;
 			int scaled_h = src_h * scale;
 
-			int ox = (DEVICE_WIDTH  - scaled_w) / 2; // may be negative
+			int ox = (DEVICE_WIDTH - scaled_w) / 2;	 // may be negative
 			int oy = (DEVICE_HEIGHT - scaled_h) / 2; // may be negative
 
-			if (ox<0) {
+			if (ox < 0) {
 				src_x = -ox / scale;
 				src_w -= src_x * 2;
-			}
-			else {
+			} else {
 				dst_x = ox;
 				// dst_w -= ox * 2;
 			}
 
-			if (oy<0) {
+			if (oy < 0) {
 				src_y = -oy / scale;
 				src_h -= src_y * 2;
-			}
-			else {
+			} else {
 				dst_y = oy;
 				// dst_h -= oy * 2;
 			}
-		}
-		else {
+		} else {
 			sprintf(scaler_name, "integer");
 			int scaled_w = src_w * scale;
 			int scaled_h = src_h * scale;
 			dst_w = DEVICE_WIDTH;
 			dst_h = DEVICE_HEIGHT;
 			dst_p = DEVICE_PITCH;
-			dst_x = (DEVICE_WIDTH  - scaled_w) / 2; // should always be positive
+			dst_x = (DEVICE_WIDTH - scaled_w) / 2;	// should always be positive
 			dst_y = (DEVICE_HEIGHT - scaled_h) / 2; // should always be positive
 		}
-	}
-	else if (fit) {
+	} else if (fit) {
 		// these both will use a generic nn scaler
-		if (scaling==SCALE_FULLSCREEN) {
+		if (scaling == SCALE_FULLSCREEN) {
 			sprintf(scaler_name, "full fit");
 			dst_w = DEVICE_WIDTH;
 			dst_h = DEVICE_HEIGHT;
 			dst_p = DEVICE_PITCH;
 			scale = -1; // nearest neighbor
-		}
-		else {
-			double scale_f = MIN(((double)DEVICE_WIDTH)/aspect_w, ((double)DEVICE_HEIGHT)/aspect_h);
+		} else {
+			double scale_f = MIN(((double)DEVICE_WIDTH) / aspect_w, ((double)DEVICE_HEIGHT) / aspect_h);
 			LOG_info("scale_f:%f\n", scale_f);
-			
+
 			sprintf(scaler_name, "aspect fit");
 			dst_w = aspect_w * scale_f;
 			dst_h = aspect_h * scale_f;
 			dst_p = DEVICE_PITCH;
-			dst_x = (DEVICE_WIDTH  - dst_w) / 2;
+			dst_x = (DEVICE_WIDTH - dst_w) / 2;
 			dst_y = (DEVICE_HEIGHT - dst_h) / 2;
-			scale = (scale_f==1.0 && dst_w==src_w && dst_h==src_h) ? 1 : -1;
+			scale = (scale_f == 1.0 && dst_w == src_w && dst_h == src_h) ? 1 : -1;
 		}
-	} 
-	else {
+	} else {
 		int scale_x = CEIL_DIV(DEVICE_WIDTH, src_w);
-		int scale_y = CEIL_DIV(DEVICE_HEIGHT,src_h);
-		
+		int scale_y = CEIL_DIV(DEVICE_HEIGHT, src_h);
+
 		// odd resolutions (eg. PS1 Rayman: 320x239) is throwing this off, need to snap to eights
-		int r = (DEVICE_HEIGHT-src_h)%8;
-		if (r && r<8) scale_y -= 1;
-		
+		int r = (DEVICE_HEIGHT - src_h) % 8;
+		if (r && r < 8)
+			scale_y -= 1;
+
 		scale = MAX(scale_x, scale_y);
 		// if (scale>4) scale = 4;
 		// if (scale>2) scale = 4; // TODO: restore, requires sanity checking
-		
+
 		int scaled_w = src_w * scale;
 		int scaled_h = src_h * scale;
-		
-		if (scaling==SCALE_FULLSCREEN) {
+
+		if (scaling == SCALE_FULLSCREEN) {
 			sprintf(scaler_name, "full%i", scale);
 			// type = 'full (oversized)';
 			dst_w = scaled_w;
 			dst_h = scaled_h;
 			dst_p = dst_w * FIXED_BPP;
-		}
-		else if (scaling==SCALE_ASPECT_SCREEN) {
-	
+		} else if (scaling == SCALE_ASPECT_SCREEN) {
 			int scale_x = DEVICE_WIDTH / src_w;
 			int scale_y = DEVICE_HEIGHT / src_h;
-			
+
 			// Use the smaller scale to ensure it fits on screen
 			scale = MIN(scale_x, scale_y);
 			aspect = (double)src_w / src_h;
-			
+
 			// Optionally, clamp to a max scale (e.g., 4x) if needed
 			// if (scale > 4) scale = 4;
-			
+
 			int scaled_w = src_w * scale;
 			int scaled_h = src_h * scale;
-			
+
 			// Center the image on screen
 			dst_w = scaled_w;
 			dst_h = scaled_h;
 			dst_x = (DEVICE_WIDTH - dst_w) / 2;
 			dst_y = (DEVICE_HEIGHT - dst_h) / 2;
-			
+
 			dst_p = dst_w * FIXED_BPP;
-			
+
 			sprintf(scaler_name, "raw%i", scale);
-			LOG_info("ignore core aspect %ix%i\n\n",dst_w,dst_h);
-			
-		}
-		else {
+			LOG_info("ignore core aspect %ix%i\n\n", dst_w, dst_h);
+
+		} else {
 			double src_aspect_ratio = ((double)src_w) / src_h;
 			// double core_aspect_ratio
 			double fixed_aspect_ratio = ((double)DEVICE_WIDTH) / DEVICE_HEIGHT;
 			int core_aspect = core.aspect_ratio * 1000;
 			int fixed_aspect = fixed_aspect_ratio * 1000;
-			
+
 			// still having trouble with FC's 1.306 (13/10? wtf) on 4:3 devices
-			// specifically I think it has trouble when src, core, and fixed 
+			// specifically I think it has trouble when src, core, and fixed
 			// ratios don't match
-			
-			// it handles src and core matching but fixed not, eg. GB and GBA 
+
+			// it handles src and core matching but fixed not, eg. GB and GBA
 			// or core and fixed matching but not src, eg. odd PS resolutions
-			
+
 			// we need to transform the src size to core aspect
 			// then to fixed aspect
-						
-			if (core_aspect>fixed_aspect) {
+
+			if (core_aspect > fixed_aspect) {
 				sprintf(scaler_name, "aspect%iL", scale);
 				// letterbox
 				// dst_w = scaled_w;
@@ -4365,8 +4381,7 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 				dst_h = scaled_h / aspect_hr;
 
 				dst_y = (dst_h - scaled_h) / 2;
-			}
-			else if (core_aspect<fixed_aspect) {
+			} else if (core_aspect < fixed_aspect) {
 				sprintf(scaler_name, "aspect%iP", scale);
 				// pillarbox
 				// dst_w = scaled_h * fixed_aspect_ratio;
@@ -4376,11 +4391,10 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 				double aspect_wr = ((double)aspect_w) / DEVICE_WIDTH;
 				dst_w = scaled_w / aspect_wr;
 				dst_h = scaled_h;
-				
-				dst_w = (dst_w/8)*8;
+
+				dst_w = (dst_w / 8) * 8;
 				dst_x = (dst_w - scaled_w) / 2;
-			}
-			else {
+			} else {
 				sprintf(scaler_name, "aspect%iM", scale);
 				// perfect match
 				dst_w = scaled_w;
@@ -4389,11 +4403,11 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 			dst_p = dst_w * FIXED_BPP;
 		}
 	}
-	
+
 	// TODO: need to sanity check scale and demands on the buffer
-	
+
 	// LOG_info("aspect: %ix%i (%f)\n", aspect_w,aspect_h,core.aspect_ratio);
-	
+
 	renderer.src_x = src_x;
 	renderer.src_y = src_y;
 	renderer.src_w = src_w;
@@ -4405,13 +4419,15 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 	renderer.dst_h = dst_h;
 	renderer.dst_p = dst_p;
 	renderer.scale = scale;
-	renderer.aspect = (scaling==SCALE_ASPECT_SCREEN) ? aspect: (scaling==SCALE_NATIVE||scaling==SCALE_CROPPED)?0:(scaling==SCALE_FULLSCREEN?-1:core.aspect_ratio);
+	renderer.aspect = (scaling == SCALE_ASPECT_SCREEN) ? aspect
+					  : (scaling == SCALE_NATIVE || scaling == SCALE_CROPPED)
+						  ? 0
+						  : (scaling == SCALE_FULLSCREEN ? -1 : core.aspect_ratio);
 	renderer.blit = GFX_getScaler(&renderer);
-		
-	// LOG_info("coreAR:%0.3f fixedAR:%0.3f srcAR: %0.3f\nname:%s\nfit:%i scale:%i\nsrc_x:%i src_y:%i src_w:%i src_h:%i src_p:%i\ndst_x:%i dst_y:%i dst_w:%i dst_h:%i dst_p:%i\naspect_w:%i aspect_h:%i\n",
-	// 	core.aspect_ratio, ((double)DEVICE_WIDTH) / DEVICE_HEIGHT, ((double)src_w) / src_h,
-	// 	scaler_name,
-	// 	fit,scale,
+
+	// LOG_info("coreAR:%0.3f fixedAR:%0.3f srcAR: %0.3f\nname:%s\nfit:%i scale:%i\nsrc_x:%i src_y:%i src_w:%i src_h:%i
+	// src_p:%i\ndst_x:%i dst_y:%i dst_w:%i dst_h:%i dst_p:%i\naspect_w:%i aspect_h:%i\n", 	core.aspect_ratio,
+	// ((double)DEVICE_WIDTH) / DEVICE_HEIGHT, ((double)src_w) / src_h, 	scaler_name, 	fit,scale,
 	// 	src_x,src_y,src_w,src_h,src_p,
 	// 	dst_x,dst_y,dst_w,dst_h,dst_p,
 	// 	aspect_w,aspect_h
@@ -4423,16 +4439,15 @@ static void selectScaler(int src_w, int src_h, int src_p) {
 	}
 	// dont need this anymore with OpenGL
 	// if (screen->w!=dst_w || screen->h!=dst_w || screen->pitch!=dst_p) {
-		// screen = GFX_resize(dst_w,dst_h,dst_p);
+	// screen = GFX_resize(dst_w,dst_h,dst_p);
 	// }
 }
 static int firstframe = 1;
-static void screen_flip(SDL_Surface* screen) {
-	
+static void screen_flip(SDL_Surface *screen)
+{
 	if (use_core_fps) {
 		GFX_flip_fixed_rate(screen, core.fps);
-	}
-	else {
+	} else {
 		GFX_GL_Swap();
 		// GFX_flip(screen);
 	}
@@ -4440,155 +4455,161 @@ static void screen_flip(SDL_Surface* screen) {
 
 
 // couple of animation functions for pixel data keeping them all cause wanna use them later
-void applyFadeIn(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter, int max_frames) {
-    size_t pixels_per_row = pitch / sizeof(uint32_t);
-    static uint32_t temp_buffer[1920 * 1080];
+void applyFadeIn(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter, int max_frames)
+{
+	size_t pixels_per_row = pitch / sizeof(uint32_t);
+	static uint32_t temp_buffer[1920 * 1080];
 
-    if (*frame_counter >= max_frames) {
-        return;
-    }
+	if (*frame_counter >= max_frames) {
+		return;
+	}
 
-    float progress = (float)(*frame_counter) / (float)max_frames;
-    float eased = progress * progress * (3 - 2 * progress);
+	float progress = (float)(*frame_counter) / (float)max_frames;
+	float eased = progress * progress * (3 - 2 * progress);
 
-    float fade_alpha = eased;
+	float fade_alpha = eased;
 
-    for (unsigned y = 0; y < height; ++y) {
-        for (unsigned x = 0; x < width; ++x) {
-            size_t idx = y * pixels_per_row + x;
+	for (unsigned y = 0; y < height; ++y) {
+		for (unsigned x = 0; x < width; ++x) {
+			size_t idx = y * pixels_per_row + x;
 
-            uint32_t color = (*data)[idx];
+			uint32_t color = (*data)[idx];
 
-            uint8_t a = (color >> 24) & 0xFF;
-            uint8_t b = (color >> 16) & 0xFF;
-            uint8_t g = (color >> 8) & 0xFF;
-            uint8_t r = (color >> 0) & 0xFF;
+			uint8_t a = (color >> 24) & 0xFF;
+			uint8_t b = (color >> 16) & 0xFF;
+			uint8_t g = (color >> 8) & 0xFF;
+			uint8_t r = (color >> 0) & 0xFF;
 
-            r = (uint8_t)(r * fade_alpha);
-            g = (uint8_t)(g * fade_alpha);
-            b = (uint8_t)(b * fade_alpha);
-            a = (uint8_t)(a * fade_alpha);
+			r = (uint8_t)(r * fade_alpha);
+			g = (uint8_t)(g * fade_alpha);
+			b = (uint8_t)(b * fade_alpha);
+			a = (uint8_t)(a * fade_alpha);
 
-            temp_buffer[idx] = (a << 24) | (b << 16) | (g << 8) | r;
-        }
-    }
+			temp_buffer[idx] = (a << 24) | (b << 16) | (g << 8) | r;
+		}
+	}
 
-    (*frame_counter)++;
-    *data = temp_buffer;
+	(*frame_counter)++;
+	*data = temp_buffer;
 }
 
-void applyZoomFadeIn(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter, int max_frames) {
-    size_t pixels_per_row = pitch / sizeof(uint32_t);
-    static uint32_t temp_buffer[1920 * 1080];
+void applyZoomFadeIn(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter, int max_frames)
+{
+	size_t pixels_per_row = pitch / sizeof(uint32_t);
+	static uint32_t temp_buffer[1920 * 1080];
 
-    if (*frame_counter >= max_frames)
-        return;
+	if (*frame_counter >= max_frames)
+		return;
 
-    float progress = (float)(*frame_counter) / (float)max_frames;
-    float eased = progress * progress * (3.0f - 2.0f * progress);
+	float progress = (float)(*frame_counter) / (float)max_frames;
+	float eased = progress * progress * (3.0f - 2.0f * progress);
 
-    float start_zoom = 6.0f;
-    float end_zoom = 1.0f;
-    float zoom = start_zoom - eased * (start_zoom - end_zoom);
+	float start_zoom = 6.0f;
+	float end_zoom = 1.0f;
+	float zoom = start_zoom - eased * (start_zoom - end_zoom);
 
-    float fade_alpha = eased;
+	float fade_alpha = eased;
 
-    int center_x = width / 2;
-    int center_y = height / 2;
+	int center_x = width / 2;
+	int center_y = height / 2;
 
-    for (unsigned y = 0; y < height; ++y) {
-        for (unsigned x = 0; x < width; ++x) {
-            float src_x = center_x + (x - center_x) / zoom;
-            float src_y = center_y + (y - center_y) / zoom;
+	for (unsigned y = 0; y < height; ++y) {
+		for (unsigned x = 0; x < width; ++x) {
+			float src_x = center_x + (x - center_x) / zoom;
+			float src_y = center_y + (y - center_y) / zoom;
 
-            int ix = (int)src_x;
-            int iy = (int)src_y;
+			int ix = (int)src_x;
+			int iy = (int)src_y;
 
-            size_t dst_idx = y * pixels_per_row + x;
-            uint32_t color = 0xFF000000; 
+			size_t dst_idx = y * pixels_per_row + x;
+			uint32_t color = 0xFF000000;
 
-            if (ix >= 0 && ix < (int)width && iy >= 0 && iy < (int)height) {
-                size_t src_idx = iy * pixels_per_row + ix;
-                color = (*data)[src_idx];
-            }
+			if (ix >= 0 && ix < (int)width && iy >= 0 && iy < (int)height) {
+				size_t src_idx = iy * pixels_per_row + ix;
+				color = (*data)[src_idx];
+			}
 
-            uint8_t a = (color >> 24) & 0xFF;
-            uint8_t b = (color >> 16) & 0xFF;
-            uint8_t g = (color >> 8) & 0xFF;
-            uint8_t r = (color >> 0) & 0xFF;
+			uint8_t a = (color >> 24) & 0xFF;
+			uint8_t b = (color >> 16) & 0xFF;
+			uint8_t g = (color >> 8) & 0xFF;
+			uint8_t r = (color >> 0) & 0xFF;
 
-            r = (uint8_t)(r * fade_alpha);
-            g = (uint8_t)(g * fade_alpha);
-            b = (uint8_t)(b * fade_alpha);
-            a = (uint8_t)(a * fade_alpha);
+			r = (uint8_t)(r * fade_alpha);
+			g = (uint8_t)(g * fade_alpha);
+			b = (uint8_t)(b * fade_alpha);
+			a = (uint8_t)(a * fade_alpha);
 
-            temp_buffer[dst_idx] = (a << 24) | (b << 16) | (g << 8) | r;
-        }
-    }
+			temp_buffer[dst_idx] = (a << 24) | (b << 16) | (g << 8) | r;
+		}
+	}
 
-    (*frame_counter)++;
-    *data = temp_buffer;
+	(*frame_counter)++;
+	*data = temp_buffer;
 }
 
 
 // Looney Tunes opening effect :D
-void applyCircleReveal(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter, int max_frames) {
-    static uint32_t temp_buffer[1920 * 1080];
+void applyCircleReveal(uint32_t **data, size_t pitch, unsigned width, unsigned height, int *frame_counter,
+					   int max_frames)
+{
+	static uint32_t temp_buffer[1920 * 1080];
 
-    if (*frame_counter >= max_frames)
-        return;
+	if (*frame_counter >= max_frames)
+		return;
 
-    uint32_t *src = *data;
-    size_t pixels_per_row = pitch / sizeof(uint32_t);
+	uint32_t *src = *data;
+	size_t pixels_per_row = pitch / sizeof(uint32_t);
 
-    float progress = (float)(*frame_counter) / (float)max_frames;
-    float eased = progress * progress * (3.0f - 2.0f * progress);
+	float progress = (float)(*frame_counter) / (float)max_frames;
+	float eased = progress * progress * (3.0f - 2.0f * progress);
 
-    float max_radius = sqrtf((float)(width * width + height * height)) * 0.5f;
-    float radius = eased * max_radius;
+	float max_radius = sqrtf((float)(width * width + height * height)) * 0.5f;
+	float radius = eased * max_radius;
 
-    int cx = (int)(width / 2);
-    int cy = (int)(height / 2);
+	int cx = (int)(width / 2);
+	int cy = (int)(height / 2);
 
-    for (unsigned y = 0; y < height; ++y) {
-        for (unsigned x = 0; x < width; ++x) {
-            size_t idx = y * pixels_per_row + x;
+	for (unsigned y = 0; y < height; ++y) {
+		for (unsigned x = 0; x < width; ++x) {
+			size_t idx = y * pixels_per_row + x;
 
-            float dx = (float)x - (float)cx;
-            float dy = (float)y - (float)cy;
-            float dist = sqrtf(dx * dx + dy * dy);
+			float dx = (float)x - (float)cx;
+			float dy = (float)y - (float)cy;
+			float dist = sqrtf(dx * dx + dy * dy);
 
-            if (dist <= radius) {
-                temp_buffer[idx] = src[idx];
-            } else {
-                uint32_t color = src[idx];
-                uint8_t a = (color >> 24) & 0xFF; 
-                temp_buffer[idx] = (a << 24);  
-            }
-        }
-    }
+			if (dist <= radius) {
+				temp_buffer[idx] = src[idx];
+			} else {
+				uint32_t color = src[idx];
+				uint8_t a = (color >> 24) & 0xFF;
+				temp_buffer[idx] = (a << 24);
+			}
+		}
+	}
 
-    (*frame_counter)++;
-    *data = temp_buffer;
+	(*frame_counter)++;
+	*data = temp_buffer;
 }
 
-static void video_refresh_callback_main(const void *data, unsigned width, unsigned height, size_t pitch) {
+static void video_refresh_callback_main(const void *data, unsigned width, unsigned height, size_t pitch)
+{
 	// return;
-	
+
 	Special_render();
-	
+
 	// static int tmp_frameskip = 0;
 	// if ((tmp_frameskip++)%2) return;
-	
+
 	static uint32_t last_flip_time = 0;
-	
+
 	// 10 seems to be the sweet spot that allows 2x in NES and SNES and 8x in GB at 60fps
 	// 14 will let GB hit 10x but NES and SNES will drop to 1.5x at 30fps (not sure why)
 	// but 10 hurts PS...
 	// TODO: 10 was based on rg35xx, probably different results on other supported platforms
-	if (fast_forward && SDL_GetTicks()-last_flip_time<10) return;
-	
-	// FFVII menus 
+	if (fast_forward && SDL_GetTicks() - last_flip_time < 10)
+		return;
+
+	// FFVII menus
 	// 16: 30/200
 	// 15: 30/180
 	// 14: 45/180
@@ -4602,62 +4623,67 @@ static void video_refresh_callback_main(const void *data, unsigned width, unsign
 	}
 
 	fps_ticks += 1;
-	
-	if (downsample) pitch /= 2; // everything expects 16 but we're downsampling from 32
-	
+
+	if (downsample)
+		pitch /= 2; // everything expects 16 but we're downsampling from 32
+
 	// if source has changed size (or forced by dst_p==0)
 	// eg. true src + cropped src + fixed dst + cropped dst
-	if (renderer.dst_p==0 || width!=renderer.true_w || height!=renderer.true_h) {
+	if (renderer.dst_p == 0 || width != renderer.true_w || height != renderer.true_h) {
 		selectScaler(width, height, pitch);
 		GFX_clearAll();
 		GFX_resetShaders();
 	}
-	
+
 	// debug
-	if (show_debug && !isnan(currentratio) && !isnan(currentfps) && !isnan(currentreqfps)  && !isnan(currentbufferms) &&
-	currentbuffersize >= 0  && currentbufferfree >= 0 && SDL_GetTicks() > 5000) {
+	if (show_debug && !isnan(currentratio) && !isnan(currentfps) && !isnan(currentreqfps) && !isnan(currentbufferms) &&
+		currentbuffersize >= 0 && currentbufferfree >= 0 && SDL_GetTicks() > 5000) {
 		int x = 2 + renderer.src_x;
 		int y = 2 + renderer.src_y;
 		char debug_text[250];
 		int scale = renderer.scale;
-		if (scale==-1) scale = 1; // nearest neighbor flag
-
-		sprintf(debug_text, "%ix%i %ix %i/%i", renderer.src_w,renderer.src_h, scale,currentsampleratein,currentsamplerateout);
-		blitBitmapText(debug_text,x,y,(uint32_t*)data,pitch / 4, width,height);
-		
-		sprintf(debug_text, "%.03f/%i/%.0f/%i/%i/%i", currentratio,
-				currentbuffersize,currentbufferms, currentbufferfree, currentbuffertarget,avgbufferfree);
-		blitBitmapText(debug_text, x, y + 14, (uint32_t*)data, pitch / 4, width,
-					height);
-
-		sprintf(debug_text, "%i,%i %ix%i", renderer.dst_x,renderer.dst_y, renderer.src_w*scale,renderer.src_h*scale);
-		blitBitmapText(debug_text,-x,y,(uint32_t*)data,pitch / 4, width,height);
-	
-		sprintf(debug_text, "%ix%i", renderer.dst_w,renderer.dst_h);
-		blitBitmapText(debug_text,-x,-y,(uint32_t*)data,pitch / 4, width,height);
-
-		//want this to overwrite bottom right in case screen is too small this info more important tbh
+		if (scale == -1)
+			scale = 1; // nearest neighbor flag
+
+		sprintf(debug_text, "%ix%i %ix %i/%i", renderer.src_w, renderer.src_h, scale, currentsampleratein,
+				currentsamplerateout);
+		blitBitmapText(debug_text, x, y, (uint32_t *)data, pitch / 4, width, height);
+
+		sprintf(debug_text, "%.03f/%i/%.0f/%i/%i/%i", currentratio, currentbuffersize, currentbufferms,
+				currentbufferfree, currentbuffertarget, avgbufferfree);
+		blitBitmapText(debug_text, x, y + 14, (uint32_t *)data, pitch / 4, width, height);
+
+		sprintf(debug_text, "%i,%i %ix%i", renderer.dst_x, renderer.dst_y, renderer.src_w * scale,
+				renderer.src_h * scale);
+		blitBitmapText(debug_text, -x, y, (uint32_t *)data, pitch / 4, width, height);
+
+		sprintf(debug_text, "%ix%i", renderer.dst_w, renderer.dst_h);
+		blitBitmapText(debug_text, -x, -y, (uint32_t *)data, pitch / 4, width, height);
+
+		// want this to overwrite bottom right in case screen is too small this info more important tbh
 		PLAT_getCPUTemp();
-		sprintf(debug_text, "%.01f/%.01f/%.0f%%/%ihz/%ic", currentfps, currentreqfps,currentcpuse,currentcpuspeed,currentcputemp);
-		blitBitmapText(debug_text,x,-y,(uint32_t*)data,pitch / 4, width,height);
+		sprintf(debug_text, "%.01f/%.01f/%.0f%%/%ihz/%ic", currentfps, currentreqfps, currentcpuse, currentcpuspeed,
+				currentcputemp);
+		blitBitmapText(debug_text, x, -y, (uint32_t *)data, pitch / 4, width, height);
 
-		sprintf(debug_text, "%i/%ix%i/%ix%i/%ix%i", currentshaderpass, currentshadersrcw,currentshadersrch,currentshadertexw,currentshadertexh,currentshaderdstw,currentshaderdsth);
-		blitBitmapText(debug_text,x,-y - 14,(uint32_t*)data,pitch / 4, width,height);
-	
-		double buffer_fill = (double) (currentbuffersize - currentbufferfree) / (double) currentbuffersize;
-		drawGauge(x, y + 30, buffer_fill, width / 2, 8, (uint32_t*)data, pitch / 4);
+		sprintf(debug_text, "%i/%ix%i/%ix%i/%ix%i", currentshaderpass, currentshadersrcw, currentshadersrch,
+				currentshadertexw, currentshadertexh, currentshaderdstw, currentshaderdsth);
+		blitBitmapText(debug_text, x, -y - 14, (uint32_t *)data, pitch / 4, width, height);
+
+		double buffer_fill = (double)(currentbuffersize - currentbufferfree) / (double)currentbuffersize;
+		drawGauge(x, y + 30, buffer_fill, width / 2, 8, (uint32_t *)data, pitch / 4);
 	}
-	
+
 	static int frame_counter = 0;
-	const int max_frames = 8; 
-	if(frame_counter<9) {
-		applyFadeIn((uint32_t **) &data, pitch, width, height, &frame_counter, max_frames);
+	const int max_frames = 8;
+	if (frame_counter < 9) {
+		applyFadeIn((uint32_t **)&data, pitch, width, height, &frame_counter, max_frames);
 	}
 
 	// LOG_info("video_refresh_callback: %ix%i@%i %ix%i@%i\n",width,height,pitch,screen->w,screen->h,screen->pitch);
 
 
-	renderer.src = (void*)data;
+	renderer.src = (void *)data;
 	renderer.dst = screen->pixels;
 	GFX_blitRenderer(&renderer);
 
@@ -4666,27 +4692,29 @@ static void video_refresh_callback_main(const void *data, unsigned width, unsign
 }
 
 
-const void* lastframe = NULL;
+const void *lastframe = NULL;
 
-static Uint32* rgbaData = NULL;
+static Uint32 *rgbaData = NULL;
 static size_t rgbaDataSize = 0;
 
-static void video_refresh_callback(const void* data, unsigned width, unsigned height, size_t pitch) {
-
-	// I need to check quit here because sometimes quit is true but callback is still called by the core after and it still runs one more frame and it looks ugly :D
-	if(!quit) {
+static void video_refresh_callback(const void *data, unsigned width, unsigned height, size_t pitch)
+{
+	// I need to check quit here because sometimes quit is true but callback is still called by the core after and it
+	// still runs one more frame and it looks ugly :D
+	if (!quit) {
 		if (!rgbaData || rgbaDataSize != width * height) {
-			if (rgbaData) free(rgbaData);
+			if (rgbaData)
+				free(rgbaData);
 			rgbaDataSize = width * height;
-			rgbaData = (Uint32*)malloc(rgbaDataSize * sizeof(Uint32));
+			rgbaData = (Uint32 *)malloc(rgbaDataSize * sizeof(Uint32));
 			if (!rgbaData) {
 				printf("Failed to allocate memory for RGBA8888 data.\n");
 				return;
 			}
 		}
 
-		if(ambient_mode && !fast_forward && data)
-			GFX_setAmbientColor(data, width, height,pitch,ambient_mode);
+		if (ambient_mode && !fast_forward && data)
+			GFX_setAmbientColor(data, width, height, pitch, ambient_mode);
 
 		if (!data) {
 			if (lastframe) {
@@ -4696,7 +4724,7 @@ static void video_refresh_callback(const void* data, unsigned width, unsigned he
 			}
 		} else if (fmt == RETRO_PIXEL_FORMAT_XRGB8888) {
 			// convert XRGB8888 to RGBA8888
-			const uint32_t* src = (const uint32_t*)data;
+			const uint32_t *src = (const uint32_t *)data;
 			for (unsigned i = 0; i < width * height; ++i) {
 				uint32_t pixel = src[i];
 				uint8_t r = (pixel >> 16) & 0xFF;
@@ -4709,68 +4737,70 @@ static void video_refresh_callback(const void* data, unsigned width, unsigned he
 
 		} else {
 			// convert RGB565 to RGBA8888
-			const uint16_t* srcData = (const uint16_t*)data;
-			unsigned srcPitchInPixels = pitch / sizeof(uint16_t); 
+			const uint16_t *srcData = (const uint16_t *)data;
+			unsigned srcPitchInPixels = pitch / sizeof(uint16_t);
 
 			for (unsigned y = 0; y < height; ++y) {
 				for (unsigned x = 0; x < width; ++x) {
 					uint16_t pixel = srcData[y * srcPitchInPixels + x];
 
-					uint8_t r = ((pixel >> 11) & 0x1F) << 3; 
-					uint8_t g = ((pixel >> 5) & 0x3F) << 2;   
-					uint8_t b = (pixel & 0x1F) << 3;          
+					uint8_t r = ((pixel >> 11) & 0x1F) << 3;
+					uint8_t g = ((pixel >> 5) & 0x3F) << 2;
+					uint8_t b = (pixel & 0x1F) << 3;
 					uint8_t a = 0xFF;
 
 					rgbaData[y * width + x] = (a << 24) | (b << 16) | (g << 8) | r;
 				}
 			}
 			data = rgbaData;
-
 		}
 
 		pitch = width * sizeof(Uint32);
 		lastframe = data;
-		
-		video_refresh_callback_main(data,width,height,pitch);
+
+		video_refresh_callback_main(data, width, height, pitch);
 	}
 }
 ///////////////////////////////
 
-static void audio_sample_callback(int16_t left, int16_t right) {
+static void audio_sample_callback(int16_t left, int16_t right)
+{
 	if (!fast_forward || ff_audio) {
 		if (use_core_fps || fast_forward) {
-			SND_batchSamples_fixed_rate(&(const SND_Frame){left,right}, 1);
-		}
-		else {
-			SND_batchSamples(&(const SND_Frame){left,right}, 1);
+			SND_batchSamples_fixed_rate(&(const SND_Frame){left, right}, 1);
+		} else {
+			SND_batchSamples(&(const SND_Frame){left, right}, 1);
 		}
 	}
 }
-static size_t audio_sample_batch_callback(const int16_t *data, size_t frames) { 
+static size_t audio_sample_batch_callback(const int16_t *data, size_t frames)
+{
 	if (!fast_forward || ff_audio) {
 		if (use_core_fps || fast_forward) {
-			return SND_batchSamples_fixed_rate((const SND_Frame*)data, frames);
-		}
-		else {
-			return SND_batchSamples((const SND_Frame*)data, frames);
+			return SND_batchSamples_fixed_rate((const SND_Frame *)data, frames);
+		} else {
+			return SND_batchSamples((const SND_Frame *)data, frames);
 		}
-	}
-	else return frames;
+	} else
+		return frames;
 };
 
 ///////////////////////////////////////
 
-void Core_getName(char* in_name, char* out_name) {
+void Core_getName(char *in_name, char *out_name)
+{
 	strcpy(out_name, basename(in_name));
-	char* tmp = strrchr(out_name, '_');
+	char *tmp = strrchr(out_name, '_');
 	tmp[0] = '\0';
 }
-void Core_open(const char* core_path, const char* tag_name) {
+void Core_open(const char *core_path, const char *tag_name)
+{
 	LOG_info("Core_open\n");
 	core.handle = dlopen(core_path, RTLD_LAZY);
-	
-	if (!core.handle) LOG_error("%s\n", dlerror());
-	
+
+	if (!core.handle)
+		LOG_error("%s\n", dlerror());
+
 	core.init = dlsym(core.handle, "retro_init");
 	core.deinit = dlsym(core.handle, "retro_deinit");
 	core.get_system_info = dlsym(core.handle, "retro_get_system_info");
@@ -4789,43 +4819,44 @@ void Core_open(const char* core_path, const char* tag_name) {
 	core.get_region = dlsym(core.handle, "retro_get_region");
 	core.get_memory_data = dlsym(core.handle, "retro_get_memory_data");
 	core.get_memory_size = dlsym(core.handle, "retro_get_memory_size");
-	
+
 	void (*set_environment_callback)(retro_environment_t);
 	void (*set_video_refresh_callback)(retro_video_refresh_t);
 	void (*set_audio_sample_callback)(retro_audio_sample_t);
 	void (*set_audio_sample_batch_callback)(retro_audio_sample_batch_t);
 	void (*set_input_poll_callback)(retro_input_poll_t);
 	void (*set_input_state_callback)(retro_input_state_t);
-	
+
 	set_environment_callback = dlsym(core.handle, "retro_set_environment");
 	set_video_refresh_callback = dlsym(core.handle, "retro_set_video_refresh");
 	set_audio_sample_callback = dlsym(core.handle, "retro_set_audio_sample");
 	set_audio_sample_batch_callback = dlsym(core.handle, "retro_set_audio_sample_batch");
 	set_input_poll_callback = dlsym(core.handle, "retro_set_input_poll");
 	set_input_state_callback = dlsym(core.handle, "retro_set_input_state");
-	
+
 	struct retro_system_info info = {};
 	core.get_system_info(&info);
-	
+
 
 	LOG_info("Block Extract: %d\n", info.block_extract);
 
-	Core_getName((char*)core_path, (char*)core.name);
-	sprintf((char*)core.version, "%s (%s)", info.library_name, info.library_version);
-	strcpy((char*)core.tag, tag_name);
-	strcpy((char*)core.extensions, info.valid_extensions);
-	
+	Core_getName((char *)core_path, (char *)core.name);
+	sprintf((char *)core.version, "%s (%s)", info.library_name, info.library_version);
+	strcpy((char *)core.tag, tag_name);
+	strcpy((char *)core.extensions, info.valid_extensions);
+
 	core.need_fullpath = info.need_fullpath;
-	
-	LOG_info("core: %s version: %s tag: %s (valid_extensions: %s need_fullpath: %i)\n", core.name, core.version, core.tag, info.valid_extensions, info.need_fullpath);
-	
-	sprintf((char*)core.config_dir, USERDATA_PATH "/%s-%s", core.tag, core.name);
-	sprintf((char*)core.states_dir, SHARED_USERDATA_PATH "/%s-%s", core.tag, core.name);
-	sprintf((char*)core.saves_dir, SDCARD_PATH "/Saves/%s", core.tag);
-	sprintf((char*)core.bios_dir, SDCARD_PATH "/Bios/%s", core.tag);
-	sprintf((char*)core.cheats_dir, SDCARD_PATH "/Cheats/%s", core.tag);
-	sprintf((char*)core.overlays_dir, SDCARD_PATH "/Overlays/%s", core.tag);
-	
+
+	LOG_info("core: %s version: %s tag: %s (valid_extensions: %s need_fullpath: %i)\n", core.name, core.version,
+			 core.tag, info.valid_extensions, info.need_fullpath);
+
+	sprintf((char *)core.config_dir, USERDATA_PATH "/%s-%s", core.tag, core.name);
+	sprintf((char *)core.states_dir, SHARED_USERDATA_PATH "/%s-%s", core.tag, core.name);
+	sprintf((char *)core.saves_dir, SDCARD_PATH "/Saves/%s", core.tag);
+	sprintf((char *)core.bios_dir, SDCARD_PATH "/Bios/%s", core.tag);
+	sprintf((char *)core.cheats_dir, SDCARD_PATH "/Cheats/%s", core.tag);
+	sprintf((char *)core.overlays_dir, SDCARD_PATH "/Overlays/%s", core.tag);
+
 	char cmd[512];
 	sprintf(cmd, "mkdir -p \"%s\"; mkdir -p \"%s\"", core.config_dir, core.states_dir);
 	system(cmd);
@@ -4837,7 +4868,8 @@ void Core_open(const char* core_path, const char* tag_name) {
 	set_input_poll_callback(input_poll_callback);
 	set_input_state_callback(input_state_callback);
 }
-void Core_init(void) {
+void Core_init(void)
+{
 	LOG_info("Core_init\n");
 	core.init();
 	core.initialized = 1;
@@ -4859,28 +4891,34 @@ void Core_applyCheats(struct Cheats *cheats)
 	}
 }
 
-int Core_updateAVInfo(void) {
+int Core_updateAVInfo(void)
+{
 	struct retro_system_av_info av_info = {};
 	core.get_system_av_info(&av_info);
 
 	double a = av_info.geometry.aspect_ratio;
-	if (a<=0) a = (double)av_info.geometry.base_width / av_info.geometry.base_height;
+	if (a <= 0)
+		a = (double)av_info.geometry.base_width / av_info.geometry.base_height;
 
-	int changed = (core.fps != av_info.timing.fps || core.sample_rate != av_info.timing.sample_rate || core.aspect_ratio != a);
+	int changed =
+		(core.fps != av_info.timing.fps || core.sample_rate != av_info.timing.sample_rate || core.aspect_ratio != a);
 
 	core.fps = av_info.timing.fps;
 	core.sample_rate = av_info.timing.sample_rate;
 	core.aspect_ratio = a;
 
-	if (changed) LOG_info("aspect_ratio: %f (%ix%i) fps: %f\n", a, av_info.geometry.base_width,av_info.geometry.base_height, core.fps);
+	if (changed)
+		LOG_info("aspect_ratio: %f (%ix%i) fps: %f\n", a, av_info.geometry.base_width, av_info.geometry.base_height,
+				 core.fps);
 
 	return changed;
 }
 
-void Core_load(void) {
+void Core_load(void)
+{
 	LOG_info("Core_load\n");
 	struct retro_game_info game_info;
-	game_info.path = game.tmp_path[0]?game.tmp_path:game.path;
+	game_info.path = game.tmp_path[0] ? game.tmp_path : game.path;
 	game_info.data = game.data;
 	game_info.size = game.size;
 	LOG_info("game path: %s (%i)\n", game_info.path, game.size);
@@ -4895,16 +4933,19 @@ void Core_load(void) {
 	core.set_controller_port_device(0, RETRO_DEVICE_JOYPAD); // set a default, may update after loading configs
 	Core_updateAVInfo();
 }
-void Core_reset(void) {
+void Core_reset(void)
+{
 	core.reset();
 }
-void Core_unload(void) {
-	// Disabling this is a dumb hack for bluetooth, we should really be using 
+void Core_unload(void)
+{
+	// Disabling this is a dumb hack for bluetooth, we should really be using
 	// bluealsa with --keep-alive=-1 - but SDL wont reconnect the stream on next start.
 	// Reenable as soon as we have a more recent SDL available, if ever.
-	//SND_quit();
+	// SND_quit();
 }
-void Core_quit(void) {
+void Core_quit(void)
+{
 	if (core.initialized) {
 		SRAM_write();
 		Cheats_free();
@@ -4914,8 +4955,10 @@ void Core_quit(void) {
 		core.initialized = 0;
 	}
 }
-void Core_close(void) {
-	if (core.handle) dlclose(core.handle);
+void Core_close(void)
+{
+	if (core.handle)
+		dlclose(core.handle);
 }
 
 ///////////////////////////////////////
@@ -4932,21 +4975,21 @@ enum {
 };
 
 enum {
-	STATUS_CONT =  0,
-	STATUS_SAVE =  1,
+	STATUS_CONT = 0,
+	STATUS_SAVE = 1,
 	STATUS_LOAD = 11,
 	STATUS_OPTS = 23,
 	STATUS_DISC = 24,
 	STATUS_QUIT = 30,
-	STATUS_RESET= 31,
+	STATUS_RESET = 31,
 };
 
 // TODO: I don't love how overloaded this has become
 static struct {
-	SDL_Surface* bitmap;
-	SDL_Surface* overlay;
-	char* items[MENU_ITEM_COUNT];
-	char* disc_paths[9]; // up to 9 paths, Arc the Lad Collection is 7 discs
+	SDL_Surface *bitmap;
+	SDL_Surface *overlay;
+	char *items[MENU_ITEM_COUNT];
+	char *disc_paths[9]; // up to 9 paths, Arc the Lad Collection is 7 discs
 	char minui_dir[256];
 	char slot_path[256];
 	char base_path[256];
@@ -4957,28 +5000,28 @@ static struct {
 	int slot;
 	int save_exists;
 	int preview_exists;
-} menu = {
-	.bitmap = NULL,
-	.disc = -1,
-	.total_discs = 0,
-	.save_exists = 0,
-	.preview_exists = 0,
-	
-	.items = {
-		[ITEM_CONT] = "Continue",
-		[ITEM_SAVE] = "Save",
-		[ITEM_LOAD] = "Load",
-		[ITEM_OPTS] = "Options",
-		[ITEM_QUIT] = "Quit",
-	}
-};
-
-void Menu_init(void) {
-	menu.overlay = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE,DEVICE_WIDTH,DEVICE_HEIGHT,32,SDL_PIXELFORMAT_RGBA8888);
+} menu = {.bitmap = NULL,
+		  .disc = -1,
+		  .total_discs = 0,
+		  .save_exists = 0,
+		  .preview_exists = 0,
+
+		  .items = {
+			  [ITEM_CONT] = "Continue",
+			  [ITEM_SAVE] = "Save",
+			  [ITEM_LOAD] = "Load",
+			  [ITEM_OPTS] = "Options",
+			  [ITEM_QUIT] = "Quit",
+		  }};
+
+void Menu_init(void)
+{
+	menu.overlay =
+		SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, DEVICE_WIDTH, DEVICE_HEIGHT, 32, SDL_PIXELFORMAT_RGBA8888);
 	SDL_SetSurfaceBlendMode(menu.overlay, SDL_BLENDMODE_BLEND);
 	Uint32 color = SDL_MapRGBA(menu.overlay->format, 0, 0, 0, 0);
 	SDL_FillRect(screen, NULL, color);
-	
+
 	char emu_name[256];
 	getEmuName(game.path, emu_name);
 	sprintf(menu.minui_dir, SHARED_USERDATA_PATH "/.minui/%s", emu_name);
@@ -4986,29 +5029,31 @@ void Menu_init(void) {
 
 	// always sanitized/outer name, to keep main UI from having to inspect archives
 	sprintf(menu.slot_path, "%s/%s.txt", menu.minui_dir, game.name);
-	
-	if (simple_mode) menu.items[ITEM_OPTS] = "Reset";
-	
+
+	if (simple_mode)
+		menu.items[ITEM_OPTS] = "Reset";
+
 	if (game.m3u_path[0]) {
-		char* tmp;
+		char *tmp;
 		strcpy(menu.base_path, game.m3u_path);
 		tmp = strrchr(menu.base_path, '/') + 1;
 		tmp[0] = '\0';
-		
-		//read m3u file
-		FILE* file = fopen(game.m3u_path, "r");
+
+		// read m3u file
+		FILE *file = fopen(game.m3u_path, "r");
 		if (file) {
 			char line[256];
-			while (fgets(line,256,file)!=NULL) {
+			while (fgets(line, 256, file) != NULL) {
 				normalizeNewline(line);
 				trimTrailingNewlines(line);
-				if (strlen(line)==0) continue; // skip empty lines
-		
+				if (strlen(line) == 0)
+					continue; // skip empty lines
+
 				char disc_path[256];
 				strcpy(disc_path, menu.base_path);
 				tmp = disc_path + strlen(disc_path);
 				strcpy(tmp, line);
-				
+
 				// found a valid disc path
 				if (exists(disc_path)) {
 					menu.disc_paths[menu.total_discs] = strdup(disc_path);
@@ -5023,18 +5068,21 @@ void Menu_init(void) {
 		}
 	}
 }
-void Menu_quit(void) {
+void Menu_quit(void)
+{
 	SDL_FreeSurface(menu.overlay);
 }
-void Menu_beforeSleep() {
+void Menu_beforeSleep()
+{
 	SRAM_write();
 	RTC_write();
 	State_autosave();
 	putFile(AUTO_RESUME_PATH, game.path + strlen(SDCARD_PATH));
-	
+
 	PWR_setCPUSpeed(CPU_SPEED_MENU);
 }
-void Menu_afterSleep() {
+void Menu_afterSleep()
+{
 	unlink(AUTO_RESUME_PATH);
 	setOverclock(overclock);
 }
@@ -5046,74 +5094,82 @@ enum {
 	MENU_CALLBACK_EXIT,
 	MENU_CALLBACK_NEXT_ITEM,
 };
-typedef int (*MenuList_callback_t)(MenuList* list, int i);
+typedef int (*MenuList_callback_t)(MenuList *list, int i);
 typedef struct MenuItem {
-	char* name;
-	char* desc;
-	char** values;
-	char* key; // optional, used by options
-	int id; // optional, used by bindings
+	char *name;
+	char *desc;
+	char **values;
+	char *key; // optional, used by options
+	int id;	   // optional, used by bindings
 	int value;
-	MenuList* submenu;
+	MenuList *submenu;
 	MenuList_callback_t on_confirm;
 	MenuList_callback_t on_change;
 } MenuItem;
 
 enum {
-	MENU_LIST, // eg. save and main menu
-	MENU_VAR, // eg. frontend
+	MENU_LIST,	// eg. save and main menu
+	MENU_VAR,	// eg. frontend
 	MENU_FIXED, // eg. emulator
 	MENU_INPUT, // eg. renders like but MENU_VAR but handles input differently
 };
 typedef struct MenuList {
 	int type;
 	int max_width; // cached on first draw
-	char* desc;
-	char* category; // currently displayed category
-	MenuItem* items;
+	char *desc;
+	char *category; // currently displayed category
+	MenuItem *items;
 	MenuList_callback_t on_confirm;
 	MenuList_callback_t on_change;
 } MenuList;
 
-static int Menu_messageWithFont(char* message, char** pairs, TTF_Font* f) {
+static int Menu_messageWithFont(char *message, char **pairs, TTF_Font *f)
+{
 	GFX_setMode(MODE_MAIN);
 	int dirty = 1;
 	while (1) {
 		GFX_startFrame();
 		PAD_poll();
 
-		if (PAD_justPressed(BTN_A) || PAD_justPressed(BTN_B)) break;
-		
+		if (PAD_justPressed(BTN_A) || PAD_justPressed(BTN_B))
+			break;
+
 		PWR_update(&dirty, NULL, Menu_beforeSleep, Menu_afterSleep);
-		
-	
+
+
 		GFX_clear(screen);
-		GFX_blitMessage(f, message, screen, &(SDL_Rect){SCALE1(PADDING),SCALE1(PADDING),screen->w-SCALE1(2*PADDING),screen->h-SCALE1(PILL_SIZE+PADDING)});
+		GFX_blitMessage(f, message, screen,
+						&(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), screen->w - SCALE1(2 * PADDING),
+									screen->h - SCALE1(PILL_SIZE + PADDING)});
 		GFX_blitButtonGroup(pairs, 0, screen, 1);
 		GFX_flip(screen);
 		dirty = 0;
-		
-		
+
+
 		hdmimon();
 	}
 	GFX_setMode(MODE_MENU);
 	return MENU_CALLBACK_NOP; // TODO: this should probably be an arg
 }
 
-static int Menu_message(char* message, char** pairs) {
+static int Menu_message(char *message, char **pairs)
+{
 	return Menu_messageWithFont(message, pairs, font.medium);
 }
 
-static int Menu_options(MenuList* list);
+static int Menu_options(MenuList *list);
 
-static int MenuList_freeItems(MenuList* list, int i) {
+static int MenuList_freeItems(MenuList *list, int i)
+{
 	// TODO: what calls this? do menu's register for needing it? then call it on quit for each?
-	if (list->items) free(list->items);
+	if (list->items)
+		free(list->items);
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionFrontend_optionChanged(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
+static int OptionFrontend_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
 	Config_syncFrontend(item->key, item->value);
 	return MENU_CALLBACK_NOP;
 }
@@ -5122,40 +5178,42 @@ static MenuList OptionFrontend_menu = {
 	.on_change = OptionFrontend_optionChanged,
 	.items = NULL,
 };
-static int OptionFrontend_openMenu(MenuList* list, int i) {
-	if (OptionFrontend_menu.items==NULL) {
+static int OptionFrontend_openMenu(MenuList *list, int i)
+{
+	if (OptionFrontend_menu.items == NULL) {
 		// TODO: where do I free this? I guess I don't :sweat_smile:
 		if (!config.frontend.enabled_count) {
 			int enabled_count = 0;
-			for (int i=0; i<config.frontend.count; i++) {
-				if (!config.frontend.options[i].lock) enabled_count += 1;
+			for (int i = 0; i < config.frontend.count; i++) {
+				if (!config.frontend.options[i].lock)
+					enabled_count += 1;
 			}
 			config.frontend.enabled_count = enabled_count;
-			config.frontend.enabled_options = calloc(enabled_count+1, sizeof(Option*));
+			config.frontend.enabled_options = calloc(enabled_count + 1, sizeof(Option *));
 			int j = 0;
-			for (int i=0; i<config.frontend.count; i++) {
-				Option* item = &config.frontend.options[i];
-				if (item->lock) continue;
+			for (int i = 0; i < config.frontend.count; i++) {
+				Option *item = &config.frontend.options[i];
+				if (item->lock)
+					continue;
 				config.frontend.enabled_options[j] = item;
 				j += 1;
 			}
 		}
-		OptionFrontend_menu.items = calloc(config.frontend.enabled_count+1, sizeof(MenuItem));
-		for (int j=0; j<config.frontend.enabled_count; j++) {
-			Option* option = config.frontend.enabled_options[j];
-			MenuItem* item = &OptionFrontend_menu.items[j];
+		OptionFrontend_menu.items = calloc(config.frontend.enabled_count + 1, sizeof(MenuItem));
+		for (int j = 0; j < config.frontend.enabled_count; j++) {
+			Option *option = config.frontend.enabled_options[j];
+			MenuItem *item = &OptionFrontend_menu.items[j];
 			item->key = option->key;
 			item->name = option->name;
 			item->desc = option->desc;
 			item->value = option->value;
 			item->values = option->labels;
 		}
-	}
-	else {
+	} else {
 		// update values
-		for (int j=0; j<config.frontend.enabled_count; j++) {
-			Option* option = config.frontend.enabled_options[j];
-			MenuItem* item = &OptionFrontend_menu.items[j];
+		for (int j = 0; j < config.frontend.enabled_count; j++) {
+			Option *option = config.frontend.enabled_options[j];
+			MenuItem *item = &OptionFrontend_menu.items[j];
 			item->value = option->value;
 		}
 	}
@@ -5163,19 +5221,18 @@ static int OptionFrontend_openMenu(MenuList* list, int i) {
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionEmulator_optionChanged(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	Option* option = OptionList_getOption(&config.core, item->key);
-	LOG_info("%s (%s) changed from `%s` (%s) to `%s` (%s)\n", item->name, item->key, 
-		item->values[option->value], option->values[option->value], 
-		item->values[item->value], option->values[item->value]
-	);
+static int OptionEmulator_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	Option *option = OptionList_getOption(&config.core, item->key);
+	LOG_info("%s (%s) changed from `%s` (%s) to `%s` (%s)\n", item->name, item->key, item->values[option->value],
+			 option->values[option->value], item->values[item->value], option->values[item->value]);
 	OptionList_setOptionRawValue(&config.core, item->key, item->value);
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionEmulator_openMenu(MenuList* list, int i);
-static int OptionEmulator_optionDetail(MenuList* list, int i);
+static int OptionEmulator_openMenu(MenuList *list, int i);
+static int OptionEmulator_optionDetail(MenuList *list, int i);
 
 static MenuList OptionEmulator_menu = {
 	.type = MENU_FIXED,
@@ -5184,8 +5241,9 @@ static MenuList OptionEmulator_menu = {
 	.items = NULL,
 };
 
-static int OptionEmulator_optionDetail(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
+static int OptionEmulator_optionDetail(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
 
 	if (item->values == NULL) {
 		// This is a category item
@@ -5200,20 +5258,22 @@ static int OptionEmulator_optionDetail(MenuList* list, int i) {
 		OptionEmulator_openMenu(list, 0);
 		list->category = NULL;
 
-		config.core.enabled_count = prev_enabled_count ;
-		config.core.enabled_options = prev_enabled ;
+		config.core.enabled_count = prev_enabled_count;
+		config.core.enabled_options = prev_enabled;
 		OptionEmulator_menu.items = prev_items;
 
 		LOG_info("%s: back to root menu\n", __FUNCTION__);
-	}
-	else {
-		Option* option = OptionList_getOption(&config.core, item->key);
-		if (option->full) return Menu_messageWithFont(option->full, (char*[]){ "B","BACK", NULL }, font.medium);
-		else return MENU_CALLBACK_NOP;
+	} else {
+		Option *option = OptionList_getOption(&config.core, item->key);
+		if (option->full)
+			return Menu_messageWithFont(option->full, (char *[]){"B", "BACK", NULL}, font.medium);
+		else
+			return MENU_CALLBACK_NOP;
 	}
 }
 
-static int OptionEmulator_openMenu(MenuList* list, int index) {
+static int OptionEmulator_openMenu(MenuList *list, int index)
+{
 	LOG_info("%s: limit to category %s\n", __FUNCTION__, list->category ? list->category : "<all>");
 
 	if (list->category == NULL) {
@@ -5224,8 +5284,8 @@ static int OptionEmulator_openMenu(MenuList* list, int index) {
 	}
 
 	int enabled_count = 0;
-	config.core.enabled_options = calloc(config.core.count + 1, sizeof(Option*));
-	for (int i=0; i<config.core.count; i++) {
+	config.core.enabled_options = calloc(config.core.count + 1, sizeof(Option *));
+	for (int i = 0; i < config.core.count; i++) {
 		Option *item = &config.core.options[i];
 
 		// Exclude locked and hidden items
@@ -5256,7 +5316,7 @@ static int OptionEmulator_openMenu(MenuList* list, int index) {
 
 	OptionEmulator_menu.items = calloc(cat_count + config.core.enabled_count + 1, sizeof(MenuItem));
 
-	for (int i=0; i<cat_count; i++) {
+	for (int i = 0; i < cat_count; i++) {
 		OptionCategory *cat = &config.core.categories[i];
 		MenuItem *item = &OptionEmulator_menu.items[i];
 		item->key = cat->key;
@@ -5264,7 +5324,7 @@ static int OptionEmulator_openMenu(MenuList* list, int index) {
 		item->desc = cat->info;
 	}
 
-	for (int i=0; i<config.core.enabled_count; i++) {
+	for (int i = 0; i < config.core.enabled_count; i++) {
 		Option *option = config.core.enabled_options[i];
 		MenuItem *item = &OptionEmulator_menu.items[cat_count + i];
 		item->key = option->key;
@@ -5273,7 +5333,7 @@ static int OptionEmulator_openMenu(MenuList* list, int index) {
 		item->value = option->value;
 		item->values = option->labels;
 	}
-	
+
 	if (cat_count || config.core.enabled_count) {
 		Menu_options(&OptionEmulator_menu);
 		free(OptionEmulator_menu.items);
@@ -5281,43 +5341,41 @@ static int OptionEmulator_openMenu(MenuList* list, int index) {
 		OptionEmulator_menu.items = NULL;
 		config.core.enabled_count = 0;
 		config.core.enabled_options = NULL;
-	}
-	else {
+	} else {
 		if (list->category) {
-			Menu_message("This category has no options.", (char*[]){ "B","BACK", NULL });
-		}
-		else {
-			Menu_message("This core has no options.", (char*[]){ "B","BACK", NULL });
+			Menu_message("This category has no options.", (char *[]){"B", "BACK", NULL});
+		} else {
+			Menu_message("This core has no options.", (char *[]){"B", "BACK", NULL});
 		}
 	}
-	
+
 	return MENU_CALLBACK_NOP;
 }
 
-int OptionControls_bind(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	if (item->values!=button_labels) {
+int OptionControls_bind(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	if (item->values != button_labels) {
 		// LOG_info("changed gamepad_type\n");
 		return MENU_CALLBACK_NOP;
 	}
-	
-	ButtonMapping* button = &config.controls[item->id];
-	
+
+	ButtonMapping *button = &config.controls[item->id];
+
 	int bound = 0;
 	while (!bound) {
 		GFX_startFrame();
 		PAD_poll();
-		
+
 		// NOTE: off by one because of the initial NONE value
-		for (int id=0; id<=LOCAL_BUTTON_COUNT; id++) {
-			if (PAD_justPressed(1 << (id-1))) {
+		for (int id = 0; id <= LOCAL_BUTTON_COUNT; id++) {
+			if (PAD_justPressed(1 << (id - 1))) {
 				item->value = id;
 				button->local = id - 1;
 				if (PAD_isPressed(BTN_MENU)) {
 					item->value += LOCAL_BUTTON_COUNT;
 					button->mod = 1;
-				}
-				else {
+				} else {
 					button->mod = 0;
 				}
 				bound = 1;
@@ -5329,18 +5387,22 @@ int OptionControls_bind(MenuList* list, int i) {
 	}
 	return MENU_CALLBACK_NEXT_ITEM;
 }
-static int OptionControls_unbind(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	if (item->values!=button_labels) return MENU_CALLBACK_NOP;
-	
-	ButtonMapping* button = &config.controls[item->id];
+static int OptionControls_unbind(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	if (item->values != button_labels)
+		return MENU_CALLBACK_NOP;
+
+	ButtonMapping *button = &config.controls[item->id];
 	button->local = -1;
 	button->mod = 0;
 	return MENU_CALLBACK_NOP;
 }
-static int OptionControls_optionChanged(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	if (item->values!=gamepad_labels) return MENU_CALLBACK_NOP;
+static int OptionControls_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	if (item->values != gamepad_labels)
+		return MENU_CALLBACK_NOP;
 
 	if (has_custom_controllers) {
 		gamepad_type = item->value;
@@ -5352,86 +5414,88 @@ static int OptionControls_optionChanged(MenuList* list, int i) {
 static MenuList OptionControls_menu = {
 	.type = MENU_INPUT,
 	.desc = "Press A to set and X to clear."
-		"\nSupports single button and MENU+button." // TODO: not supported on nano because POWER doubles as MENU
+			"\nSupports single button and MENU+button." // TODO: not supported on nano because POWER doubles as MENU
 	,
 	.on_confirm = OptionControls_bind,
 	.on_change = OptionControls_unbind,
-	.items = NULL
-};
+	.items = NULL};
 
-static int OptionControls_openMenu(MenuList* list, int i) {
+static int OptionControls_openMenu(MenuList *list, int i)
+{
 	LOG_info("OptionControls_openMenu\n");
 
-	if (OptionControls_menu.items==NULL) {
-		
+	if (OptionControls_menu.items == NULL) {
 		// TODO: where do I free this?
-		OptionControls_menu.items = calloc(RETRO_BUTTON_COUNT+1+has_custom_controllers, sizeof(MenuItem));
+		OptionControls_menu.items = calloc(RETRO_BUTTON_COUNT + 1 + has_custom_controllers, sizeof(MenuItem));
 		int k = 0;
-		
+
 		if (has_custom_controllers) {
-			MenuItem* item = &OptionControls_menu.items[k++];
+			MenuItem *item = &OptionControls_menu.items[k++];
 			item->name = "Controller";
 			item->desc = "Select the type of controller.";
 			item->value = gamepad_type;
 			item->values = gamepad_labels;
 			item->on_change = OptionControls_optionChanged;
 		}
-		
-		for (int j=0; config.controls[j].name; j++) {
-			ButtonMapping* button = &config.controls[j];
-			if (button->ignore) continue;
-			
-			//LOG_info("\t%s (%i:%i)\n", button->name, button->local, button->retro);
-			
-			MenuItem* item = &OptionControls_menu.items[k++];
+
+		for (int j = 0; config.controls[j].name; j++) {
+			ButtonMapping *button = &config.controls[j];
+			if (button->ignore)
+				continue;
+
+			// LOG_info("\t%s (%i:%i)\n", button->name, button->local, button->retro);
+
+			MenuItem *item = &OptionControls_menu.items[k++];
 			item->id = j;
 			item->name = button->name;
 			item->desc = NULL;
 			item->value = button->local + 1;
-			if (button->mod) item->value += LOCAL_BUTTON_COUNT;
+			if (button->mod)
+				item->value += LOCAL_BUTTON_COUNT;
 			item->values = button_labels;
 		}
-	}
-	else {
+	} else {
 		// update values
 		int k = 0;
-		
+
 		if (has_custom_controllers) {
-			MenuItem* item = &OptionControls_menu.items[k++];
+			MenuItem *item = &OptionControls_menu.items[k++];
 			item->value = gamepad_type;
 		}
-		
-		for (int j=0; config.controls[j].name; j++) {
-			ButtonMapping* button = &config.controls[j];
-			if (button->ignore) continue;
-			
-			MenuItem* item = &OptionControls_menu.items[k++];
+
+		for (int j = 0; config.controls[j].name; j++) {
+			ButtonMapping *button = &config.controls[j];
+			if (button->ignore)
+				continue;
+
+			MenuItem *item = &OptionControls_menu.items[k++];
 			item->value = button->local + 1;
-			if (button->mod) item->value += LOCAL_BUTTON_COUNT;
+			if (button->mod)
+				item->value += LOCAL_BUTTON_COUNT;
 		}
 	}
 	Menu_options(&OptionControls_menu);
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionShortcuts_bind(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	ButtonMapping* button = &config.shortcuts[item->id];
+static int OptionShortcuts_bind(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	ButtonMapping *button = &config.shortcuts[item->id];
 	int bound = 0;
 	while (!bound) {
 		GFX_startFrame();
 		PAD_poll();
-		
+
 		// NOTE: off by one because of the initial NONE value
-		for (int id=0; id<=LOCAL_BUTTON_COUNT; id++) {
-			if (PAD_justPressed(1 << (id-1))) {
+		for (int id = 0; id <= LOCAL_BUTTON_COUNT; id++) {
+			if (PAD_justPressed(1 << (id - 1))) {
 				item->value = id;
 				button->local = id - 1;
 				if (PAD_isPressed(BTN_MENU)) {
 					item->value += LOCAL_BUTTON_COUNT;
 					button->mod = 1;
-				}
-				else {
+				} else {
 					button->mod = 0;
 				}
 				bound = 1;
@@ -5443,52 +5507,61 @@ static int OptionShortcuts_bind(MenuList* list, int i) {
 	}
 	return MENU_CALLBACK_NEXT_ITEM;
 }
-static int OptionShortcuts_unbind(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
-	ButtonMapping* button = &config.shortcuts[item->id];
+static int OptionShortcuts_unbind(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	ButtonMapping *button = &config.shortcuts[item->id];
 	button->local = -1;
 	button->mod = 0;
 	return MENU_CALLBACK_NOP;
 }
 static MenuList OptionShortcuts_menu = {
 	.type = MENU_INPUT,
-	.desc = "Press A to set and X to clear." 
-		"\nSupports single button and MENU+button." // TODO: not supported on nano because POWER doubles as MENU
+	.desc = "Press A to set and X to clear."
+			"\nSupports single button and MENU+button." // TODO: not supported on nano because POWER doubles as MENU
 	,
 	.on_confirm = OptionShortcuts_bind,
 	.on_change = OptionShortcuts_unbind,
-	.items = NULL
-};
-static char* getSaveDesc(void) {
+	.items = NULL};
+static char *getSaveDesc(void)
+{
 	switch (config.loaded) {
-		case CONFIG_NONE:		return "Using defaults."; break;
-		case CONFIG_CONSOLE:	return "Using console config."; break;
-		case CONFIG_GAME:		return "Using game config."; break;
+	case CONFIG_NONE:
+		return "Using defaults.";
+		break;
+	case CONFIG_CONSOLE:
+		return "Using console config.";
+		break;
+	case CONFIG_GAME:
+		return "Using game config.";
+		break;
 	}
 	return NULL;
 }
-static int OptionShortcuts_openMenu(MenuList* list, int i) {
-	if (OptionShortcuts_menu.items==NULL) {
+static int OptionShortcuts_openMenu(MenuList *list, int i)
+{
+	if (OptionShortcuts_menu.items == NULL) {
 		// TODO: where do I free this? I guess I don't :sweat_smile:
-		OptionShortcuts_menu.items = calloc(SHORTCUT_COUNT+1, sizeof(MenuItem));
-		for (int j=0; config.shortcuts[j].name; j++) {
-			ButtonMapping* button = &config.shortcuts[j];
-			MenuItem* item = &OptionShortcuts_menu.items[j];
+		OptionShortcuts_menu.items = calloc(SHORTCUT_COUNT + 1, sizeof(MenuItem));
+		for (int j = 0; config.shortcuts[j].name; j++) {
+			ButtonMapping *button = &config.shortcuts[j];
+			MenuItem *item = &OptionShortcuts_menu.items[j];
 			item->id = j;
 			item->name = button->name;
 			item->desc = NULL;
 			item->value = button->local + 1;
-			if (button->mod) item->value += LOCAL_BUTTON_COUNT;
+			if (button->mod)
+				item->value += LOCAL_BUTTON_COUNT;
 			item->values = button_labels;
 		}
-	}
-	else {
+	} else {
 		// update values
-		for (int j=0; config.shortcuts[j].name; j++) {
-			ButtonMapping* button = &config.shortcuts[j];
-			MenuItem* item = &OptionShortcuts_menu.items[j];
+		for (int j = 0; config.shortcuts[j].name; j++) {
+			ButtonMapping *button = &config.shortcuts[j];
+			MenuItem *item = &OptionShortcuts_menu.items[j];
 			item->value = button->local + 1;
-			if (button->mod) item->value += LOCAL_BUTTON_COUNT;
+			if (button->mod)
+				item->value += LOCAL_BUTTON_COUNT;
 		}
 	}
 	Menu_options(&OptionShortcuts_menu);
@@ -5496,66 +5569,72 @@ static int OptionShortcuts_openMenu(MenuList* list, int i) {
 }
 
 static void OptionSaveChanges_updateDesc(void);
-static int OptionSaveChanges_onConfirm(MenuList* list, int i) {
-	char* message;
+static int OptionSaveChanges_onConfirm(MenuList *list, int i)
+{
+	char *message;
 	switch (i) {
-		case 0: {
-			Config_write(CONFIG_WRITE_ALL);
-			message = "Saved for console.";
-			break;
-		}
-		case 1: {
-			Config_write(CONFIG_WRITE_GAME);
-			message = "Saved for game.";
-			break;
-		}
-		default: {
-			Config_restore();
-			if (config.loaded) message = "Restored console defaults.";
-			else message = "Restored defaults.";
-			break;
-		}
+	case 0: {
+		Config_write(CONFIG_WRITE_ALL);
+		message = "Saved for console.";
+		break;
+	}
+	case 1: {
+		Config_write(CONFIG_WRITE_GAME);
+		message = "Saved for game.";
+		break;
+	}
+	default: {
+		Config_restore();
+		if (config.loaded)
+			message = "Restored console defaults.";
+		else
+			message = "Restored defaults.";
+		break;
 	}
-	Menu_message(message, (char*[]){ "A","OKAY", NULL });
+	}
+	Menu_message(message, (char *[]){"A", "OKAY", NULL});
 	OptionSaveChanges_updateDesc();
 	return MENU_CALLBACK_EXIT;
 }
-static MenuList OptionSaveChanges_menu = {
-	.type = MENU_LIST,
-	.on_confirm = OptionSaveChanges_onConfirm,
-	.items = (MenuItem[]){
-		{"Save for console"},
-		{"Save for game"},
-		{"Restore defaults"},
-		{NULL},
-	}
-};
-static int OptionSaveChanges_openMenu(MenuList* list, int i) {
+static MenuList OptionSaveChanges_menu = {.type = MENU_LIST,
+										  .on_confirm = OptionSaveChanges_onConfirm,
+										  .items = (MenuItem[]){
+											  {"Save for console"},
+											  {"Save for game"},
+											  {"Restore defaults"},
+											  {NULL},
+										  }};
+static int OptionSaveChanges_openMenu(MenuList *list, int i)
+{
 	OptionSaveChanges_updateDesc();
 	OptionSaveChanges_menu.desc = getSaveDesc();
 	Menu_options(&OptionSaveChanges_menu);
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionQuicksave_onConfirm(MenuList* list, int i) {
+static int OptionQuicksave_onConfirm(MenuList *list, int i)
+{
 	Menu_beforeSleep();
 	PWR_powerOff(0);
 }
 
-static int OptionCheats_optionChanged(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
+static int OptionCheats_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
 	struct Cheat *cheat = &cheatcodes.cheats[i];
 	cheat->enabled = item->value;
 	Core_applyCheats(&cheatcodes);
 	return MENU_CALLBACK_NOP;
 }
 
-static int OptionCheats_optionDetail(MenuList* list, int i) {
-	MenuItem* item = &list->items[i];
+static int OptionCheats_optionDetail(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
 	struct Cheat *cheat = &cheatcodes.cheats[i];
-	if (cheat->info) 
-		return Menu_message((char*)cheat->info, (char*[]){ "B","BACK", NULL });
-	else return MENU_CALLBACK_NOP;
+	if (cheat->info)
+		return Menu_message((char *)cheat->info, (char *[]){"B", "BACK", NULL});
+	else
+		return MENU_CALLBACK_NOP;
 }
 
 static MenuList OptionCheats_menu = {
@@ -5564,11 +5643,12 @@ static MenuList OptionCheats_menu = {
 	.on_change = OptionCheats_optionChanged,
 	.items = NULL,
 };
-static int OptionCheats_openMenu(MenuList* list, int i) {
+static int OptionCheats_openMenu(MenuList *list, int i)
+{
 	if (OptionCheats_menu.items == NULL) {
 		// populate
 		OptionCheats_menu.items = calloc(cheatcodes.count + 1, sizeof(MenuItem));
-		for (int i = 0; i<cheatcodes.count; i++) {
+		for (int i = 0; i < cheatcodes.count; i++) {
 			struct Cheat *cheat = &cheatcodes.cheats[i];
 			MenuItem *item = &OptionCheats_menu.items[i];
 
@@ -5577,24 +5657,23 @@ static int OptionCheats_openMenu(MenuList* list, int i) {
 			item->name = calloc(len, sizeof(char));
 			strcpy(item->name, cheat->name);
 
-			if(cheat->info) {
+			if (cheat->info) {
 				len = strlen(cheat->info) + 1;
 				item->desc = calloc(len, sizeof(char));
 				strncpy(item->desc, cheat->info, len);
-				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2*PADDING), 2);
+				GFX_wrapText(font.tiny, item->desc, DEVICE_WIDTH - SCALE1(2 * PADDING), 2);
 			}
 
 			item->value = cheat->enabled;
 			item->values = onoff_labels;
 		}
-	}
-	else {
+	} else {
 		// update
 		for (int j = 0; j < cheatcodes.count; j++) {
 			struct Cheat *cheat = &cheatcodes.cheats[i];
 			MenuItem *item = &OptionCheats_menu.items[i];
 			// I guess that makes sense, nobody is changing these but us - what about state restore?
-			if(!cheat->enabled)
+			if (!cheat->enabled)
 				continue;
 			item->value = cheat->enabled;
 		}
@@ -5602,8 +5681,7 @@ static int OptionCheats_openMenu(MenuList* list, int i) {
 
 	if (OptionCheats_menu.items[0].name) {
 		Menu_options(&OptionCheats_menu);
-	}
-	else {
+	} else {
 		// we expect at most CHEAT_MAX_PATHS paths with MAX_PATH length, just hardcode it here
 		char paths[CHEAT_MAX_PATHS][MAX_PATH];
 		int count = 0;
@@ -5617,60 +5695,56 @@ static int OptionCheats_openMenu(MenuList* list, int i) {
 		strcat(cheats_path, "No cheat file loaded.\n\n");
 
 		for (int i = 0; i < count; i++) {
-			char* p = basename(paths[i]);
+			char *p = basename(paths[i]);
 			// append to cheats_path
 			strcat(cheats_path, p);
-			if (i < count - 1) strcat(cheats_path, "\n");
+			if (i < count - 1)
+				strcat(cheats_path, "\n");
 		}
 
-		Menu_messageWithFont(cheats_path, (char*[]){ "B","BACK", NULL }, font.small);
+		Menu_messageWithFont(cheats_path, (char *[]){"B", "BACK", NULL}, font.small);
 	}
-	
+
 	return MENU_CALLBACK_NOP;
 }
 
 
-
-
-
-static int OptionPragmas_optionChanged(MenuList* list, int i) {
-		MenuItem* item = &list->items[i];
-		for (int shader_index=0; shader_index < config.shaders.options[SH_NROFSHADERS].value; shader_index++) {
-			ShaderParam *params = PLAT_getShaderPragmas(shader_index);
-			for (int j = 0; j < 32; j++) {
-				if (exactMatch(params[j].name, item->key)) {
-					params[j].value = strtof(item->values[item->value], NULL);
-				}
+static int OptionPragmas_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	for (int shader_index = 0; shader_index < config.shaders.options[SH_NROFSHADERS].value; shader_index++) {
+		ShaderParam *params = PLAT_getShaderPragmas(shader_index);
+		for (int j = 0; j < 32; j++) {
+			if (exactMatch(params[j].name, item->key)) {
+				params[j].value = strtof(item->values[item->value], NULL);
 			}
 		}
-		int global_index = 0;
-		for (int y = 0; y < SH_NROFSHADERS; y++) {
-			for (int j = 0; j < config.shaderpragmas[y].count; j++) {
-				MenuItem* item = &list->items[global_index];
-				config.shaderpragmas[y].options[j].value = item->value;
-				global_index++;
-			}
+	}
+	int global_index = 0;
+	for (int y = 0; y < SH_NROFSHADERS; y++) {
+		for (int j = 0; j < config.shaderpragmas[y].count; j++) {
+			MenuItem *item = &list->items[global_index];
+			config.shaderpragmas[y].options[j].value = item->value;
+			global_index++;
 		}
-		return MENU_CALLBACK_NOP;
+	}
+	return MENU_CALLBACK_NOP;
 }
 
 static MenuList PragmasOptions_menu = {
-	.type = MENU_FIXED,
-	.on_confirm = NULL,
-	.on_change = OptionPragmas_optionChanged,
-	.items = NULL
-};
-static int OptionPragmas_openMenu(MenuList* list, int i) {
+	.type = MENU_FIXED, .on_confirm = NULL, .on_change = OptionPragmas_optionChanged, .items = NULL};
+static int OptionPragmas_openMenu(MenuList *list, int i)
+{
 	int progressCount = 0;
 	int totalcount = 0;
-	for (int y=0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
+	for (int y = 0; y < config.shaders.options[SH_NROFSHADERS].value; y++) {
 		totalcount += config.shaderpragmas[y].count;
 	}
 	PragmasOptions_menu.items = calloc(totalcount + 1, sizeof(MenuItem));
-	for (int y=0; y < SH_NROFSHADERS; y++) {
+	for (int y = 0; y < SH_NROFSHADERS; y++) {
 		for (int j = 0; j < config.shaderpragmas[y].count; j++) {
-			MenuItem* item = &PragmasOptions_menu.items[progressCount];
-			Option* configitem = &config.shaderpragmas[y].options[j];
+			MenuItem *item = &PragmasOptions_menu.items[progressCount];
+			Option *configitem = &config.shaderpragmas[y].options[j];
 			item->id = j;
 			item->name = configitem->name;
 			item->desc = configitem->desc;
@@ -5680,59 +5754,58 @@ static int OptionPragmas_openMenu(MenuList* list, int i) {
 			progressCount++;
 		}
 	}
-	
+
 	if (PragmasOptions_menu.items[0].name) {
 		Menu_options(&PragmasOptions_menu);
 	} else {
-		Menu_message("No extra settings found", (char*[]){"B", "BACK", NULL});
+		Menu_message("No extra settings found", (char *[]){"B", "BACK", NULL});
 	}
 
 	return MENU_CALLBACK_NOP;
 }
-static int OptionShaders_optionChanged(MenuList* list, int i) {
-		MenuItem* item = &list->items[i];
-		Config_syncShaders(item->key, item->value);
-		applyShaderSettings();
-		for (int i = 0; i < config.shaders.count; i++) {
-			MenuItem* item = &list->items[i];
-			item->value = config.shaders.options[i].value;
-
-		}
-		if(i==1) initShaders();
-		return MENU_CALLBACK_NOP;
+static int OptionShaders_optionChanged(MenuList *list, int i)
+{
+	MenuItem *item = &list->items[i];
+	Config_syncShaders(item->key, item->value);
+	applyShaderSettings();
+	for (int i = 0; i < config.shaders.count; i++) {
+		MenuItem *item = &list->items[i];
+		item->value = config.shaders.options[i].value;
+	}
+	if (i == 1)
+		initShaders();
+	return MENU_CALLBACK_NOP;
 }
 
 static MenuList ShaderOptions_menu = {
-	.type = MENU_FIXED,
-	.on_confirm = NULL,
-	.on_change = OptionShaders_optionChanged,
-	.items = NULL
-};
+	.type = MENU_FIXED, .on_confirm = NULL, .on_change = OptionShaders_optionChanged, .items = NULL};
 
-static int OptionShaders_openMenu(MenuList* list, int i) {
+static int OptionShaders_openMenu(MenuList *list, int i)
+{
 	int filecount;
-	char** filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount,NULL);
+	char **filelist = list_files_in_folder(SHADERS_FOLDER "/glsl", &filecount, NULL);
 
 	// Check if folder read failed or no files found
 	if (!filelist || filecount == 0) {
-		Menu_message("No shaders available\n/Shaders folder or shader files not found", (char*[]){"B", "BACK", NULL});
+		Menu_message("No shaders available\n/Shaders folder or shader files not found", (char *[]){"B", "BACK", NULL});
 		return MENU_CALLBACK_NOP;
 	}
 
 	// NULL-terminate filelist just in case
-	filelist = realloc(filelist, sizeof(char*) * (filecount + 1));
+	filelist = realloc(filelist, sizeof(char *) * (filecount + 1));
 	filelist[filecount] = NULL;
 
 	ShaderOptions_menu.items = calloc(config.shaders.count + 1, sizeof(MenuItem));
 	for (int i = 0; i < config.shaders.count; i++) {
-		MenuItem* item = &ShaderOptions_menu.items[i];
-		Option* configitem = &config.shaders.options[i];
+		MenuItem *item = &ShaderOptions_menu.items[i];
+		Option *configitem = &config.shaders.options[i];
 		item->id = i;
 		item->name = configitem->name;
 		item->desc = configitem->desc;
 		item->value = configitem->value;
 		item->key = configitem->key;
-		if(i == SH_EXTRASETTINGS) item->on_confirm = OptionPragmas_openMenu;
+		if (i == SH_EXTRASETTINGS)
+			item->on_confirm = OptionPragmas_openMenu;
 
 		if (strcmp(config.shaders.options[i].key, "minarch_shader1") == 0 ||
 			strcmp(config.shaders.options[i].key, "minarch_shader2") == 0 ||
@@ -5743,12 +5816,12 @@ static int OptionShaders_openMenu(MenuList* list, int i) {
 			item->values = config.shaders.options[i].values;
 		}
 	}
-	
+
 
 	if (ShaderOptions_menu.items[0].name) {
 		Menu_options(&ShaderOptions_menu);
 	} else {
-		Menu_message("No shaders available\n/Shaders folder or shader files not found", (char*[]){"B", "BACK", NULL});
+		Menu_message("No shaders available\n/Shaders folder or shader files not found", (char *[]){"B", "BACK", NULL});
 	}
 
 	return MENU_CALLBACK_NOP;
@@ -5756,28 +5829,29 @@ static int OptionShaders_openMenu(MenuList* list, int i) {
 
 static MenuList options_menu = {
 	.type = MENU_LIST,
-	.items = (MenuItem[]) {
-		{"Frontend", "NextUI (" BUILD_DATE " " BUILD_HASH ")",.on_confirm=OptionFrontend_openMenu},
-		{"Emulator",.on_confirm=OptionEmulator_openMenu},
-		{"Shaders",.on_confirm=OptionShaders_openMenu},
-		{"Cheats",.on_confirm=OptionCheats_openMenu},
-		{"Controls",.on_confirm=OptionControls_openMenu},
-		{"Shortcuts",.on_confirm=OptionShortcuts_openMenu}, 
-		{"Save Changes",.on_confirm=OptionSaveChanges_openMenu},
+	.items = (MenuItem[]){
+		{"Frontend", "NextUI (" BUILD_DATE " " BUILD_HASH ")", .on_confirm = OptionFrontend_openMenu},
+		{"Emulator", .on_confirm = OptionEmulator_openMenu},
+		{"Shaders", .on_confirm = OptionShaders_openMenu},
+		{"Cheats", .on_confirm = OptionCheats_openMenu},
+		{"Controls", .on_confirm = OptionControls_openMenu},
+		{"Shortcuts", .on_confirm = OptionShortcuts_openMenu},
+		{"Save Changes", .on_confirm = OptionSaveChanges_openMenu},
 		{NULL},
 		{NULL},
-	}
-};
+	}};
 
-static void OptionSaveChanges_updateDesc(void) {
+static void OptionSaveChanges_updateDesc(void)
+{
 	options_menu.items[4].desc = getSaveDesc();
 }
 
 #define OPTION_PADDING 8
-static bool getAlias(char* path, char* alias) {
+static bool getAlias(char *path, char *alias)
+{
 	bool is_alias = false;
 	// LOG_info("alias path: %s\n", path);
-	char* tmp;
+	char *tmp;
 	char map_path[256];
 	strcpy(map_path, path);
 	tmp = strrchr(map_path, '/');
@@ -5786,25 +5860,27 @@ static bool getAlias(char* path, char* alias) {
 		strcpy(tmp, "map.txt");
 		// LOG_info("map_path: %s\n", map_path);
 	}
-	char* file_name = strrchr(path,'/');
-	if (file_name) file_name += 1;
+	char *file_name = strrchr(path, '/');
+	if (file_name)
+		file_name += 1;
 	// LOG_info("file_name: %s\n", file_name);
-	
+
 	if (exists(map_path)) {
-		FILE* file = fopen(map_path, "r");
+		FILE *file = fopen(map_path, "r");
 		if (file) {
 			char line[256];
-			while (fgets(line,256,file)!=NULL) {
+			while (fgets(line, 256, file) != NULL) {
 				normalizeNewline(line);
 				trimTrailingNewlines(line);
-				if (strlen(line)==0) continue; // skip empty lines
-			
-				tmp = strchr(line,'\t');
+				if (strlen(line) == 0)
+					continue; // skip empty lines
+
+				tmp = strchr(line, '\t');
 				if (tmp) {
 					tmp[0] = '\0';
-					char* key = line;
-					char* value = tmp+1;
-					if (exactMatch(file_name,key)) {
+					char *key = line;
+					char *value = tmp + 1;
+					if (exactMatch(file_name, key)) {
 						strcpy(alias, value);
 						is_alias = true;
 						break;
@@ -5817,442 +5893,436 @@ static bool getAlias(char* path, char* alias) {
 	return is_alias;
 }
 
-static int Menu_options(MenuList* list) {
-	MenuItem* items = list->items;
+static int Menu_options(MenuList *list)
+{
+	MenuItem *items = list->items;
 	int type = list->type;
 
 	int dirty = 1;
 	int show_options = 1;
 	int show_settings = 0;
 	int await_input = 0;
-	
+
 	// dependent on option list offset top and bottom, eg. the gray triangles
-	int max_visible_options = (screen->h - ((SCALE1(PADDING + PILL_SIZE) * 2) + SCALE1(BUTTON_SIZE))) / SCALE1(BUTTON_SIZE); // 7 for 480, 10 for 720
-	
+	int max_visible_options = (screen->h - ((SCALE1(PADDING + PILL_SIZE) * 2) + SCALE1(BUTTON_SIZE))) /
+							  SCALE1(BUTTON_SIZE); // 7 for 480, 10 for 720
+
 	int count;
-	for (count=0; items[count].name; count++);
+	for (count = 0; items[count].name; count++)
+		;
 	int selected = 0;
 	int start = 0;
-	int end = MIN(count,max_visible_options);
+	int end = MIN(count, max_visible_options);
 	int visible_rows = end;
-	
+
 	OptionSaveChanges_updateDesc();
-	
+
 	int defer_menu = false;
 	while (show_options) {
 		if (await_input) {
 			defer_menu = true;
 			list->on_confirm(list, selected);
-			
+
 			selected += 1;
-			if (selected>=count) {
+			if (selected >= count) {
 				selected = 0;
 				start = 0;
 				end = visible_rows;
-			}
-			else if (selected>=end) {
+			} else if (selected >= end) {
 				start += 1;
 				end += 1;
 			}
 			dirty = 1;
 			await_input = false;
 		}
-		
+
 		GFX_startFrame();
 		PAD_poll();
 		if (PAD_justRepeated(BTN_UP)) {
 			selected -= 1;
-			if (selected<0) {
+			if (selected < 0) {
 				selected = count - 1;
-				start = MAX(0,count - max_visible_options);
+				start = MAX(0, count - max_visible_options);
 				end = count;
-			}
-			else if (selected<start) {
+			} else if (selected < start) {
 				start -= 1;
 				end -= 1;
 			}
 			dirty = 1;
-		}
-		else if (PAD_justRepeated(BTN_DOWN)) {
+		} else if (PAD_justRepeated(BTN_DOWN)) {
 			selected += 1;
-			if (selected>=count) {
+			if (selected >= count) {
 				selected = 0;
 				start = 0;
 				end = visible_rows;
-			}
-			else if (selected>=end) {
+			} else if (selected >= end) {
 				start += 1;
 				end += 1;
 			}
 			dirty = 1;
-		}
-		else {
-			MenuItem* item = &items[selected];
-			if (item->values && item->values!=button_labels) { // not an input binding
+		} else {
+			MenuItem *item = &items[selected];
+			if (item->values && item->values != button_labels) { // not an input binding
 				if (PAD_justRepeated(BTN_LEFT)) {
-					if (item->value>0) item->value -= 1;
+					if (item->value > 0)
+						item->value -= 1;
 					else {
 						int j;
-						for (j=0; item->values[j]; j++);
+						for (j = 0; item->values[j]; j++)
+							;
 						item->value = j - 1;
 					}
-				
-					if (item->on_change) item->on_change(list, selected);
-					else if (list->on_change) list->on_change(list, selected);
-				
+
+					if (item->on_change)
+						item->on_change(list, selected);
+					else if (list->on_change)
+						list->on_change(list, selected);
+
 					dirty = 1;
-				}
-				else if (PAD_justRepeated(BTN_RIGHT)) {
+				} else if (PAD_justRepeated(BTN_RIGHT)) {
 					// first check if its not out of bounds already
 					int i = 0;
-					while (item->values[i]) i++; 
-					if (item->value >= i) item->value = 0;
-				
-					if (item->values[item->value+1]) item->value += 1;
-					else item->value = 0;
-				
-					if (item->on_change) item->on_change(list, selected);
-					else if (list->on_change) list->on_change(list, selected);
-				
+					while (item->values[i])
+						i++;
+					if (item->value >= i)
+						item->value = 0;
+
+					if (item->values[item->value + 1])
+						item->value += 1;
+					else
+						item->value = 0;
+
+					if (item->on_change)
+						item->on_change(list, selected);
+					else if (list->on_change)
+						list->on_change(list, selected);
+
 					dirty = 1;
 				}
 			}
 		}
-		
+
 		// uint32_t now = SDL_GetTicks();
 		if (PAD_justPressed(BTN_B)) { // || PAD_tappedMenu(now)
 			show_options = 0;
-		}
-		else if (PAD_justPressed(BTN_A)) {
-			MenuItem* item = &items[selected];
+		} else if (PAD_justPressed(BTN_A)) {
+			MenuItem *item = &items[selected];
 			int result = MENU_CALLBACK_NOP;
-			if (item->on_confirm) result = item->on_confirm(list, selected); // item-specific action, eg. Save for all games
-			else if (item->submenu) result = Menu_options(item->submenu); // drill down, eg. main options menu
-			// TODO: is there a way to defer on_confirm for MENU_INPUT so we can clear the currently set value to indicate it is awaiting input? 
-			// eg. set a flag to call on_confirm at the beginning of the next frame?
+			if (item->on_confirm)
+				result = item->on_confirm(list, selected); // item-specific action, eg. Save for all games
+			else if (item->submenu)
+				result = Menu_options(item->submenu); // drill down, eg. main options menu
+			// TODO: is there a way to defer on_confirm for MENU_INPUT so we can clear the currently set value to
+			// indicate it is awaiting input? eg. set a flag to call on_confirm at the beginning of the next frame?
 			else if (list->on_confirm) {
-				if (item->values==button_labels) await_input = 1; // button binding
-				else result = list->on_confirm(list, selected); // list-specific action, eg. show item detail view or input binding
+				if (item->values == button_labels)
+					await_input = 1; // button binding
+				else
+					result = list->on_confirm(
+						list, selected); // list-specific action, eg. show item detail view or input binding
 			}
-			if (result==MENU_CALLBACK_EXIT) show_options = 0;
+			if (result == MENU_CALLBACK_EXIT)
+				show_options = 0;
 			else {
-				if (result==MENU_CALLBACK_NEXT_ITEM) {
+				if (result == MENU_CALLBACK_NEXT_ITEM) {
 					// copied from PAD_justRepeated(BTN_DOWN) above
 					selected += 1;
-					if (selected>=count) {
+					if (selected >= count) {
 						selected = 0;
 						start = 0;
 						end = visible_rows;
-					}
-					else if (selected>=end) {
+					} else if (selected >= end) {
 						start += 1;
 						end += 1;
 					}
 				}
 				dirty = 1;
 			}
-		}
-		else if (type==MENU_INPUT) {
+		} else if (type == MENU_INPUT) {
 			if (PAD_justPressed(BTN_X)) {
-				MenuItem* item = &items[selected];
+				MenuItem *item = &items[selected];
 				item->value = 0;
-				
-				if (item->on_change) item->on_change(list, selected);
-				else if (list->on_change) list->on_change(list, selected);
-				
+
+				if (item->on_change)
+					item->on_change(list, selected);
+				else if (list->on_change)
+					list->on_change(list, selected);
+
 				// copied from PAD_justRepeated(BTN_DOWN) above
 				selected += 1;
-				if (selected>=count) {
+				if (selected >= count) {
 					selected = 0;
 					start = 0;
 					end = visible_rows;
-				}
-				else if (selected>=end) {
+				} else if (selected >= end) {
 					start += 1;
 					end += 1;
 				}
 				dirty = 1;
 			}
 		}
-		
-		if (!defer_menu) PWR_update(&dirty, &show_settings, Menu_beforeSleep, Menu_afterSleep);
-		
-		if (defer_menu && PAD_justReleased(BTN_MENU)) defer_menu = false;
-		
+
+		if (!defer_menu)
+			PWR_update(&dirty, &show_settings, Menu_beforeSleep, Menu_afterSleep);
+
+		if (defer_menu && PAD_justReleased(BTN_MENU))
+			defer_menu = false;
+
 		GFX_clear(screen);
 		GFX_blitHardwareGroup(screen, show_settings);
-		
-		char* desc = NULL;
-		SDL_Surface* text;
 
-		if (type==MENU_LIST) {
+		char *desc = NULL;
+		SDL_Surface *text;
+
+		if (type == MENU_LIST) {
 			int mw = list->max_width;
 			if (!mw) {
 				// get the width of the widest item
-				for (int i=0; i<count; i++) {
-					MenuItem* item = &items[i];
+				for (int i = 0; i < count; i++) {
+					MenuItem *item = &items[i];
 					int w = 0;
 					TTF_SizeUTF8(font.small, item->name, &w, NULL);
-					w += SCALE1(OPTION_PADDING*2);
-					if (w>mw) mw = w;
+					w += SCALE1(OPTION_PADDING * 2);
+					if (w > mw)
+						mw = w;
 				}
 				// cache the result
-				list->max_width = mw = MIN(mw, screen->w - SCALE1(PADDING *2));
+				list->max_width = mw = MIN(mw, screen->w - SCALE1(PADDING * 2));
 			}
-			
+
 			int ox = (screen->w - mw) / 2;
 			int oy = SCALE1(PADDING + PILL_SIZE);
 			int selected_row = selected - start;
-			for (int i=start,j=0; i<end; i++,j++) {
-				MenuItem* item = &items[i];
+			for (int i = start, j = 0; i < end; i++, j++) {
+				MenuItem *item = &items[i];
 				SDL_Color text_color = COLOR_WHITE;
-				// int ox = (screen->w - w) / 2; // if we're centering these (but I don't think we should after seeing it)
-				if (j==selected_row) {
+				// int ox = (screen->w - w) / 2; // if we're centering these (but I don't think we should after seeing
+				// it)
+				if (j == selected_row) {
 					// move out of conditional if centering
 					int w = 0;
 					TTF_SizeUTF8(font.small, item->name, &w, NULL);
-					w += SCALE1(OPTION_PADDING*2);
-					
-					GFX_blitPillDark(ASSET_BUTTON, screen, &(SDL_Rect){
-						ox,
-						oy+SCALE1(j*BUTTON_SIZE),
-						w,
-						SCALE1(BUTTON_SIZE)
-					});
+					w += SCALE1(OPTION_PADDING * 2);
+
+					GFX_blitPillDark(ASSET_BUTTON, screen,
+									 &(SDL_Rect){ox, oy + SCALE1(j * BUTTON_SIZE), w, SCALE1(BUTTON_SIZE)});
 					text_color = uintToColour(THEME_COLOR5_255);
-					
-					if (item->desc) desc = item->desc;
+
+					if (item->desc)
+						desc = item->desc;
 				}
 				text = TTF_RenderUTF8_Blended(font.small, item->name, text_color);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-					ox+SCALE1(OPTION_PADDING),
-					oy+SCALE1((j*BUTTON_SIZE)+1)
-				});
+				SDL_BlitSurface(text, NULL, screen,
+								&(SDL_Rect){ox + SCALE1(OPTION_PADDING), oy + SCALE1((j * BUTTON_SIZE) + 1)});
 				SDL_FreeSurface(text);
 			}
-		}
-		else if (type==MENU_FIXED) {
+		} else if (type == MENU_FIXED) {
 			// NOTE: no need to calculate max width
-			int mw = screen->w - SCALE1(PADDING*2);
+			int mw = screen->w - SCALE1(PADDING * 2);
 			// int lw,rw;
 			// lw = rw = mw / 2;
-			int ox,oy;
+			int ox, oy;
 			ox = oy = SCALE1(PADDING);
 			oy += SCALE1(PILL_SIZE);
-			
+
 			int selected_row = selected - start;
-			for (int i=start,j=0; i<end; i++,j++) {
-				MenuItem* item = &items[i];
+			for (int i = start, j = 0; i < end; i++, j++) {
+				MenuItem *item = &items[i];
 				SDL_Color text_color = COLOR_WHITE;
 
-				if (j==selected_row) {
+				if (j == selected_row) {
 					// gray pill
-					GFX_blitPillLight(ASSET_BUTTON, screen, &(SDL_Rect){
-						ox,
-						oy+SCALE1(j*BUTTON_SIZE),
-						mw,
-						SCALE1(BUTTON_SIZE)
-					});
+					GFX_blitPillLight(ASSET_BUTTON, screen,
+									  &(SDL_Rect){ox, oy + SCALE1(j * BUTTON_SIZE), mw, SCALE1(BUTTON_SIZE)});
 				}
-				
+
 				if (item->values == NULL) {
 					// This is a navigation item, used to displayed a specific category
 					text = TTF_RenderUTF8_Blended(font.small, ">", COLOR_WHITE); // always white
-					SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-						ox + mw - text->w - SCALE1(OPTION_PADDING),
-						oy+SCALE1((j*BUTTON_SIZE)+3)
-					});
+					SDL_BlitSurface(
+						text, NULL, screen,
+						&(SDL_Rect){ox + mw - text->w - SCALE1(OPTION_PADDING), oy + SCALE1((j * BUTTON_SIZE) + 3)});
 					SDL_FreeSurface(text);
-				}
-				else {
-					if (item->value>=0) {
+				} else {
+					if (item->value >= 0) {
 						int count = 0;
-						while ( item->values && item->values[count]) count++;
+						while (item->values && item->values[count])
+							count++;
 						if (item->value >= 0 && item->value < count) {
 							const char *str = item->values[item->value];
-							text = TTF_RenderUTF8_Blended(font.tiny, str ? str : "none", str ? COLOR_WHITE : COLOR_GRAY); // always white
+							text = TTF_RenderUTF8_Blended(font.tiny, str ? str : "none",
+														  str ? COLOR_WHITE : COLOR_GRAY); // always white
 							if (text) {
-								SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-									ox + mw - text->w - SCALE1(OPTION_PADDING),
-									oy+SCALE1((j*BUTTON_SIZE)+3)
-								});
+								SDL_BlitSurface(text, NULL, screen,
+												&(SDL_Rect){ox + mw - text->w - SCALE1(OPTION_PADDING),
+															oy + SCALE1((j * BUTTON_SIZE) + 3)});
 								SDL_FreeSurface(text);
 							}
 						}
 					}
 				}
-				
-				// TODO: blit a black pill on unselected rows (to cover longer item->values?) or truncate longer item->values?
-				if (j==selected_row) {
+
+				// TODO: blit a black pill on unselected rows (to cover longer item->values?) or truncate longer
+				// item->values?
+				if (j == selected_row) {
 					// white pill
 					int w = 0;
 					TTF_SizeUTF8(font.small, item->name, &w, NULL);
-					w += SCALE1(OPTION_PADDING*2);
-					GFX_blitPillDark(ASSET_BUTTON, screen, &(SDL_Rect){
-						ox,
-						oy+SCALE1(j*BUTTON_SIZE),
-						w,
-						SCALE1(BUTTON_SIZE)
-					});
+					w += SCALE1(OPTION_PADDING * 2);
+					GFX_blitPillDark(ASSET_BUTTON, screen,
+									 &(SDL_Rect){ox, oy + SCALE1(j * BUTTON_SIZE), w, SCALE1(BUTTON_SIZE)});
 					text_color = uintToColour(THEME_COLOR5_255);
-					
-					if (item->desc) desc = item->desc;
+
+					if (item->desc)
+						desc = item->desc;
 				}
 				text = TTF_RenderUTF8_Blended(font.small, item->name, text_color);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-					ox+SCALE1(OPTION_PADDING),
-					oy+SCALE1((j*BUTTON_SIZE)+1)
-				});
+				SDL_BlitSurface(text, NULL, screen,
+								&(SDL_Rect){ox + SCALE1(OPTION_PADDING), oy + SCALE1((j * BUTTON_SIZE) + 1)});
 				SDL_FreeSurface(text);
 			}
-		}
-		else if (type==MENU_VAR || type==MENU_INPUT) {
+		} else if (type == MENU_VAR || type == MENU_INPUT) {
 			int mw = list->max_width;
 			if (!mw) {
 				// get the width of the widest row
 				int mrw = 0;
-				for (int i=0; i<count; i++) {
-					MenuItem* item = &items[i];
+				for (int i = 0; i < count; i++) {
+					MenuItem *item = &items[i];
 					int w = 0;
 					int lw = 0;
 					int rw = 0;
 					TTF_SizeUTF8(font.small, item->name, &lw, NULL);
 					// every value list in an input table is the same
 					// so only calculate rw for the first item...
-					if (!mrw || type!=MENU_INPUT) {
-						if(item->values) {
-							for (int j=0; item->values[j]; j++) {
+					if (!mrw || type != MENU_INPUT) {
+						if (item->values) {
+							for (int j = 0; item->values[j]; j++) {
 								TTF_SizeUTF8(font.tiny, item->values[j], &rw, NULL);
-								if (lw+rw>w) w = lw+rw;
-								if (rw>mrw) mrw = rw;
+								if (lw + rw > w)
+									w = lw + rw;
+								if (rw > mrw)
+									mrw = rw;
 							}
 						}
-					}
-					else {
+					} else {
 						w = lw + mrw;
 					}
-					w += SCALE1(OPTION_PADDING*4);
-					if (w>mw) mw = w;
+					w += SCALE1(OPTION_PADDING * 4);
+					if (w > mw)
+						mw = w;
 				}
 				fflush(stdout);
 				// cache the result
-				list->max_width = mw = MIN(mw, screen->w - SCALE1(PADDING *2));
+				list->max_width = mw = MIN(mw, screen->w - SCALE1(PADDING * 2));
 			}
 			int ox = (screen->w - mw) / 2;
 			int oy = SCALE1(PADDING + PILL_SIZE);
 			int selected_row = selected - start;
-			for (int i=start,j=0; i<end; i++,j++) {
-				MenuItem* item = &items[i];
+			for (int i = start, j = 0; i < end; i++, j++) {
+				MenuItem *item = &items[i];
 				SDL_Color text_color = COLOR_WHITE;
-				
 
-				if (j==selected_row) {
+
+				if (j == selected_row) {
 					// gray pill
-					GFX_blitPillLight(ASSET_BUTTON, screen, &(SDL_Rect){
-						ox,
-						oy+SCALE1(j*BUTTON_SIZE),
-						mw,
-						SCALE1(BUTTON_SIZE)
-					});
-					
+					GFX_blitPillLight(ASSET_BUTTON, screen,
+									  &(SDL_Rect){ox, oy + SCALE1(j * BUTTON_SIZE), mw, SCALE1(BUTTON_SIZE)});
+
 					// white pill
 					int w = 0;
 					TTF_SizeUTF8(font.small, item->name, &w, NULL);
-					w += SCALE1(OPTION_PADDING*2);
-					GFX_blitPillDark(ASSET_BUTTON, screen, &(SDL_Rect){
-						ox,
-						oy+SCALE1(j*BUTTON_SIZE),
-						w,
-						SCALE1(BUTTON_SIZE)
-					});
+					w += SCALE1(OPTION_PADDING * 2);
+					GFX_blitPillDark(ASSET_BUTTON, screen,
+									 &(SDL_Rect){ox, oy + SCALE1(j * BUTTON_SIZE), w, SCALE1(BUTTON_SIZE)});
 					text_color = uintToColour(THEME_COLOR5_255);
-					
-					if (item->desc) desc = item->desc;
+
+					if (item->desc)
+						desc = item->desc;
 				}
 				text = TTF_RenderUTF8_Blended(font.small, item->name, text_color);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-					ox+SCALE1(OPTION_PADDING),
-					oy+SCALE1((j*BUTTON_SIZE)+1)
-				});
+				SDL_BlitSurface(text, NULL, screen,
+								&(SDL_Rect){ox + SCALE1(OPTION_PADDING), oy + SCALE1((j * BUTTON_SIZE) + 1)});
 				SDL_FreeSurface(text);
-				
-				if (await_input && j==selected_row) {
+
+				if (await_input && j == selected_row) {
 					// buh
-				}
-				else if (item->value>=0) {
+				} else if (item->value >= 0) {
 					int count = 0;
-					while ( item->values && item->values[count]) count++;
+					while (item->values && item->values[count])
+						count++;
 					if (item->value >= 0 && item->value < count) {
-						text = TTF_RenderUTF8_Blended(font.tiny, item->values[item->value], COLOR_WHITE); // always white
-						SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-							ox + mw - text->w - SCALE1(OPTION_PADDING),
-							oy+SCALE1((j*BUTTON_SIZE)+3)
-						});
+						text =
+							TTF_RenderUTF8_Blended(font.tiny, item->values[item->value], COLOR_WHITE); // always white
+						SDL_BlitSurface(text, NULL, screen,
+										&(SDL_Rect){ox + mw - text->w - SCALE1(OPTION_PADDING),
+													oy + SCALE1((j * BUTTON_SIZE) + 3)});
 						SDL_FreeSurface(text);
 					}
 				}
 			}
 		}
-		
-		if (count>max_visible_options) {
-			#define SCROLL_WIDTH 24
-			#define SCROLL_HEIGHT 4
-			int ox = (screen->w - SCALE1(SCROLL_WIDTH))/2;
+
+		if (count > max_visible_options) {
+#define SCROLL_WIDTH 24
+#define SCROLL_HEIGHT 4
+			int ox = (screen->w - SCALE1(SCROLL_WIDTH)) / 2;
 			int oy = SCALE1((PILL_SIZE - SCROLL_HEIGHT) / 2);
-			if (start>0) GFX_blitAsset(ASSET_SCROLL_UP,   NULL, screen, &(SDL_Rect){ox, SCALE1(PADDING) + oy});
-			if (end<count) GFX_blitAsset(ASSET_SCROLL_DOWN, NULL, screen, &(SDL_Rect){ox, screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_SIZE) + oy});
+			if (start > 0)
+				GFX_blitAsset(ASSET_SCROLL_UP, NULL, screen, &(SDL_Rect){ox, SCALE1(PADDING) + oy});
+			if (end < count)
+				GFX_blitAsset(ASSET_SCROLL_DOWN, NULL, screen,
+							  &(SDL_Rect){ox, screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_SIZE) + oy});
 		}
-		
-		if (!desc && list->desc) desc = list->desc;
-		
+
+		if (!desc && list->desc)
+			desc = list->desc;
+
 		if (desc) {
-			int w,h;
-			GFX_sizeText(font.tiny, desc, SCALE1(12), &w,&h);
-			GFX_blitText(font.tiny, desc, SCALE1(12), COLOR_WHITE, screen, &(SDL_Rect){
-				(screen->w - w) / 2,
-				screen->h - SCALE1(PADDING) - h,
-				w,h
-			});
-		}
-		
+			int w, h;
+			GFX_sizeText(font.tiny, desc, SCALE1(12), &w, &h);
+			GFX_blitText(font.tiny, desc, SCALE1(12), COLOR_WHITE, screen,
+						 &(SDL_Rect){(screen->w - w) / 2, screen->h - SCALE1(PADDING) - h, w, h});
+		}
+
 		GFX_flip(screen);
 		dirty = 0;
-		
+
 		hdmimon();
 	}
-	
+
 	// GFX_clearAll();
 	// GFX_flip(screen);
-	
+
 	return 0;
 }
 
-static void Menu_scale(SDL_Surface* src, SDL_Surface* dst) {
+static void Menu_scale(SDL_Surface *src, SDL_Surface *dst)
+{
 	// LOG_info("Menu_scale src: %ix%i dst: %ix%i\n", src->w,src->h,dst->w,dst->h);
-	
-	uint16_t* s = src->pixels;
-	uint16_t* d = dst->pixels;
-	
+
+	uint16_t *s = src->pixels;
+	uint16_t *d = dst->pixels;
+
 	int sw = src->w;
 	int sh = src->h;
 	int sp = src->pitch / FIXED_BPP;
-	
+
 	int dw = dst->w;
 	int dh = dst->h;
 	int dp = dst->pitch / FIXED_BPP;
-	
+
 	int rx = 0;
 	int ry = 0;
 	int rw = dw;
 	int rh = dh;
-	
+
 	int scaling = screen_scaling;
-	if (scaling==SCALE_CROPPED && DEVICE_WIDTH==HDMI_WIDTH) {
+	if (scaling == SCALE_CROPPED && DEVICE_WIDTH == HDMI_WIDTH) {
 		scaling = SCALE_NATIVE;
 	}
-	if (scaling==SCALE_NATIVE) {
+	if (scaling == SCALE_NATIVE) {
 		// LOG_info("native\n");
-		
+
 		rx = renderer.dst_x;
 		ry = renderer.dst_y;
 		rw = renderer.src_w;
@@ -6261,24 +6331,22 @@ static void Menu_scale(SDL_Surface* src, SDL_Surface* dst) {
 			// LOG_info("scale: %i\n", renderer.scale);
 			rw *= renderer.scale;
 			rh *= renderer.scale;
-		}
-		else {
+		} else {
 			// LOG_info("forced crop\n"); // eg. fc on nano, vb on smart
 			rw -= renderer.src_x * 2;
 			rh -= renderer.src_y * 2;
 			sw = rw;
 			sh = rh;
 		}
-		
-		if (dw==DEVICE_WIDTH/2) {
+
+		if (dw == DEVICE_WIDTH / 2) {
 			// LOG_info("halve\n");
 			rx /= 2;
 			ry /= 2;
 			rw /= 2;
 			rh /= 2;
 		}
-	}
-	else if (scaling==SCALE_CROPPED) {
+	} else if (scaling == SCALE_CROPPED) {
 		// LOG_info("cropped\n");
 		sw -= renderer.src_x * 2;
 		sh -= renderer.src_y * 2;
@@ -6287,8 +6355,8 @@ static void Menu_scale(SDL_Surface* src, SDL_Surface* dst) {
 		ry = renderer.dst_y;
 		rw = sw * renderer.scale;
 		rh = sh * renderer.scale;
-		
-		if (dw==DEVICE_WIDTH/2) {
+
+		if (dw == DEVICE_WIDTH / 2) {
 			// LOG_info("halve\n");
 			rx /= 2;
 			ry /= 2;
@@ -6296,36 +6364,34 @@ static void Menu_scale(SDL_Surface* src, SDL_Surface* dst) {
 			rh /= 2;
 		}
 	}
-	
-	if (scaling==SCALE_ASPECT || rw>dw || rh>dh) {
+
+	if (scaling == SCALE_ASPECT || rw > dw || rh > dh) {
 		// LOG_info("aspect\n");
 		double fixed_aspect_ratio = ((double)DEVICE_WIDTH) / DEVICE_HEIGHT;
 		int core_aspect = core.aspect_ratio * 1000;
 		int fixed_aspect = fixed_aspect_ratio * 1000;
-		
-		if (core_aspect>fixed_aspect) {
+
+		if (core_aspect > fixed_aspect) {
 			// LOG_info("letterbox\n");
 			rw = dw;
 			rh = rw / core.aspect_ratio;
-			rh += rh%2;
-		}
-		else if (core_aspect<fixed_aspect) {
+			rh += rh % 2;
+		} else if (core_aspect < fixed_aspect) {
 			// LOG_info("pillarbox\n");
 			rh = dh;
 			rw = rh * core.aspect_ratio;
-			rw += rw%2;
-			rw = (rw/8)*8; // probably necessary here since we're not scaling by an integer
-		}
-		else {
+			rw += rw % 2;
+			rw = (rw / 8) * 8; // probably necessary here since we're not scaling by an integer
+		} else {
 			// LOG_info("perfect match\n");
 			rw = dw;
 			rh = dh;
 		}
-		
+
 		rx = (dw - rw) / 2;
 		ry = (dh - rh) / 2;
 	}
-	
+
 	// LOG_info("Menu_scale (r): %i,%i %ix%i\n",rx,ry,rw,rh);
 	// LOG_info("offset: %i,%i\n", renderer.src_x, renderer.src_y);
 
@@ -6339,38 +6405,41 @@ static void Menu_scale(SDL_Surface* src, SDL_Surface* dst) {
 	int sr = 0;
 	int dr = ry * dp;
 	int cp = dp * FIXED_BPP;
-	
+
 	// LOG_info("Menu_scale (s): %i,%i %ix%i\n",sx,sy,sw,sh);
 	// LOG_info("mx:%i my:%i sx>>16:%i sy>>16:%i\n",mx,my,((sx+mx) >> 16),((sy+my) >> 16));
 
-	for (int dy=0; dy<rh; dy++) {
+	for (int dy = 0; dy < rh; dy++) {
 		sx = ox;
 		sr = (sy >> 16) * sp;
-		if (sr==lr) {
-			memcpy(d+dr,d+dr-dp,cp);
-		}
-		else {
-	        for (int dx=0; dx<rw; dx++) {
-	            d[dr + rx + dx] = s[sr + (sx >> 16)];
+		if (sr == lr) {
+			memcpy(d + dr, d + dr - dp, cp);
+		} else {
+			for (int dx = 0; dx < rw; dx++) {
+				d[dr + rx + dx] = s[sr + (sx >> 16)];
 				sx += mx;
-	        }
+			}
 		}
 		lr = sr;
 		sy += my;
 		dr += dp;
-    }
-	
+	}
+
 	// LOG_info("successful\n");
 }
 
-static void Menu_initState(void) {
-	if (exists(menu.slot_path)) menu.slot = getInt(menu.slot_path);
-	if (menu.slot==8) menu.slot = 0;
-	
+static void Menu_initState(void)
+{
+	if (exists(menu.slot_path))
+		menu.slot = getInt(menu.slot_path);
+	if (menu.slot == 8)
+		menu.slot = 0;
+
 	menu.save_exists = 0;
 	menu.preview_exists = 0;
 }
-static void Menu_updateState(void) {
+static void Menu_updateState(void)
+{
 	// LOG_info("Menu_updateState\n");
 
 	int last_slot = state_slot;
@@ -6384,7 +6453,7 @@ static void Menu_updateState(void) {
 	// always sanitized/outer name, to keep main UI from having to inspect archives
 	sprintf(menu.bmp_path, "%s/%s.%d.bmp", menu.minui_dir, game.name, menu.slot);
 	sprintf(menu.txt_path, "%s/%s.%d.txt", menu.minui_dir, game.name, menu.slot);
-	
+
 	menu.save_exists = exists(save_path);
 	menu.preview_exists = menu.save_exists && exists(menu.bmp_path);
 
@@ -6393,38 +6462,38 @@ static void Menu_updateState(void) {
 }
 
 typedef struct {
-    char* pixels;
-    char* path;
+	char *pixels;
+	char *path;
 	int w;
 	int h;
 } SaveImageArgs;
 
-int save_screenshot_thread(void* data) {
-
-    SaveImageArgs* args = (SaveImageArgs*)data;
-	SDL_Surface* rawSurface = SDL_CreateRGBSurfaceWithFormatFrom(
-		args->pixels, args->w, args->h, 32, args->w * 4, SDL_PIXELFORMAT_ABGR8888
-	);
-	SDL_Surface* converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
+int save_screenshot_thread(void *data)
+{
+	SaveImageArgs *args = (SaveImageArgs *)data;
+	SDL_Surface *rawSurface =
+		SDL_CreateRGBSurfaceWithFormatFrom(args->pixels, args->w, args->h, 32, args->w * 4, SDL_PIXELFORMAT_ABGR8888);
+	SDL_Surface *converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
 	SDL_FreeSurface(rawSurface);
 
-    SDL_RWops* rw = SDL_RWFromFile(args->path, "wb");
-    if (!rw) {
-        SDL_Log("Failed to open file for writing: %s", SDL_GetError());
-    } else {
-        if (IMG_SavePNG_RW(converted, rw, 1) != 0) {
-            SDL_Log("Failed to save PNG: %s", SDL_GetError());
-        }
-    }
+	SDL_RWops *rw = SDL_RWFromFile(args->path, "wb");
+	if (!rw) {
+		SDL_Log("Failed to open file for writing: %s", SDL_GetError());
+	} else {
+		if (IMG_SavePNG_RW(converted, rw, 1) != 0) {
+			SDL_Log("Failed to save PNG: %s", SDL_GetError());
+		}
+	}
 	LOG_info("saved screenshot\n");
 	SDL_FreeSurface(converted);
-    free(args->path);
-    free(args->pixels);
-    free(args);
-    return 0;
+	free(args->path);
+	free(args->pixels);
+	free(args);
+	return 0;
 }
-SDL_Thread* screenshotsavethread;
-static void Menu_screenshot(void) {
+SDL_Thread *screenshotsavethread;
+static void Menu_screenshot(void)
+{
 	LOG_info("Menu_screenshot\n");
 
 	char rom_name[256];
@@ -6442,8 +6511,8 @@ static void Menu_screenshot(void) {
 	char png_path[256];
 	sprintf(png_path, SDCARD_PATH "/Screenshots/%s.%s.png", rom_name, buffer);
 	int cw, ch;
-	unsigned char* pixels = GFX_GL_screenCapture(&cw, &ch);
-	SaveImageArgs* args = malloc(sizeof(SaveImageArgs));
+	unsigned char *pixels = GFX_GL_screenCapture(&cw, &ch);
+	SaveImageArgs *args = malloc(sizeof(SaveImageArgs));
 	args->pixels = pixels;
 	args->w = cw;
 	args->h = ch;
@@ -6451,421 +6520,407 @@ static void Menu_screenshot(void) {
 	SDL_WaitThread(screenshotsavethread, NULL);
 	screenshotsavethread = SDL_CreateThread(save_screenshot_thread, "SaveScreenshotThread", args);
 }
-static void Menu_saveState(void) {
+static void Menu_saveState(void)
+{
 	// LOG_info("Menu_saveState\n");
 	Menu_updateState();
-	
+
 	if (menu.total_discs) {
-		char* disc_path = menu.disc_paths[menu.disc];
+		char *disc_path = menu.disc_paths[menu.disc];
 		putFile(menu.txt_path, disc_path + strlen(menu.base_path));
 	}
-	
+
 	// if already in menu use menu.bitmap instead for saving screenshots otherwise create new one on the fly
 	if (newScreenshot) {
 		int cw, ch;
-		unsigned char* pixels = GFX_GL_screenCapture(&cw, &ch);
-		SaveImageArgs* args = malloc(sizeof(SaveImageArgs));
+		unsigned char *pixels = GFX_GL_screenCapture(&cw, &ch);
+		SaveImageArgs *args = malloc(sizeof(SaveImageArgs));
 		args->pixels = pixels;
 		args->w = cw;
 		args->h = ch;
-		args->path = SDL_strdup(menu.bmp_path); 
+		args->path = SDL_strdup(menu.bmp_path);
 		SDL_WaitThread(screenshotsavethread, NULL);
 		screenshotsavethread = SDL_CreateThread(save_screenshot_thread, "SaveScreenshotThread", args);
 		newScreenshot = 0;
 	} else {
-		SDL_RWops* rw = SDL_RWFromFile(menu.bmp_path, "wb");
-		IMG_SavePNG_RW(menu.bitmap, rw,1);
+		SDL_RWops *rw = SDL_RWFromFile(menu.bmp_path, "wb");
+		IMG_SavePNG_RW(menu.bitmap, rw, 1);
 		LOG_info("saved screenshot\n");
 	}
-	
+
 	state_slot = menu.slot;
 	putInt(menu.slot_path, menu.slot);
 	State_write();
 }
-static void Menu_loadState(void) {
+static void Menu_loadState(void)
+{
 	Menu_updateState();
-	
+
 	if (menu.save_exists) {
 		if (menu.total_discs) {
 			char slot_disc_name[256];
 			getFile(menu.txt_path, slot_disc_name, 256);
-		
+
 			char slot_disc_path[256];
-			if (slot_disc_name[0]=='/') strcpy(slot_disc_path, slot_disc_name);
-			else sprintf(slot_disc_path, "%s%s", menu.base_path, slot_disc_name);
-		
-			char* disc_path = menu.disc_paths[menu.disc];
+			if (slot_disc_name[0] == '/')
+				strcpy(slot_disc_path, slot_disc_name);
+			else
+				sprintf(slot_disc_path, "%s%s", menu.base_path, slot_disc_name);
+
+			char *disc_path = menu.disc_paths[menu.disc];
 			if (!exactMatch(slot_disc_path, disc_path)) {
 				Game_changeDisc(slot_disc_path);
 			}
 		}
-	
+
 		state_slot = menu.slot;
 		putInt(menu.slot_path, menu.slot);
 		State_read();
 	}
 }
 
-static void Menu_loop(void) {
-
+static void Menu_loop(void)
+{
 	int cw, ch;
-	unsigned char* pixels = GFX_GL_screenCapture(&cw, &ch);
-	
+	unsigned char *pixels = GFX_GL_screenCapture(&cw, &ch);
+
 	renderer.dst = pixels;
-	SDL_Surface* rawSurface = SDL_CreateRGBSurfaceWithFormatFrom(
-		pixels, cw, ch, 32, cw * 4, SDL_PIXELFORMAT_ABGR8888
-	);
-	SDL_Surface* converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
+	SDL_Surface *rawSurface = SDL_CreateRGBSurfaceWithFormatFrom(pixels, cw, ch, 32, cw * 4, SDL_PIXELFORMAT_ABGR8888);
+	SDL_Surface *converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
 	SDL_FreeSurface(rawSurface);
-	free(pixels); 
+	free(pixels);
 
 	menu.bitmap = converted;
-	SDL_Surface* backing = SDL_CreateRGBSurfaceWithFormat(0,DEVICE_WIDTH,DEVICE_HEIGHT,32,SDL_PIXELFORMAT_RGBA8888); 
-	
-
-	SDL_Rect dst = {
-		0,
-		0,
-		screen->w,
-		screen->h
-	};
+	SDL_Surface *backing = SDL_CreateRGBSurfaceWithFormat(0, DEVICE_WIDTH, DEVICE_HEIGHT, 32, SDL_PIXELFORMAT_RGBA8888);
+
+
+	SDL_Rect dst = {0, 0, screen->w, screen->h};
 	SDL_BlitScaled(menu.bitmap, NULL, backing, &dst);
-	
+
 	int restore_w = screen->w;
 	int restore_h = screen->h;
 	int restore_p = screen->pitch;
-	if (restore_w!=DEVICE_WIDTH || restore_h!=DEVICE_HEIGHT) {
-		screen = GFX_resize(DEVICE_WIDTH,DEVICE_HEIGHT,DEVICE_PITCH);
+	if (restore_w != DEVICE_WIDTH || restore_h != DEVICE_HEIGHT) {
+		screen = GFX_resize(DEVICE_WIDTH, DEVICE_HEIGHT, DEVICE_PITCH);
 	}
 
 	SRAM_write();
 	RTC_write();
 	PWR_warn(0);
-	if (!HAS_POWER_BUTTON) PWR_enableSleep();
+	if (!HAS_POWER_BUTTON)
+		PWR_enableSleep();
 	PWR_setCPUSpeed(CPU_SPEED_MENU); // set Hz directly
 
 	GFX_setEffect(EFFECT_NONE);
-	
+
 	int rumble_strength = VIB_getStrength();
 	VIB_setStrength(0);
-	
+
 	PWR_enableAutosleep();
 	PAD_reset();
-	
+
 	// path and string things
-	char* tmp;
+	char *tmp;
 	char rom_name[256]; // without extension or cruft
 	getDisplayName(game.name, rom_name);
 	getAlias(game.path, rom_name);
-	
+
 	int rom_disc = -1;
 	char disc_name[16];
 	if (menu.total_discs) {
 		rom_disc = menu.disc;
-		sprintf(disc_name, "Disc %i", menu.disc+1);
+		sprintf(disc_name, "Disc %i", menu.disc + 1);
 	}
-		
+
 	int selected = 0; // resets every launch
 	Menu_initState();
-	
+
 	int status = STATUS_CONT; // TODO: no longer used?
 	int show_setting = 0;
 	int dirty = 1;
 	int ignore_menu = 0;
 	int menu_start = 0;
-	SDL_Surface* preview = SDL_CreateRGBSurface(SDL_SWSURFACE,DEVICE_WIDTH/2,DEVICE_HEIGHT/2,32,RGBA_MASK_8888); // TODO: retain until changed?
+	SDL_Surface *preview = SDL_CreateRGBSurface(SDL_SWSURFACE, DEVICE_WIDTH / 2, DEVICE_HEIGHT / 2, 32,
+												RGBA_MASK_8888); // TODO: retain until changed?
 
-	//set vid.blit to null for menu drawing no need for blitrender drawing
+	// set vid.blit to null for menu drawing no need for blitrender drawing
 	GFX_clearShaders();
 	while (show_menu) {
-
 		GFX_startFrame();
 		uint32_t now = SDL_GetTicks();
 
 		PAD_poll();
-		
+
 		if (PAD_justPressed(BTN_UP)) {
 			selected -= 1;
-			if (selected<0) selected += MENU_ITEM_COUNT;
+			if (selected < 0)
+				selected += MENU_ITEM_COUNT;
 			dirty = 1;
-		}
-		else if (PAD_justPressed(BTN_DOWN)) {
+		} else if (PAD_justPressed(BTN_DOWN)) {
 			selected += 1;
-			if (selected>=MENU_ITEM_COUNT) selected -= MENU_ITEM_COUNT;
+			if (selected >= MENU_ITEM_COUNT)
+				selected -= MENU_ITEM_COUNT;
 			dirty = 1;
-		}
-		else if (PAD_justPressed(BTN_LEFT)) {
-			if (menu.total_discs>1 && selected==ITEM_CONT) {
+		} else if (PAD_justPressed(BTN_LEFT)) {
+			if (menu.total_discs > 1 && selected == ITEM_CONT) {
 				menu.disc -= 1;
-				if (menu.disc<0) menu.disc += menu.total_discs;
+				if (menu.disc < 0)
+					menu.disc += menu.total_discs;
 				dirty = 1;
-				sprintf(disc_name, "Disc %i", menu.disc+1);
-			}
-			else if (selected==ITEM_SAVE || selected==ITEM_LOAD) {
+				sprintf(disc_name, "Disc %i", menu.disc + 1);
+			} else if (selected == ITEM_SAVE || selected == ITEM_LOAD) {
 				menu.slot -= 1;
-				if (menu.slot<0) menu.slot += MENU_SLOT_COUNT;
+				if (menu.slot < 0)
+					menu.slot += MENU_SLOT_COUNT;
 				dirty = 1;
 			}
-		}
-		else if (PAD_justPressed(BTN_RIGHT)) {
-			if (menu.total_discs>1 && selected==ITEM_CONT) {
+		} else if (PAD_justPressed(BTN_RIGHT)) {
+			if (menu.total_discs > 1 && selected == ITEM_CONT) {
 				menu.disc += 1;
-				if (menu.disc==menu.total_discs) menu.disc -= menu.total_discs;
+				if (menu.disc == menu.total_discs)
+					menu.disc -= menu.total_discs;
 				dirty = 1;
-				sprintf(disc_name, "Disc %i", menu.disc+1);
-			}
-			else if (selected==ITEM_SAVE || selected==ITEM_LOAD) {
+				sprintf(disc_name, "Disc %i", menu.disc + 1);
+			} else if (selected == ITEM_SAVE || selected == ITEM_LOAD) {
 				menu.slot += 1;
-				if (menu.slot>=MENU_SLOT_COUNT) menu.slot -= MENU_SLOT_COUNT;
+				if (menu.slot >= MENU_SLOT_COUNT)
+					menu.slot -= MENU_SLOT_COUNT;
 				dirty = 1;
 			}
 		}
-		
-		if (dirty && (selected==ITEM_SAVE || selected==ITEM_LOAD)) {
+
+		if (dirty && (selected == ITEM_SAVE || selected == ITEM_LOAD)) {
 			Menu_updateState();
 		}
-		
-		if (PAD_justPressed(BTN_B) || (BTN_WAKE!=BTN_MENU && PAD_tappedMenu(now))) {
+
+		if (PAD_justPressed(BTN_B) || (BTN_WAKE != BTN_MENU && PAD_tappedMenu(now))) {
 			status = STATUS_CONT;
 			show_menu = 0;
-		}
-		else if (PAD_justPressed(BTN_A)) {
-			switch(selected) {
-				case ITEM_CONT:
-				if (menu.total_discs && rom_disc!=menu.disc) {
-						status = STATUS_DISC;
-						char* disc_path = menu.disc_paths[menu.disc];
-						Game_changeDisc(disc_path);
-					}
-					else {
-						status = STATUS_CONT;
-					}
-					show_menu = 0;
-				break;
-				
-				case ITEM_SAVE: {
-					Menu_saveState();
-					status = STATUS_SAVE;
-					show_menu = 0;
+		} else if (PAD_justPressed(BTN_A)) {
+			switch (selected) {
+			case ITEM_CONT:
+				if (menu.total_discs && rom_disc != menu.disc) {
+					status = STATUS_DISC;
+					char *disc_path = menu.disc_paths[menu.disc];
+					Game_changeDisc(disc_path);
+				} else {
+					status = STATUS_CONT;
 				}
+				show_menu = 0;
 				break;
-				case ITEM_LOAD: {
-					Menu_loadState();
-					status = STATUS_LOAD;
+
+			case ITEM_SAVE: {
+				Menu_saveState();
+				status = STATUS_SAVE;
+				show_menu = 0;
+			} break;
+			case ITEM_LOAD: {
+				Menu_loadState();
+				status = STATUS_LOAD;
+				show_menu = 0;
+			} break;
+			case ITEM_OPTS: {
+				if (simple_mode) {
+					core.reset();
+					status = STATUS_RESET;
 					show_menu = 0;
-				}
-				break;
-				case ITEM_OPTS: {
-					if (simple_mode) {
-						core.reset();
-						status = STATUS_RESET;
-						show_menu = 0;
-					}
-					else {
-						int old_scaling = screen_scaling;
-						Menu_options(&options_menu);
-						if (screen_scaling!=old_scaling) {
-							selectScaler(renderer.true_w,renderer.true_h,renderer.src_p);
-						
-							restore_w = screen->w;
-							restore_h = screen->h;
-							restore_p = screen->pitch;
-							screen = GFX_resize(DEVICE_WIDTH,DEVICE_HEIGHT,DEVICE_PITCH);
-							SDL_Rect dst = {0, 0, DEVICE_WIDTH, DEVICE_HEIGHT};
-							SDL_BlitScaled(menu.bitmap,NULL,backing,&dst);
-						}
-						dirty = 1;
+				} else {
+					int old_scaling = screen_scaling;
+					Menu_options(&options_menu);
+					if (screen_scaling != old_scaling) {
+						selectScaler(renderer.true_w, renderer.true_h, renderer.src_p);
+
+						restore_w = screen->w;
+						restore_h = screen->h;
+						restore_p = screen->pitch;
+						screen = GFX_resize(DEVICE_WIDTH, DEVICE_HEIGHT, DEVICE_PITCH);
+						SDL_Rect dst = {0, 0, DEVICE_WIDTH, DEVICE_HEIGHT};
+						SDL_BlitScaled(menu.bitmap, NULL, backing, &dst);
 					}
+					dirty = 1;
 				}
-				break;
-				case ITEM_QUIT:
-					status = STATUS_QUIT;
-					show_menu = 0;
-					quit = 1; // TODO: tmp?
+			} break;
+			case ITEM_QUIT:
+				status = STATUS_QUIT;
+				show_menu = 0;
+				quit = 1; // TODO: tmp?
 				break;
 			}
-			if (!show_menu) break;
+			if (!show_menu)
+				break;
 		}
 
 		PWR_update(&dirty, &show_setting, Menu_beforeSleep, Menu_afterSleep);
-		if(dirty) {
+		if (dirty) {
 			GFX_clear(screen);
 
-			GFX_drawOnLayer(menu.bitmap,0,0,DEVICE_WIDTH,DEVICE_HEIGHT,0.4f,1,0);
-			
+			GFX_drawOnLayer(menu.bitmap, 0, 0, DEVICE_WIDTH, DEVICE_HEIGHT, 0.4f, 1, 0);
+
 
 			int ox, oy;
 			int ow = GFX_blitHardwareGroup(screen, show_setting);
 			int max_width = screen->w - SCALE1(PADDING * 2) - ow;
-			
+
 			char display_name[256];
-			int text_width = GFX_truncateText(font.large, rom_name, display_name, max_width, SCALE1(BUTTON_PADDING*2));
+			int text_width =
+				GFX_truncateText(font.large, rom_name, display_name, max_width, SCALE1(BUTTON_PADDING * 2));
 			max_width = MIN(max_width, text_width);
 
-			SDL_Surface* text;
+			SDL_Surface *text;
 			text = TTF_RenderUTF8_Blended(font.large, display_name, uintToColour(THEME_COLOR6_255));
-			GFX_blitPillLight(ASSET_WHITE_PILL, screen, &(SDL_Rect){
-				SCALE1(PADDING),
-				SCALE1(PADDING),
-				max_width,
-				SCALE1(PILL_SIZE)
-			});
-			SDL_BlitSurface(text, &(SDL_Rect){
-				0,
-				0,
-				max_width-SCALE1(BUTTON_PADDING*2),
-				text->h
-			}, screen, &(SDL_Rect){
-				SCALE1(PADDING+BUTTON_PADDING),
-				SCALE1(PADDING+4)
-			});
+			GFX_blitPillLight(ASSET_WHITE_PILL, screen,
+							  &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
+			SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, screen,
+							&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
 			SDL_FreeSurface(text);
-			
-			if (show_setting && !GetHDMI()) GFX_blitHardwareHints(screen, show_setting);
-			else GFX_blitButtonGroup((char*[]){ BTN_SLEEP==BTN_POWER?"POWER":"MENU","SLEEP", NULL }, 0, screen, 0);
-			GFX_blitButtonGroup((char*[]){ "B","BACK", "A","OKAY", NULL }, 1, screen, 1);
-			
+
+			if (show_setting && !GetHDMI())
+				GFX_blitHardwareHints(screen, show_setting);
+			else
+				GFX_blitButtonGroup((char *[]){BTN_SLEEP == BTN_POWER ? "POWER" : "MENU", "SLEEP", NULL}, 0, screen, 0);
+			GFX_blitButtonGroup((char *[]){"B", "BACK", "A", "OKAY", NULL}, 1, screen, 1);
+
 			// list
 			oy = (((DEVICE_HEIGHT / FIXED_SCALE) - PADDING * 2) - (MENU_ITEM_COUNT * PILL_SIZE)) / 2;
-			for (int i=0; i<MENU_ITEM_COUNT; i++) {
-				char* item = menu.items[i];
+			for (int i = 0; i < MENU_ITEM_COUNT; i++) {
+				char *item = menu.items[i];
 				SDL_Color text_color = COLOR_WHITE;
-				
-				if (i==selected) {
+
+				if (i == selected) {
 					text_color = uintToColour(THEME_COLOR5_255);
 
 					// disc change
-					if (menu.total_discs>1 && i==ITEM_CONT) {				
-						GFX_blitPillDark(ASSET_WHITE_PILL, screen, &(SDL_Rect){
-							SCALE1(PADDING),
-							SCALE1(oy + PADDING),
-							screen->w - SCALE1(PADDING * 2),
-							SCALE1(PILL_SIZE)
-						});
+					if (menu.total_discs > 1 && i == ITEM_CONT) {
+						GFX_blitPillDark(ASSET_WHITE_PILL, screen,
+										 &(SDL_Rect){SCALE1(PADDING), SCALE1(oy + PADDING),
+													 screen->w - SCALE1(PADDING * 2), SCALE1(PILL_SIZE)});
 						text = TTF_RenderUTF8_Blended(font.large, disc_name, text_color);
-						SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-							screen->w - SCALE1(PADDING + BUTTON_PADDING) - text->w,
-							SCALE1(oy + PADDING + 4)
-						});
+						SDL_BlitSurface(text, NULL, screen,
+										&(SDL_Rect){screen->w - SCALE1(PADDING + BUTTON_PADDING) - text->w,
+													SCALE1(oy + PADDING + 4)});
 						SDL_FreeSurface(text);
 					}
-					
+
 					TTF_SizeUTF8(font.large, item, &ow, NULL);
-					ow += SCALE1(BUTTON_PADDING*2);
-					
+					ow += SCALE1(BUTTON_PADDING * 2);
+
 					// pill
-					GFX_blitPillDark(ASSET_WHITE_PILL, screen, &(SDL_Rect){
-						SCALE1(PADDING),
-						SCALE1(oy + PADDING + (i * PILL_SIZE)),
-						ow,
-						SCALE1(PILL_SIZE)
-					});
+					GFX_blitPillDark(
+						ASSET_WHITE_PILL, screen,
+						&(SDL_Rect){SCALE1(PADDING), SCALE1(oy + PADDING + (i * PILL_SIZE)), ow, SCALE1(PILL_SIZE)});
 				}
-			
-				
+
+
 				// text
 				text = TTF_RenderUTF8_Blended(font.large, item, text_color);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){
-					SCALE1(PADDING + BUTTON_PADDING),
-					SCALE1(oy + PADDING + (i * PILL_SIZE) + 4)
-				});
+				SDL_BlitSurface(
+					text, NULL, screen,
+					&(SDL_Rect){SCALE1(PADDING + BUTTON_PADDING), SCALE1(oy + PADDING + (i * PILL_SIZE) + 4)});
 				SDL_FreeSurface(text);
 			}
-			
+
 			// slot preview
-			if (selected==ITEM_SAVE || selected==ITEM_LOAD) {
-				#define WINDOW_RADIUS 4 // TODO: this logic belongs in blitRect?
-				#define PAGINATION_HEIGHT 6
+			if (selected == ITEM_SAVE || selected == ITEM_LOAD) {
+#define WINDOW_RADIUS 4 // TODO: this logic belongs in blitRect?
+#define PAGINATION_HEIGHT 6
 				// unscaled
 				int hw = DEVICE_WIDTH / 2;
 				int hh = DEVICE_HEIGHT / 2;
-				int pw = hw + SCALE1(WINDOW_RADIUS*2);
-				int ph = hh + SCALE1(WINDOW_RADIUS*2 + PAGINATION_HEIGHT + WINDOW_RADIUS);
+				int pw = hw + SCALE1(WINDOW_RADIUS * 2);
+				int ph = hh + SCALE1(WINDOW_RADIUS * 2 + PAGINATION_HEIGHT + WINDOW_RADIUS);
 				ox = DEVICE_WIDTH - pw - SCALE1(PADDING);
 				oy = (DEVICE_HEIGHT - ph) / 2;
-				
+
 				// window
-				GFX_blitRect(ASSET_STATE_BG, screen, &(SDL_Rect){ox,oy,pw,ph});
+				GFX_blitRect(ASSET_STATE_BG, screen, &(SDL_Rect){ox, oy, pw, ph});
 				ox += SCALE1(WINDOW_RADIUS);
 				oy += SCALE1(WINDOW_RADIUS);
-				
+
 				if (menu.preview_exists) { // has save, has preview
 					// lotta memory churn here
-					SDL_Surface* bmp = IMG_Load(menu.bmp_path);
-					SDL_Surface* raw_preview = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888,0);
+					SDL_Surface *bmp = IMG_Load(menu.bmp_path);
+					SDL_Surface *raw_preview = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888, 0);
 					if (raw_preview) {
-						SDL_FreeSurface(bmp); 
-						bmp = raw_preview; 
+						SDL_FreeSurface(bmp);
+						bmp = raw_preview;
 					}
 					// LOG_info("raw_preview %ix%i\n", raw_preview->w,raw_preview->h);
-					SDL_Rect preview_rect = {ox,oy,hw,hh};
-					SDL_FillRect(screen, &preview_rect, SDL_MapRGBA(screen->format,0,0,0,255));
-					SDL_BlitScaled(bmp,NULL,preview,NULL);
-					SDL_BlitSurface(preview, NULL, screen, &(SDL_Rect){ox,oy});
+					SDL_Rect preview_rect = {ox, oy, hw, hh};
+					SDL_FillRect(screen, &preview_rect, SDL_MapRGBA(screen->format, 0, 0, 0, 255));
+					SDL_BlitScaled(bmp, NULL, preview, NULL);
+					SDL_BlitSurface(preview, NULL, screen, &(SDL_Rect){ox, oy});
 					SDL_FreeSurface(bmp);
+				} else {
+					SDL_Rect preview_rect = {ox, oy, hw, hh};
+					SDL_FillRect(screen, &preview_rect, SDL_MapRGBA(screen->format, 0, 0, 0, 255));
+					if (menu.save_exists)
+						GFX_blitMessage(font.large, "No Preview", screen, &preview_rect);
+					else
+						GFX_blitMessage(font.large, "Empty Slot", screen, &preview_rect);
 				}
-				else {
-					SDL_Rect preview_rect = {ox,oy,hw,hh};
-					SDL_FillRect(screen, &preview_rect, SDL_MapRGBA(screen->format,0,0,0,255));
-					if (menu.save_exists) GFX_blitMessage(font.large, "No Preview", screen, &preview_rect);
-					else GFX_blitMessage(font.large, "Empty Slot", screen, &preview_rect);
-				}
-				
+
 				// pagination
-				ox += (pw-SCALE1(15*MENU_SLOT_COUNT))/2;
-				oy += hh+SCALE1(WINDOW_RADIUS);
-				for (int i=0; i<MENU_SLOT_COUNT; i++) {
-					if (i==menu.slot)GFX_blitAsset(ASSET_PAGE, NULL, screen, &(SDL_Rect){ox+SCALE1(i*15),oy});
-					else GFX_blitAsset(ASSET_DOT, NULL, screen, &(SDL_Rect){ox+SCALE1(i*15)+4,oy+SCALE1(2)});
+				ox += (pw - SCALE1(15 * MENU_SLOT_COUNT)) / 2;
+				oy += hh + SCALE1(WINDOW_RADIUS);
+				for (int i = 0; i < MENU_SLOT_COUNT; i++) {
+					if (i == menu.slot)
+						GFX_blitAsset(ASSET_PAGE, NULL, screen, &(SDL_Rect){ox + SCALE1(i * 15), oy});
+					else
+						GFX_blitAsset(ASSET_DOT, NULL, screen, &(SDL_Rect){ox + SCALE1(i * 15) + 4, oy + SCALE1(2)});
 				}
 			}
 			GFX_flip(screen);
-			dirty=0;
+			dirty = 0;
 		} else {
 			// please dont flip cause it will cause current_fps dip and audio is weird first seconds
 			GFX_delay();
 		}
 		hdmimon();
 	}
-	
+
 	SDL_FreeSurface(preview);
-	if(menu.bitmap) SDL_FreeSurface(menu.bitmap);
+	if (menu.bitmap)
+		SDL_FreeSurface(menu.bitmap);
 	PAD_reset();
 
 	GFX_clearAll();
 	PWR_warn(1);
-	
+
 	int count = 0;
-	char** overlayList = config.frontend.options[FE_OPT_OVERLAY].values;
-	while ( overlayList && overlayList[count]) count++;
+	char **overlayList = config.frontend.options[FE_OPT_OVERLAY].values;
+	while (overlayList && overlayList[count])
+		count++;
 	if (overlay >= 0 && overlay < count) {
-		GFX_setOverlay(overlayList[overlay],core.tag);
+		GFX_setOverlay(overlayList[overlay], core.tag);
 	}
 
 	GFX_setOffsetX(screenx);
 	GFX_setOffsetY(screeny);
 	if (!quit) {
-		if (restore_w!=DEVICE_WIDTH || restore_h!=DEVICE_HEIGHT) {
-			screen = GFX_resize(restore_w,restore_h,restore_p);
+		if (restore_w != DEVICE_WIDTH || restore_h != DEVICE_HEIGHT) {
+			screen = GFX_resize(restore_w, restore_h, restore_p);
 		}
 		GFX_setEffect(screen_effect);
 
 		GFX_clear(screen);
 
 		setOverclock(overclock); // restore overclock value
-		if (rumble_strength) VIB_setStrength(rumble_strength);
-		
-		if (!HAS_POWER_BUTTON) PWR_disableSleep();
-	}
-	else if (exists(NOUI_PATH)) PWR_powerOff(0); // TODO: won't work with threaded core, only check this once per launch
-	
+		if (rumble_strength)
+			VIB_setStrength(rumble_strength);
+
+		if (!HAS_POWER_BUTTON)
+			PWR_disableSleep();
+	} else if (exists(NOUI_PATH))
+		PWR_powerOff(0); // TODO: won't work with threaded core, only check this once per launch
+
 
 	SDL_FreeSurface(backing);
 	PWR_disableAutosleep();
 }
 
 // TODO: move to PWR_*?
-static unsigned getUsage(void) { // from picoarch
+static unsigned getUsage(void)
+{ // from picoarch
 	long unsigned ticks = 0;
 	long ticksps = 0;
 	FILE *file = NULL;
@@ -6889,30 +6944,37 @@ static unsigned getUsage(void) { // from picoarch
 	return ticks;
 }
 
-static void resetFPSCounter() {
+static void resetFPSCounter()
+{
 	sec_start = SDL_GetTicks();
 	fps_ticks = 0.0;
 	fps_double = 0.0;
 }
 
-static void chooseSyncRef(void) {
+static void chooseSyncRef(void)
+{
 	switch (sync_ref) {
-		case SYNC_SRC_AUTO:   use_core_fps = (core.get_region() == RETRO_REGION_PAL); break;
-		case SYNC_SRC_SCREEN: use_core_fps = 0; break;
-		case SYNC_SRC_CORE:   use_core_fps = 1; break;
+	case SYNC_SRC_AUTO:
+		use_core_fps = (core.get_region() == RETRO_REGION_PAL);
+		break;
+	case SYNC_SRC_SCREEN:
+		use_core_fps = 0;
+		break;
+	case SYNC_SRC_CORE:
+		use_core_fps = 1;
+		break;
 	}
-	LOG_info("%s: sync_ref is set to %s, game region is %s, use core fps = %s\n",
-		  __FUNCTION__,
-		  sync_ref_labels[sync_ref],
-		  core.get_region() == RETRO_REGION_NTSC ? "NTSC" : "PAL",
-		  use_core_fps ? "yes" : "no");
+	LOG_info("%s: sync_ref is set to %s, game region is %s, use core fps = %s\n", __FUNCTION__,
+			 sync_ref_labels[sync_ref], core.get_region() == RETRO_REGION_NTSC ? "NTSC" : "PAL",
+			 use_core_fps ? "yes" : "no");
 }
 
-static void trackFPS(void) {
+static void trackFPS(void)
+{
 	cpu_ticks += 1;
 	static int last_use_ticks = 0;
 	uint32_t now = SDL_GetTicks();
-	if (now - sec_start>=1000) {
+	if (now - sec_start >= 1000) {
 		double last_time = (double)(now - sec_start) / 1000;
 		fps_double = fps_ticks / last_time;
 		cpu_double = cpu_ticks / last_time;
@@ -6924,28 +6986,30 @@ static void trackFPS(void) {
 		sec_start = now;
 		cpu_ticks = 0;
 		fps_ticks = 0;
-		
+
 		// LOG_info("fps: %f cpu: %f\n", fps_double, cpu_double);
 	}
 }
 
-static void limitFF(void) {
+static void limitFF(void)
+{
 	static uint64_t ff_frame_time = 0;
 	static uint64_t last_time = 0;
 	static int last_max_speed = -1;
-	if (last_max_speed!=max_ff_speed) {
+	if (last_max_speed != max_ff_speed) {
 		last_max_speed = max_ff_speed;
 		ff_frame_time = 1000000 / (core.fps * (max_ff_speed + 1));
 	}
-	
+
 	uint64_t now = getMicroseconds();
 	if (fast_forward && max_ff_speed) {
-		if (last_time == 0) last_time = now;
+		if (last_time == 0)
+			last_time = now;
 		int elapsed = now - last_time;
-		if (elapsed>0 && elapsed<0x80000) {
-			if (elapsed<ff_frame_time) {
+		if (elapsed > 0 && elapsed < 0x80000) {
+			if (elapsed < ff_frame_time) {
 				int delay = (ff_frame_time - elapsed) / 1000;
-				if (delay>0 && delay<17) { // don't allow a delay any greater than a frame
+				if (delay > 0 && delay < 17) { // don't allow a delay any greater than a frame
 					SDL_Delay(delay);
 				}
 			}
@@ -6964,61 +7028,71 @@ static bool resetAudio = false;
 
 void onAudioSinkChanged(int device, int watch_event)
 {
-	switch (watch_event)
-	{
-	case DIRWATCH_CREATE: LOG_info("callback reason: DIRWATCH_CREATE\n"); break;
-	case DIRWATCH_DELETE: LOG_info("callback reason: DIRWATCH_DELETE\n"); break;
-	case FILEWATCH_MODIFY: LOG_info("callback reason: FILEWATCH_MODIFY\n"); break;
-	case FILEWATCH_DELETE: LOG_info("callback reason: FILEWATCH_DELETE\n"); break;
-	case FILEWATCH_CLOSE_WRITE: LOG_info("callback reason: FILEWATCH_CLOSE_WRITE\n"); break;
+	switch (watch_event) {
+	case DIRWATCH_CREATE:
+		LOG_info("callback reason: DIRWATCH_CREATE\n");
+		break;
+	case DIRWATCH_DELETE:
+		LOG_info("callback reason: DIRWATCH_DELETE\n");
+		break;
+	case FILEWATCH_MODIFY:
+		LOG_info("callback reason: FILEWATCH_MODIFY\n");
+		break;
+	case FILEWATCH_DELETE:
+		LOG_info("callback reason: FILEWATCH_DELETE\n");
+		break;
+	case FILEWATCH_CLOSE_WRITE:
+		LOG_info("callback reason: FILEWATCH_CLOSE_WRITE\n");
+		break;
 	}
 
 	resetAudio = true;
 
 	// FIXME: This shouldnt be necessary, alsa should just read .asoundrc for the changed defult device.
-	if(device == AUDIO_SINK_BLUETOOTH)
+	if (device == AUDIO_SINK_BLUETOOTH)
 		SDL_setenv("AUDIODEV", "bluealsa", 1);
 	else
 		SDL_setenv("AUDIODEV", "default", 1);
 
-	if(device != AUDIO_SINK_DEFAULT && !exists("/mnt/SDCARD/.userdata/tg5040/.asoundrc"))
+	if (device != AUDIO_SINK_DEFAULT && !exists("/mnt/SDCARD/.userdata/tg5040/.asoundrc"))
 		LOG_error("asoundrc is not there yet!!!\n");
-	else if(device == AUDIO_SINK_DEFAULT && exists("/mnt/SDCARD/.userdata/tg5040/.asoundrc"))
+	else if (device == AUDIO_SINK_DEFAULT && exists("/mnt/SDCARD/.userdata/tg5040/.asoundrc"))
 		LOG_error("asoundrc is not deleted yet!!!\n");
 }
 
-int main(int argc , char* argv[]) {
+int main(int argc, char *argv[])
+{
 	LOG_info("MinArch\n");
 
 	static char asoundpath[MAX_PATH];
 	sprintf(asoundpath, "%s/.asoundrc", getenv("HOME"));
 	LOG_info("minarch: need asoundrc at %s\n", asoundpath);
-	if(exists(asoundpath))
+	if (exists(asoundpath))
 		LOG_info("asoundrc exists at %s\n", asoundpath);
-	else 
+	else
 		LOG_info("asoundrc does not exist at %s\n", asoundpath);
 
 	pthread_t cpucheckthread;
-    pthread_create(&cpucheckthread, NULL, PLAT_cpu_monitor, NULL);
+	pthread_create(&cpucheckthread, NULL, PLAT_cpu_monitor, NULL);
 
 	setOverclock(overclock); // default to normal
 	// force a stack overflow to ensure asan is linked and actually working
 	// char tmp[2];
 	// tmp[2] = 'a';
-	
+
 	char core_path[MAX_PATH];
-	char rom_path[MAX_PATH]; 
+	char rom_path[MAX_PATH];
 	char tag_name[MAX_PATH];
 
-	if(argc < 2)
+	if (argc < 2)
 		return EXIT_FAILURE;
 
 	strcpy(core_path, argv[1]);
 	strcpy(rom_path, argv[2]);
 	getEmuName(rom_path, tag_name);
-	
+
 	LOG_info("rom_path: %s\n", rom_path);
-	
+
 	screen = GFX_init(MODE_MENU);
 
 	// initialize default shaders
@@ -7029,7 +7103,7 @@ int main(int argc , char* argv[]) {
 	DEVICE_HEIGHT = screen->h;
 	DEVICE_PITCH = screen->pitch;
 	// LOG_info("DEVICE_SIZE: %ix%i (%i)\n", DEVICE_WIDTH,DEVICE_HEIGHT,DEVICE_PITCH);
-	
+
 	VIB_init();
 	PWR_init();
 	if (!HAS_POWER_BUTTON)
@@ -7042,26 +7116,27 @@ int main(int argc , char* argv[]) {
 	environment_callback(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt);
 
 	Game_open(rom_path); // nes tries to load gamegenie setting before this returns ffs
-	if (!game.is_open) goto finish;
-	
+	if (!game.is_open)
+		goto finish;
+
 	simple_mode = exists(SIMPLE_MODE_PATH);
-	
+
 	// restore options
 	Config_load(); // before init?
 	Config_init();
 	Config_readOptions(); // cores with boot logo option (eg. gb) need to load options early
 	setOverclock(overclock);
-	
+
 	Core_init();
 
 	// TODO: find a better place to do this
 	// mixing static and loaded data is messy
 	// why not move to Core_init()?
 	// ah, because it's defined before options_menu...
-	options_menu.items[1].desc = (char*)core.version;
+	options_menu.items[1].desc = (char *)core.version;
 	Core_load();
 	Input_init(NULL);
-	Config_readOptions(); // but others load and report options later (eg. nes)
+	Config_readOptions();  // but others load and report options later (eg. nes)
 	Config_readControls(); // restore controls (after the core has reported its defaults)
 
 	SND_init(core.sample_rate, core.fps);
@@ -7074,7 +7149,7 @@ int main(int argc , char* argv[]) {
 	PWR_warn(1);
 	PWR_disableAutosleep();
 	// we dont need five second updates while ingame, and wifi status isnt displayed either
-	PWR_updateFrequency(PWR_UPDATE_FREQ, 0); 
+	PWR_updateFrequency(PWR_UPDATE_FREQ, 0);
 
 	// force a vsync immediately before loop
 	// for better frame pacing?
@@ -7091,27 +7166,27 @@ int main(int argc , char* argv[]) {
 	sec_start = SDL_GetTicks();
 	resetFPSCounter();
 	chooseSyncRef();
-	
+
 	int has_pending_opt_change = 0;
-	LOG_info("Starting shaders %ims\n\n",SDL_GetTicks());
+	LOG_info("Starting shaders %ims\n\n", SDL_GetTicks());
 
 
 	// then initialize custom  shaders from settings
-	
+
 	initShaders();
 	Config_readOptions();
 	applyShaderSettings();
 	// release config when all is loaded
 	Config_free();
 
-	LOG_info("total startup time %ims\n\n",SDL_GetTicks());
+	LOG_info("total startup time %ims\n\n", SDL_GetTicks());
 	while (!quit) {
 		GFX_startFrame();
-	
+
 		core.run();
 		limitFF();
 		trackFPS();
-		
+
 
 		if (has_pending_opt_change) {
 			has_pending_opt_change = 0;
@@ -7123,11 +7198,11 @@ int main(int argc , char* argv[]) {
 			chooseSyncRef();
 		}
 
-		
+
 		if (show_menu) {
-			PWR_updateFrequency(PWR_UPDATE_FREQ,1);
+			PWR_updateFrequency(PWR_UPDATE_FREQ, 1);
 			Menu_loop();
-			PWR_updateFrequency(PWR_UPDATE_FREQ_INGAME,0);
+			PWR_updateFrequency(PWR_UPDATE_FREQ_INGAME, 0);
 			has_pending_opt_change = config.core.changed;
 			resetFPSCounter();
 			chooseSyncRef();
@@ -7142,26 +7217,25 @@ int main(int argc , char* argv[]) {
 		hdmimon();
 	}
 	int cw, ch;
-	unsigned char* pixels = GFX_GL_screenCapture(&cw, &ch);
-	
+	unsigned char *pixels = GFX_GL_screenCapture(&cw, &ch);
+
 	renderer.dst = pixels;
-	SDL_Surface* rawSurface = SDL_CreateRGBSurfaceWithFormatFrom(
-		pixels, cw, ch, 32, cw * 4, SDL_PIXELFORMAT_ABGR8888
-	);
-	SDL_Surface* converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
+	SDL_Surface *rawSurface = SDL_CreateRGBSurfaceWithFormatFrom(pixels, cw, ch, 32, cw * 4, SDL_PIXELFORMAT_ABGR8888);
+	SDL_Surface *converted = SDL_ConvertSurfaceFormat(rawSurface, SDL_PIXELFORMAT_RGBA8888, 0);
 	screen = converted;
 	SDL_FreeSurface(rawSurface);
-	free(pixels); 
+	free(pixels);
 	GFX_animateSurfaceOpacity(converted, 0, 0, cw, ch, 255, 0, CFG_getMenuTransitions() ? 200 : 20, 1);
-	SDL_FreeSurface(converted); 
-	
-	if(rgbaData) free(rgbaData);
+	SDL_FreeSurface(converted);
+
+	if (rgbaData)
+		free(rgbaData);
 
 	PLAT_clearTurbo();
 
 	Menu_quit();
 	QuitSettings();
-	
+
 finish:
 
 	Game_close();
@@ -7174,10 +7248,10 @@ int main(int argc , char* argv[]) {
 	PWR_quit();
 	VIB_quit();
 	SND_removeDeviceWatcher();
-	// Disabling this is a dumb hack for bluetooth, we should really be using 
+	// Disabling this is a dumb hack for bluetooth, we should really be using
 	// bluealsa with --keep-alive=-1 - but SDL wont reconnect the stream on next start.
 	// Reenable as soon as we have a more recent SDL available, if ever.
-	//SND_quit();
+	// SND_quit();
 	PAD_quit();
 	GFX_quit();
 	SDL_WaitThread(screenshotsavethread, NULL);
diff --git a/workspace/all/minput/minput.c b/workspace/all/minput/minput.c
index 1ec1797c7..0b0998259 100644
--- a/workspace/all/minput/minput.c
+++ b/workspace/all/minput/minput.c
@@ -8,11 +8,13 @@
 #include "api.h"
 #include "utils.h"
 
-static int getButtonWidth(char* label) {
-	SDL_Surface* text;
+static int getButtonWidth(char *label)
+{
+	SDL_Surface *text;
 	int w = 0;
-	
-	if (strlen(label)<=2) w = SCALE1(BUTTON_SIZE);
+
+	if (strlen(label) <= 2)
+		w = SCALE1(BUTTON_SIZE);
 	else {
 		text = TTF_RenderUTF8_Blended(font.tiny, label, COLOR_BUTTON_TEXT);
 		w = SCALE1(BUTTON_SIZE) + text->w;
@@ -21,171 +23,193 @@ static int getButtonWidth(char* label) {
 	return w;
 }
 
-static void blitButton(char* label, SDL_Surface* dst, int pressed, int x, int y, int w) {
-	SDL_Rect point = {x,y};
-	SDL_Surface* text;
-	
+static void blitButton(char *label, SDL_Surface *dst, int pressed, int x, int y, int w)
+{
+	SDL_Rect point = {x, y};
+	SDL_Surface *text;
+
 	int len = strlen(label);
-	if (len<=2) {
-		text = TTF_RenderUTF8_Blended(len==2?font.small:font.medium, label, COLOR_BUTTON_TEXT);
-		GFX_blitAsset(pressed?ASSET_BUTTON:ASSET_HOLE, NULL, dst, &point);
-		SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){point.x+(SCALE1(BUTTON_SIZE)-text->w)/2,point.y+(SCALE1(BUTTON_SIZE)-text->h)/2});
-	}
-	else {
+	if (len <= 2) {
+		text = TTF_RenderUTF8_Blended(len == 2 ? font.small : font.medium, label, COLOR_BUTTON_TEXT);
+		GFX_blitAsset(pressed ? ASSET_BUTTON : ASSET_HOLE, NULL, dst, &point);
+		SDL_BlitSurface(
+			text, NULL, dst,
+			&(SDL_Rect){point.x + (SCALE1(BUTTON_SIZE) - text->w) / 2, point.y + (SCALE1(BUTTON_SIZE) - text->h) / 2});
+	} else {
 		text = TTF_RenderUTF8_Blended(font.tiny, label, COLOR_BUTTON_TEXT);
-		w = w ? w : SCALE1(BUTTON_SIZE)/2+text->w;
-		GFX_blitPill(pressed?ASSET_BUTTON:ASSET_HOLE, dst, &(SDL_Rect){point.x,point.y,w,SCALE1(BUTTON_SIZE)});
-		SDL_BlitSurface(text, NULL, dst, &(SDL_Rect){point.x+(w-text->w)/2,point.y+(SCALE1(BUTTON_SIZE)-text->h)/2,text->w,text->h});
+		w = w ? w : SCALE1(BUTTON_SIZE) / 2 + text->w;
+		GFX_blitPill(pressed ? ASSET_BUTTON : ASSET_HOLE, dst, &(SDL_Rect){point.x, point.y, w, SCALE1(BUTTON_SIZE)});
+		SDL_BlitSurface(
+			text, NULL, dst,
+			&(SDL_Rect){point.x + (w - text->w) / 2, point.y + (SCALE1(BUTTON_SIZE) - text->h) / 2, text->w, text->h});
 	}
 
 	SDL_FreeSurface(text);
 }
 
-int main(int argc , char* argv[]) {
+int main(int argc, char *argv[])
+{
 	PWR_setCPUSpeed(CPU_SPEED_MENU);
-	
-	SDL_Surface* screen = GFX_init(MODE_MAIN);
+
+	SDL_Surface *screen = GFX_init(MODE_MAIN);
 	PAD_init();
 	PWR_init();
 	InitSettings();
-	
+
 	// one-time
-	int has_L2 = (BUTTON_L2!=BUTTON_NA || CODE_L2!=CODE_NA || JOY_L2!=JOY_NA || AXIS_L2!=AXIS_NA);
-	int has_R2 = (BUTTON_R2!=BUTTON_NA || CODE_R2!=CODE_NA || JOY_R2!=JOY_NA || AXIS_R2!=AXIS_NA);
-	int has_L3 = (BUTTON_L3!=BUTTON_NA || CODE_L3!=CODE_NA || JOY_L3!=JOY_NA);
-	int has_R3 = (BUTTON_R3!=BUTTON_NA || CODE_R3!=CODE_NA || JOY_R3!=JOY_NA);
-	int has_LS = (AXIS_LX!=AXIS_NA);
-	int has_RS = (AXIS_RX!=AXIS_NA);
-	
-	int has_volume = (BUTTON_PLUS!=BUTTON_NA || CODE_PLUS!=CODE_NA || JOY_PLUS!=JOY_NA);
+	int has_L2 = (BUTTON_L2 != BUTTON_NA || CODE_L2 != CODE_NA || JOY_L2 != JOY_NA || AXIS_L2 != AXIS_NA);
+	int has_R2 = (BUTTON_R2 != BUTTON_NA || CODE_R2 != CODE_NA || JOY_R2 != JOY_NA || AXIS_R2 != AXIS_NA);
+	int has_L3 = (BUTTON_L3 != BUTTON_NA || CODE_L3 != CODE_NA || JOY_L3 != JOY_NA);
+	int has_R3 = (BUTTON_R3 != BUTTON_NA || CODE_R3 != CODE_NA || JOY_R3 != JOY_NA);
+	int has_LS = (AXIS_LX != AXIS_NA);
+	int has_RS = (AXIS_RX != AXIS_NA);
+
+	int has_volume = (BUTTON_PLUS != BUTTON_NA || CODE_PLUS != CODE_NA || JOY_PLUS != JOY_NA);
 	int has_power = HAS_POWER_BUTTON;
 	int has_menu = HAS_MENU_BUTTON;
 	int has_both = (has_power && has_menu);
-	
+
 	int oy = SCALE1(PADDING);
-	if (!has_L3 && !has_R3) oy += SCALE1(PILL_SIZE);
-	
+	if (!has_L3 && !has_R3)
+		oy += SCALE1(PILL_SIZE);
+
 	SDL_Event event;
 	int quit = 0;
 	int dirty = 1;
 	// int show_setting = 0;
-	while(!quit) {
+	while (!quit) {
 		GFX_startFrame();
 		uint32_t frame_start = SDL_GetTicks();
-		
+
 		PAD_poll();
-		
-		if (PAD_anyPressed() || PAD_anyJustReleased()) dirty = 1;
-		if (PAD_isPressed(BTN_SELECT) && PAD_isPressed(BTN_START)) quit = 1;
-		
+
+		if (PAD_anyPressed() || PAD_anyJustReleased())
+			dirty = 1;
+		if (PAD_isPressed(BTN_SELECT) && PAD_isPressed(BTN_START))
+			quit = 1;
+
 		// PWR_update(&dirty, NULL, NULL,NULL);
-		
+
 		if (dirty) {
 			GFX_clear(screen);
-			
+
 			// GFX_blitHardwareGroup(screen, show_setting);
-			
+
 			// L group
 			{
 				int x = SCALE1(BUTTON_MARGIN + PADDING);
 				int y = oy;
 				int w = 0;
 				int ox = 0;
-			
-				w = getButtonWidth("L1") + SCALE1(BUTTON_MARGIN)*2;
+
+				w = getButtonWidth("L1") + SCALE1(BUTTON_MARGIN) * 2;
 				ox = w;
-			
-				if (has_L2) w += getButtonWidth("L2") + SCALE1(BUTTON_MARGIN);
-				if (!has_L2) x += SCALE1(PILL_SIZE);
+
+				if (has_L2)
+					w += getButtonWidth("L2") + SCALE1(BUTTON_MARGIN);
+				if (!has_L2)
+					x += SCALE1(PILL_SIZE);
 				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, w}, THEME_COLOR3, RGB_WHITE);
 
-				blitButton("L1", screen, PAD_isPressed(BTN_L1), x+SCALE1(BUTTON_MARGIN), y+SCALE1(BUTTON_MARGIN),0);
-				if (has_L2) blitButton("L2", screen, PAD_isPressed(BTN_L2), x+ox, y+SCALE1(BUTTON_MARGIN),0);
+				blitButton("L1", screen, PAD_isPressed(BTN_L1), x + SCALE1(BUTTON_MARGIN), y + SCALE1(BUTTON_MARGIN),
+						   0);
+				if (has_L2)
+					blitButton("L2", screen, PAD_isPressed(BTN_L2), x + ox, y + SCALE1(BUTTON_MARGIN), 0);
 			}
-			
+
 			// R group
 			{
 				int x = 0;
 				int y = oy;
 				int w = 0;
 				int ox = 0;
-			
-				w = getButtonWidth("R1") + SCALE1(BUTTON_MARGIN)*2;
+
+				w = getButtonWidth("R1") + SCALE1(BUTTON_MARGIN) * 2;
 				ox = w;
-			
-				if (has_R2) w += getButtonWidth("R2") + SCALE1(BUTTON_MARGIN);
-				
+
+				if (has_R2)
+					w += getButtonWidth("R2") + SCALE1(BUTTON_MARGIN);
+
 				x = FIXED_WIDTH - w - SCALE1(BUTTON_MARGIN + PADDING);
-				if (!has_R2) x -= SCALE1(PILL_SIZE);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,w}, THEME_COLOR3, RGB_WHITE);
+				if (!has_R2)
+					x -= SCALE1(PILL_SIZE);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, w}, THEME_COLOR3, RGB_WHITE);
 
-				blitButton(has_R2?"R2":"R1", screen, PAD_isPressed(has_R2?BTN_R2:BTN_R1), x+SCALE1(BUTTON_MARGIN), y+SCALE1(BUTTON_MARGIN),0);
-				if (has_R2) blitButton("R1", screen, PAD_isPressed(BTN_R1), x+ox, y+SCALE1(BUTTON_MARGIN),0);
+				blitButton(has_R2 ? "R2" : "R1", screen, PAD_isPressed(has_R2 ? BTN_R2 : BTN_R1),
+						   x + SCALE1(BUTTON_MARGIN), y + SCALE1(BUTTON_MARGIN), 0);
+				if (has_R2)
+					blitButton("R1", screen, PAD_isPressed(BTN_R1), x + ox, y + SCALE1(BUTTON_MARGIN), 0);
 			}
-			
+
 			// DPAD group
 			{
 				// UP
 				int x = SCALE1(PADDING + PILL_SIZE);
-				int y = oy + SCALE1(PILL_SIZE*2);
+				int y = oy + SCALE1(PILL_SIZE * 2);
 				int o = SCALE1(BUTTON_MARGIN);
-				
-				SDL_FillRect(screen, &(SDL_Rect){x,y+SCALE1(PILL_SIZE/2),SCALE1(PILL_SIZE),SCALE1(PILL_SIZE*2)}, THEME_COLOR3);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("U", screen, PAD_isPressed(BTN_DPAD_UP), x+o, y+o,0);
-				
-				y += SCALE1(PILL_SIZE*2);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("D", screen, PAD_isPressed(BTN_DPAD_DOWN), x+o, y+o,0);
-				
+
+				SDL_FillRect(screen,
+							 &(SDL_Rect){x, y + SCALE1(PILL_SIZE / 2), SCALE1(PILL_SIZE), SCALE1(PILL_SIZE * 2)},
+							 THEME_COLOR3);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("U", screen, PAD_isPressed(BTN_DPAD_UP), x + o, y + o, 0);
+
+				y += SCALE1(PILL_SIZE * 2);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("D", screen, PAD_isPressed(BTN_DPAD_DOWN), x + o, y + o, 0);
+
 				x -= SCALE1(PILL_SIZE);
 				y -= SCALE1(PILL_SIZE);
-				
-				SDL_FillRect(screen, &(SDL_Rect){x+SCALE1(PILL_SIZE/2),y,SCALE1(PILL_SIZE*2),SCALE1(PILL_SIZE)}, THEME_COLOR3);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("L", screen, PAD_isPressed(BTN_DPAD_LEFT), x+o, y+o,0);
-				
-				x += SCALE1(PILL_SIZE*2);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("R", screen, PAD_isPressed(BTN_DPAD_RIGHT), x+o, y+o,0);
+
+				SDL_FillRect(screen,
+							 &(SDL_Rect){x + SCALE1(PILL_SIZE / 2), y, SCALE1(PILL_SIZE * 2), SCALE1(PILL_SIZE)},
+							 THEME_COLOR3);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("L", screen, PAD_isPressed(BTN_DPAD_LEFT), x + o, y + o, 0);
+
+				x += SCALE1(PILL_SIZE * 2);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("R", screen, PAD_isPressed(BTN_DPAD_RIGHT), x + o, y + o, 0);
 			}
-			
+
 			// ABXY group
 			{
 				// UP
 				int x = FIXED_WIDTH - SCALE1(PADDING + PILL_SIZE * 3) + SCALE1(PILL_SIZE);
-				int y = oy + SCALE1(PILL_SIZE*2);
+				int y = oy + SCALE1(PILL_SIZE * 2);
 				int o = SCALE1(BUTTON_MARGIN);
-				
-				// SDL_FillRect(screen, &(SDL_Rect){x,y+SCALE1(PILL_SIZE/2),SCALE1(PILL_SIZE),SCALE1(PILL_SIZE*2)}, THEME_COLOR3);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("X", screen, PAD_isPressed(BTN_X), x+o, y+o,0);
-				
-				y += SCALE1(PILL_SIZE*2);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("B", screen, PAD_isPressed(BTN_B), x+o, y+o,0);
-				
+
+				// SDL_FillRect(screen, &(SDL_Rect){x,y+SCALE1(PILL_SIZE/2),SCALE1(PILL_SIZE),SCALE1(PILL_SIZE*2)},
+				// THEME_COLOR3);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("X", screen, PAD_isPressed(BTN_X), x + o, y + o, 0);
+
+				y += SCALE1(PILL_SIZE * 2);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("B", screen, PAD_isPressed(BTN_B), x + o, y + o, 0);
+
 				x -= SCALE1(PILL_SIZE);
 				y -= SCALE1(PILL_SIZE);
-				
-				// SDL_FillRect(screen, &(SDL_Rect){x+SCALE1(PILL_SIZE/2),y,SCALE1(PILL_SIZE*2),SCALE1(PILL_SIZE)}, THEME_COLOR3);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("Y", screen, PAD_isPressed(BTN_Y), x+o, y+o,0);
-				
-				x += SCALE1(PILL_SIZE*2);
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("A", screen, PAD_isPressed(BTN_A), x+o, y+o,0);
+
+				// SDL_FillRect(screen, &(SDL_Rect){x+SCALE1(PILL_SIZE/2),y,SCALE1(PILL_SIZE*2),SCALE1(PILL_SIZE)},
+				// THEME_COLOR3);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("Y", screen, PAD_isPressed(BTN_Y), x + o, y + o, 0);
+
+				x += SCALE1(PILL_SIZE * 2);
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("A", screen, PAD_isPressed(BTN_A), x + o, y + o, 0);
 			}
-			
+
 			// VOLUME group
 			if (has_volume) {
-				int x = (FIXED_WIDTH - SCALE1(99))/2;
+				int x = (FIXED_WIDTH - SCALE1(99)) / 2;
 				int y = oy + SCALE1(PILL_SIZE);
 				int w = SCALE1(42);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,SCALE1(98)}, THEME_COLOR3, RGB_WHITE);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, SCALE1(98)}, THEME_COLOR3, RGB_WHITE);
 				x += SCALE1(BUTTON_MARGIN);
 				y += SCALE1(BUTTON_MARGIN);
 				blitButton("VOL. -", screen, PAD_isPressed(BTN_MINUS), x, y, w);
@@ -193,17 +217,17 @@ int main(int argc , char* argv[]) {
 				blitButton("VOL. +", screen, PAD_isPressed(BTN_PLUS), x, y, w);
 				x += w + SCALE1(BUTTON_MARGIN);
 			}
-			
+
 			// SYSTEM group
 			if (has_power || has_menu) {
 				int bw = 42;
-				int pw = has_both ? (bw*2 + BUTTON_MARGIN*3) : (bw + BUTTON_MARGIN*2);
-				
-				int x = (FIXED_WIDTH - SCALE1(pw))/2;
+				int pw = has_both ? (bw * 2 + BUTTON_MARGIN * 3) : (bw + BUTTON_MARGIN * 2);
+
+				int x = (FIXED_WIDTH - SCALE1(pw)) / 2;
 				int y = oy + SCALE1(PILL_SIZE * 3);
 				int w = SCALE1(bw);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,SCALE1(pw)}, THEME_COLOR3, RGB_WHITE);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, SCALE1(pw)}, THEME_COLOR3, RGB_WHITE);
 				x += SCALE1(BUTTON_MARGIN);
 				y += SCALE1(BUTTON_MARGIN);
 				if (has_menu) {
@@ -215,56 +239,56 @@ int main(int argc , char* argv[]) {
 					x += w + SCALE1(BUTTON_MARGIN);
 				}
 			}
-			
+
 			// META group
 			{
-				int x = (FIXED_WIDTH - SCALE1(99))/2;
+				int x = (FIXED_WIDTH - SCALE1(99)) / 2;
 				int y = oy + SCALE1(PILL_SIZE * 5);
 				int w = SCALE1(42);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,SCALE1(130)}, THEME_COLOR3, RGB_WHITE);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, SCALE1(130)}, THEME_COLOR3, RGB_WHITE);
 				x += SCALE1(BUTTON_MARGIN);
 				y += SCALE1(BUTTON_MARGIN);
 				blitButton("SELECT", screen, PAD_isPressed(BTN_SELECT), x, y, w);
 				x += w + SCALE1(BUTTON_MARGIN);
 				blitButton("START", screen, PAD_isPressed(BTN_START), x, y, w);
 				x += w + SCALE1(BUTTON_MARGIN);
-				
-				SDL_Surface* text = TTF_RenderUTF8_Blended(font.tiny, "QUIT", COLOR_LIGHT_TEXT);
-				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){x,y+(SCALE1(BUTTON_SIZE)-text->h)/2});
+
+				SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, "QUIT", COLOR_LIGHT_TEXT);
+				SDL_BlitSurface(text, NULL, screen, &(SDL_Rect){x, y + (SCALE1(BUTTON_SIZE) - text->h) / 2});
 				SDL_FreeSurface(text);
 			}
-			
+
 			// L3
 			if (has_L3) {
 				int x = SCALE1(PADDING + PILL_SIZE);
-				int y = oy + SCALE1(PILL_SIZE*6);
+				int y = oy + SCALE1(PILL_SIZE * 6);
 				int o = SCALE1(BUTTON_MARGIN);
 
 				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
 				blitButton("L3", screen, PAD_isPressed(BTN_L3), x + o, y + o, 0);
 			}
-			
+
 			// R3
 			if (has_R3) {
 				int x = FIXED_WIDTH - SCALE1(PADDING + PILL_SIZE * 3) + SCALE1(PILL_SIZE);
-				int y = oy + SCALE1(PILL_SIZE*6);
+				int y = oy + SCALE1(PILL_SIZE * 6);
 				int o = SCALE1(BUTTON_MARGIN);
-				
-				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x,y,0}, THEME_COLOR3, RGB_WHITE);
-				blitButton("R3", screen, PAD_isPressed(BTN_R3), x+o, y+o,0);
+
+				GFX_blitPillColor(ASSET_WHITE_PILL, screen, &(SDL_Rect){x, y, 0}, THEME_COLOR3, RGB_WHITE);
+				blitButton("R3", screen, PAD_isPressed(BTN_R3), x + o, y + o, 0);
 			}
 
 			GFX_flip(screen);
 			dirty = 0;
-		}
-		else GFX_sync();
+		} else
+			GFX_sync();
 	}
-	
+
 	QuitSettings();
 	PWR_quit();
 	PAD_quit();
 	GFX_quit();
-	
+
 	return EXIT_SUCCESS;
 }
diff --git a/workspace/all/nextui/nextui.c b/workspace/all/nextui/nextui.c
index 4e7e49f20..19055e927 100644
--- a/workspace/all/nextui/nextui.c
+++ b/workspace/all/nextui/nextui.c
@@ -6,7 +6,7 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <libgen.h>  // For dirname()
+#include <libgen.h> // For dirname()
 #include "defines.h"
 #include "api.h"
 #include "utils.h"
@@ -21,72 +21,86 @@
 typedef struct Array {
 	int count;
 	int capacity;
-	void** items;
+	void **items;
 } Array;
 
-static Array* Array_new(void) {
-	Array* self = malloc(sizeof(Array));
+static Array *Array_new(void)
+{
+	Array *self = malloc(sizeof(Array));
 	self->count = 0;
 	self->capacity = 8;
-	self->items = malloc(sizeof(void*) * self->capacity);
+	self->items = malloc(sizeof(void *) * self->capacity);
 	return self;
 }
-static void Array_push(Array* self, void* item) {
-	if (self->count>=self->capacity) {
+static void Array_push(Array *self, void *item)
+{
+	if (self->count >= self->capacity) {
 		self->capacity *= 2;
-		self->items = realloc(self->items, sizeof(void*) * self->capacity);
+		self->items = realloc(self->items, sizeof(void *) * self->capacity);
 	}
 	self->items[self->count++] = item;
 }
-static void Array_unshift(Array* self, void* item) {
-	if (self->count==0) return Array_push(self, item);
+static void Array_unshift(Array *self, void *item)
+{
+	if (self->count == 0)
+		return Array_push(self, item);
 	Array_push(self, NULL); // ensures we have enough capacity
-	for (int i=self->count-2; i>=0; i--) {
-		self->items[i+1] = self->items[i];
+	for (int i = self->count - 2; i >= 0; i--) {
+		self->items[i + 1] = self->items[i];
 	}
 	self->items[0] = item;
 }
-static void* Array_pop(Array* self) {
-	if (self->count==0) return NULL;
+static void *Array_pop(Array *self)
+{
+	if (self->count == 0)
+		return NULL;
 	return self->items[--self->count];
 }
-static void Array_remove(Array* self, void* item) {
-	if (self->count==0 || item == NULL)
+static void Array_remove(Array *self, void *item)
+{
+	if (self->count == 0 || item == NULL)
 		return;
 	int i = 0;
-	while (self->items[i] != item) i++;
-	for (int j = i; j < self->count-1; j++)
-		self->items[j] = self->items[j+1];
+	while (self->items[i] != item)
+		i++;
+	for (int j = i; j < self->count - 1; j++)
+		self->items[j] = self->items[j + 1];
 	self->count--;
 }
-static void Array_reverse(Array* self) {
-	int end = self->count-1;
-	int mid = self->count/2;
-	for (int i=0; i<mid; i++) {
-		void* item = self->items[i];
-		self->items[i] = self->items[end-i];
-		self->items[end-i] = item;
+static void Array_reverse(Array *self)
+{
+	int end = self->count - 1;
+	int mid = self->count / 2;
+	for (int i = 0; i < mid; i++) {
+		void *item = self->items[i];
+		self->items[i] = self->items[end - i];
+		self->items[end - i] = item;
 	}
 }
-static void Array_free(Array* self) {
-	free(self->items); 
+static void Array_free(Array *self)
+{
+	free(self->items);
 	free(self);
 }
-static void Array_yoink(Array* self, Array* other) {
+static void Array_yoink(Array *self, Array *other)
+{
 	// append entries to self and take ownership
 	for (int i = 0; i < other->count; i++)
-        Array_push(self, other->items[i]);
-    Array_free(other); // `self` now owns the entries
+		Array_push(self, other->items[i]);
+	Array_free(other); // `self` now owns the entries
 }
 
-static int StringArray_indexOf(Array* self, char* str) {
-	for (int i=0; i<self->count; i++) {
-		if (exactMatch(self->items[i], str)) return i;
+static int StringArray_indexOf(Array *self, char *str)
+{
+	for (int i = 0; i < self->count; i++) {
+		if (exactMatch(self->items[i], str))
+			return i;
 	}
 	return -1;
 }
-static void StringArray_free(Array* self) {
-	for (int i=0; i<self->count; i++) {
+static void StringArray_free(Array *self)
+{
+	for (int i = 0; i < self->count; i++) {
 		free(self->items[i]);
 	}
 	Array_free(self);
@@ -95,28 +109,33 @@ static void StringArray_free(Array* self) {
 ///////////////////////////////////////
 
 typedef struct Hash {
-	Array* keys;
-	Array* values;
+	Array *keys;
+	Array *values;
 } Hash; // not really a hash
 
-static Hash* Hash_new(void) {
-	Hash* self = malloc(sizeof(Hash));
+static Hash *Hash_new(void)
+{
+	Hash *self = malloc(sizeof(Hash));
 	self->keys = Array_new();
 	self->values = Array_new();
 	return self;
 }
-static void Hash_free(Hash* self) {
+static void Hash_free(Hash *self)
+{
 	StringArray_free(self->keys);
 	StringArray_free(self->values);
 	free(self);
 }
-static void Hash_set(Hash* self, char* key, char* value) {
+static void Hash_set(Hash *self, char *key, char *value)
+{
 	Array_push(self->keys, strdup(key));
 	Array_push(self->values, strdup(value));
 }
-static char* Hash_get(Hash* self, char* key) {
+static char *Hash_get(Hash *self, char *key)
+{
 	int i = StringArray_indexOf(self->keys, key);
-	if (i==-1) return NULL;
+	if (i == -1)
+		return NULL;
 	return self->values->items[i];
 }
 
@@ -129,17 +148,19 @@ enum EntryType {
 	ENTRY_DIP,
 };
 typedef struct Entry {
-	char* path;
-	char* name;
-	char* unique;
+	char *path;
+	char *name;
+	char *unique;
 	int type;
-	int alpha; // index in parent Directory's alphas Array, which points to the index of an Entry in its entries Array :sweat_smile:
+	int alpha; // index in parent Directory's alphas Array, which points to the index of an Entry in its entries Array
+			   // :sweat_smile:
 } Entry;
 
-static Entry* Entry_new(char* path, int type) {
+static Entry *Entry_new(char *path, int type)
+{
 	char display_name[256];
 	getDisplayName(path, display_name);
-	Entry* self = malloc(sizeof(Entry));
+	Entry *self = malloc(sizeof(Entry));
 	self->path = strdup(path);
 	self->name = strdup(display_name);
 	self->unique = NULL;
@@ -148,37 +169,45 @@ static Entry* Entry_new(char* path, int type) {
 	return self;
 }
 
-static Entry* Entry_newNamed(char* path, int type, char* displayName) {
+static Entry *Entry_newNamed(char *path, int type, char *displayName)
+{
 	Entry *self = Entry_new(path, type);
 	self->name = strdup(displayName);
 	return self;
 }
 
-static void Entry_free(Entry* self) {
+static void Entry_free(Entry *self)
+{
 	free(self->path);
 	free(self->name);
-	if (self->unique) free(self->unique);
+	if (self->unique)
+		free(self->unique);
 	free(self);
 }
 
-static int EntryArray_indexOf(Array* self, char* path) {
-	for (int i=0; i<self->count; i++) {
-		Entry* entry = self->items[i];
-		if (exactMatch(entry->path, path)) return i;
+static int EntryArray_indexOf(Array *self, char *path)
+{
+	for (int i = 0; i < self->count; i++) {
+		Entry *entry = self->items[i];
+		if (exactMatch(entry->path, path))
+			return i;
 	}
 	return -1;
 }
-static int EntryArray_sortEntry(const void* a, const void* b) {
-	Entry* item1 = *(Entry**)a;
-	Entry* item2 = *(Entry**)b;
+static int EntryArray_sortEntry(const void *a, const void *b)
+{
+	Entry *item1 = *(Entry **)a;
+	Entry *item2 = *(Entry **)b;
 	return strcasecmp(item1->name, item2->name);
 }
-static void EntryArray_sort(Array* self) {
-	qsort(self->items, self->count, sizeof(void*), EntryArray_sortEntry);
+static void EntryArray_sort(Array *self)
+{
+	qsort(self->items, self->count, sizeof(void *), EntryArray_sortEntry);
 }
 
-static void EntryArray_free(Array* self) {
-	for (int i=0; i<self->count; i++) {
+static void EntryArray_free(Array *self)
+{
+	for (int i = 0; i < self->count; i++) {
 		Entry_free(self->items[i]);
 	}
 	Array_free(self);
@@ -191,44 +220,50 @@ typedef struct IntArray {
 	int count;
 	int items[INT_ARRAY_MAX];
 } IntArray;
-static IntArray* IntArray_new(void) {
-	IntArray* self = malloc(sizeof(IntArray));
+static IntArray *IntArray_new(void)
+{
+	IntArray *self = malloc(sizeof(IntArray));
 	self->count = 0;
 	memset(self->items, 0, sizeof(int) * INT_ARRAY_MAX);
 	return self;
 }
-static void IntArray_push(IntArray* self, int i) {
+static void IntArray_push(IntArray *self, int i)
+{
 	self->items[self->count++] = i;
 }
-static void IntArray_free(IntArray* self) {
+static void IntArray_free(IntArray *self)
+{
 	free(self);
 }
 
 ///////////////////////////////////////
 
 typedef struct Directory {
-	char* path;
-	char* name;
-	Array* entries;
-	IntArray* alphas;
+	char *path;
+	char *name;
+	Array *entries;
+	IntArray *alphas;
 	// rendering
 	int selected;
 	int start;
 	int end;
 } Directory;
 
-static int getIndexChar(char* str) {
+static int getIndexChar(char *str)
+{
 	char i = 0;
 	char c = tolower(str[0]);
-	if (c>='a' && c<='z') i = (c-'a')+1;
+	if (c >= 'a' && c <= 'z')
+		i = (c - 'a') + 1;
 	return i;
 }
 
-static void getUniqueName(Entry* entry, char* out_name) {
-	char* filename = strrchr(entry->path, '/')+1;
+static void getUniqueName(Entry *entry, char *out_name)
+{
+	char *filename = strrchr(entry->path, '/') + 1;
 	char emu_tag[256];
 	getEmuName(entry->path, emu_tag);
-	
+
 	char *tmp;
 	strcpy(out_name, entry->name);
 	tmp = out_name + strlen(out_name);
@@ -239,147 +274,149 @@ static void getUniqueName(Entry* entry, char* out_name) {
 	strcpy(tmp, ")");
 }
 
-static void Directory_index(Directory* self) {
-    int is_collection = prefixMatch(COLLECTIONS_PATH, self->path);
-    int skip_index = exactMatch(FAUX_RECENT_PATH, self->path) || is_collection; // not alphabetized
-    
-    Hash* map = NULL;
-    char map_path[256];
-    sprintf(map_path, "%s/map.txt", is_collection ? COLLECTIONS_PATH : self->path);
-
-    if (exists(map_path)) {
-        FILE* file = fopen(map_path, "r");
-        if (file) {
-            map = Hash_new();
-            char line[256];
-            while (fgets(line, 256, file) != NULL) {
-                normalizeNewline(line);
-                trimTrailingNewlines(line);
-                if (strlen(line) == 0) continue; // skip empty lines
-
-                char* tmp = strchr(line, '\t');
-                if (tmp) {
-                    tmp[0] = '\0';
-                    char* key = line;
-                    char* value = tmp + 1;
-                    Hash_set(map, key, strdup(value)); // Ensure strdup to store value properly
-                }
-            }
-            fclose(file);
-            
-            int resort = 0;
-            int filter = 0;
-            for (int i = 0; i < self->entries->count; i++) {
-                Entry* entry = self->entries->items[i];
-                char* filename = strrchr(entry->path, '/') + 1;
-                char* alias = Hash_get(map, filename);
-                if (alias) {
-                    free(entry->name);  // Free before overwriting
-                    entry->name = strdup(alias);
-                    resort = 1;
-                    if (!filter && hide(entry->name)) filter = 1;
-                }
-            }
-            
-            if (filter) {
-                Array* entries = Array_new();
-                for (int i = 0; i < self->entries->count; i++) {
-                    Entry* entry = self->entries->items[i];
-                    if (hide(entry->name)) {
-                        Entry_free(entry); // Ensure Entry_free handles all memory cleanup
-                    } else {
-                        Array_push(entries, entry);
-                    }
-                }
-                Array_free(self->entries);
-                self->entries = entries;
-            }
-            if (resort) EntryArray_sort(self->entries);
-        }
-    }
-    
-    Entry* prior = NULL;
-    int alpha = -1;
-    int index = 0;
-    for (int i = 0; i < self->entries->count; i++) {
-        Entry* entry = self->entries->items[i];
-        if (map) {
-            char* filename = strrchr(entry->path, '/') + 1;
-            char* alias = Hash_get(map, filename);
-            if (alias) {
-                free(entry->name);  // Free before overwriting
-                entry->name = strdup(alias);
-            }
-        }
-        
-        if (prior != NULL && exactMatch(prior->name, entry->name)) {
-            free(prior->unique);
-            free(entry->unique);
-            prior->unique = NULL;
-            entry->unique = NULL;
-
-            char* prior_filename = strrchr(prior->path, '/') + 1;
-            char* entry_filename = strrchr(entry->path, '/') + 1;
-            if (exactMatch(prior_filename, entry_filename)) {
-                char prior_unique[256];
-                char entry_unique[256];
-                getUniqueName(prior, prior_unique);
-                getUniqueName(entry, entry_unique);
-
-                prior->unique = strdup(prior_unique);
-                entry->unique = strdup(entry_unique);
-            } else {
-                prior->unique = strdup(prior_filename);
-                entry->unique = strdup(entry_filename);
-            }
-        }
-
-        if (!skip_index) {
-            int a = getIndexChar(entry->name);
-            if (a != alpha) {
-                index = self->alphas->count;
-                IntArray_push(self->alphas, i);
-                alpha = a;
-            }
-            entry->alpha = index;
-        }
-        
-        prior = entry;
-    }
-
-    if (map) Hash_free(map);  // Free the map at the end
-}
-
-static Array* getRoot(void);
-static Array* getRoms(void);
-static Array* getRecents(void);
-static Array* getCollection(char* path);
-static Array* getDiscs(char* path);
-static Array* getEntries(char* path);
-
-static Directory* Directory_new(char* path, int selected) {
+static void Directory_index(Directory *self)
+{
+	int is_collection = prefixMatch(COLLECTIONS_PATH, self->path);
+	int skip_index = exactMatch(FAUX_RECENT_PATH, self->path) || is_collection; // not alphabetized
+
+	Hash *map = NULL;
+	char map_path[256];
+	sprintf(map_path, "%s/map.txt", is_collection ? COLLECTIONS_PATH : self->path);
+
+	if (exists(map_path)) {
+		FILE *file = fopen(map_path, "r");
+		if (file) {
+			map = Hash_new();
+			char line[256];
+			while (fgets(line, 256, file) != NULL) {
+				normalizeNewline(line);
+				trimTrailingNewlines(line);
+				if (strlen(line) == 0)
+					continue; // skip empty lines
+
+				char *tmp = strchr(line, '\t');
+				if (tmp) {
+					tmp[0] = '\0';
+					char *key = line;
+					char *value = tmp + 1;
+					Hash_set(map, key, strdup(value)); // Ensure strdup to store value properly
+				}
+			}
+			fclose(file);
+
+			int resort = 0;
+			int filter = 0;
+			for (int i = 0; i < self->entries->count; i++) {
+				Entry *entry = self->entries->items[i];
+				char *filename = strrchr(entry->path, '/') + 1;
+				char *alias = Hash_get(map, filename);
+				if (alias) {
+					free(entry->name); // Free before overwriting
+					entry->name = strdup(alias);
+					resort = 1;
+					if (!filter && hide(entry->name))
+						filter = 1;
+				}
+			}
+
+			if (filter) {
+				Array *entries = Array_new();
+				for (int i = 0; i < self->entries->count; i++) {
+					Entry *entry = self->entries->items[i];
+					if (hide(entry->name)) {
+						Entry_free(entry); // Ensure Entry_free handles all memory cleanup
+					} else {
+						Array_push(entries, entry);
+					}
+				}
+				Array_free(self->entries);
+				self->entries = entries;
+			}
+			if (resort)
+				EntryArray_sort(self->entries);
+		}
+	}
+
+	Entry *prior = NULL;
+	int alpha = -1;
+	int index = 0;
+	for (int i = 0; i < self->entries->count; i++) {
+		Entry *entry = self->entries->items[i];
+		if (map) {
+			char *filename = strrchr(entry->path, '/') + 1;
+			char *alias = Hash_get(map, filename);
+			if (alias) {
+				free(entry->name); // Free before overwriting
+				entry->name = strdup(alias);
+			}
+		}
+
+		if (prior != NULL && exactMatch(prior->name, entry->name)) {
+			free(prior->unique);
+			free(entry->unique);
+			prior->unique = NULL;
+			entry->unique = NULL;
+
+			char *prior_filename = strrchr(prior->path, '/') + 1;
+			char *entry_filename = strrchr(entry->path, '/') + 1;
+			if (exactMatch(prior_filename, entry_filename)) {
+				char prior_unique[256];
+				char entry_unique[256];
+				getUniqueName(prior, prior_unique);
+				getUniqueName(entry, entry_unique);
+
+				prior->unique = strdup(prior_unique);
+				entry->unique = strdup(entry_unique);
+			} else {
+				prior->unique = strdup(prior_filename);
+				entry->unique = strdup(entry_filename);
+			}
+		}
+
+		if (!skip_index) {
+			int a = getIndexChar(entry->name);
+			if (a != alpha) {
+				index = self->alphas->count;
+				IntArray_push(self->alphas, i);
+				alpha = a;
+			}
+			entry->alpha = index;
+		}
+
+		prior = entry;
+	}
+
+	if (map)
+		Hash_free(map); // Free the map at the end
+}
+
+static Array *getRoot(void);
+static Array *getRoms(void);
+static Array *getRecents(void);
+static Array *getCollection(char *path);
+static Array *getDiscs(char *path);
+static Array *getEntries(char *path);
+
+static Directory *Directory_new(char *path, int selected)
+{
 	char display_name[256];
 	getDisplayName(path, display_name);
-	
-	Directory* self = malloc(sizeof(Directory));
+
+	Directory *self = malloc(sizeof(Directory));
 	self->path = strdup(path);
 	self->name = strdup(display_name);
 	if (exactMatch(path, SDCARD_PATH)) {
 		self->entries = getRoot();
-	}
-	else if (exactMatch(path, FAUX_RECENT_PATH)) {
+	} else if (exactMatch(path, FAUX_RECENT_PATH)) {
 		self->entries = getRecents();
-	}
-	else if (exactMatch(path, ROMS_PATH)) {
+	} else if (exactMatch(path, ROMS_PATH)) {
 		self->entries = getRoms();
-	}
-	else if (!exactMatch(path, COLLECTIONS_PATH) && prefixMatch(COLLECTIONS_PATH, path) && suffixMatch(".txt", path)) {
+	} else if (!exactMatch(path, COLLECTIONS_PATH) && prefixMatch(COLLECTIONS_PATH, path) &&
+			   suffixMatch(".txt", path)) {
 		self->entries = getCollection(path);
-	}
-	else if (suffixMatch(".m3u", path)) {
+	} else if (suffixMatch(".m3u", path)) {
 		self->entries = getDiscs(path);
-	}
-	else {
+	} else {
 		self->entries = getEntries(path);
 	}
 	self->alphas = IntArray_new();
@@ -387,7 +424,8 @@ static Directory* Directory_new(char* path, int selected) {
 	Directory_index(self);
 	return self;
 }
-static void Directory_free(Directory* self) {
+static void Directory_free(Directory *self)
+{
 	free(self->path);
 	free(self->name);
 	EntryArray_free(self->entries);
@@ -395,11 +433,13 @@ static void Directory_free(Directory* self) {
 	free(self);
 }
 
-static void DirectoryArray_pop(Array* self) {
+static void DirectoryArray_pop(Array *self)
+{
 	Directory_free(Array_pop(self));
 }
-static void DirectoryArray_free(Array* self) {
-	for (int i=0; i<self->count; i++) {
+static void DirectoryArray_free(Array *self)
+{
+	for (int i = 0; i < self->count; i++) {
 		Directory_free(self->items[i]);
 	}
 	Array_free(self);
@@ -408,43 +448,49 @@ static void DirectoryArray_free(Array* self) {
 ///////////////////////////////////////
 
 typedef struct Recent {
-	char* path; // NOTE: this is without the SDCARD_PATH prefix!
-	char* alias;
+	char *path; // NOTE: this is without the SDCARD_PATH prefix!
+	char *alias;
 	int available;
 } Recent;
- // yiiikes
-static char* recent_alias = NULL;
+// yiiikes
+static char *recent_alias = NULL;
 
-static int hasEmu(char* emu_name);
-static Recent* Recent_new(char* path, char* alias) {
-	Recent* self = malloc(sizeof(Recent));
+static int hasEmu(char *emu_name);
+static Recent *Recent_new(char *path, char *alias)
+{
+	Recent *self = malloc(sizeof(Recent));
 
 	char sd_path[256]; // only need to get emu name
 	sprintf(sd_path, "%s%s", SDCARD_PATH, path);
 
 	char emu_name[256];
 	getEmuName(sd_path, emu_name);
-	
+
 	self->path = strdup(path);
 	self->alias = alias ? strdup(alias) : NULL;
 	self->available = hasEmu(emu_name);
 	return self;
 }
-static void Recent_free(Recent* self) {
+static void Recent_free(Recent *self)
+{
 	free(self->path);
-	if (self->alias) free(self->alias);
+	if (self->alias)
+		free(self->alias);
 	free(self);
 }
 
-static int RecentArray_indexOf(Array* self, char* str) {
-	for (int i=0; i<self->count; i++) {
-		Recent* item = self->items[i];
-		if (exactMatch(item->path, str)) return i;
+static int RecentArray_indexOf(Array *self, char *str)
+{
+	for (int i = 0; i < self->count; i++) {
+		Recent *item = self->items[i];
+		if (exactMatch(item->path, str))
+			return i;
 	}
 	return -1;
 }
-static void RecentArray_free(Array* self) {
-	for (int i=0; i<self->count; i++) {
+static void RecentArray_free(Array *self)
+{
+	for (int i = 0; i < self->count; i++) {
 		Recent_free(self->items[i]);
 	}
 	Array_free(self);
@@ -452,10 +498,10 @@ static void RecentArray_free(Array* self) {
 
 ///////////////////////////////////////
 
-static Directory* top;
-static Array* stack; // DirectoryArray
-static Array* recents; // RecentArray
-static Array *quick; // EntryArray
+static Directory *top;
+static Array *stack;		// DirectoryArray
+static Array *recents;		// RecentArray
+static Array *quick;		// EntryArray
 static Array *quickActions; // EntryArray
 
 static int quit = 0;
@@ -477,11 +523,12 @@ static int startgame = 0;
 ///////////////////////////////////////
 
 #define MAX_RECENTS 24 // a multiple of all menu rows
-static void saveRecents(void) {
-	FILE* file = fopen(RECENT_PATH, "w");
+static void saveRecents(void)
+{
+	FILE *file = fopen(RECENT_PATH, "w");
 	if (file) {
-		for (int i=0; i<recents->count; i++) {
-			Recent* recent = recents->items[i];
+		for (int i = 0; i < recents->count; i++) {
+			Recent *recent = recents->items[i];
 			fputs(recent->path, file);
 			if (recent->alias) {
 				fputs("\t", file);
@@ -492,108 +539,114 @@ static void saveRecents(void) {
 		fclose(file);
 	}
 }
-static void addRecent(char* path, char* alias) {
+static void addRecent(char *path, char *alias)
+{
 	path += strlen(SDCARD_PATH); // makes paths platform agnostic
 	int id = RecentArray_indexOf(recents, path);
-	if (id==-1) { // add
-		while (recents->count>=MAX_RECENTS) {
+	if (id == -1) { // add
+		while (recents->count >= MAX_RECENTS) {
 			Recent_free(Array_pop(recents));
 		}
 		Array_unshift(recents, Recent_new(path, alias));
-	}
-	else if (id>0) { // bump to top
-		for (int i=id; i>0; i--) {
-			void* tmp = recents->items[i-1];
-			recents->items[i-1] = recents->items[i];
+	} else if (id > 0) { // bump to top
+		for (int i = id; i > 0; i--) {
+			void *tmp = recents->items[i - 1];
+			recents->items[i - 1] = recents->items[i];
 			recents->items[i] = tmp;
 		}
 	}
 	saveRecents();
 }
 
-static Entry* entryFromPakName(char* pak_name)
+static Entry *entryFromPakName(char *pak_name)
 {
 	char pak_path[256];
 	// Check in Tools
 	sprintf(pak_path, "%s/Tools/%s/%s.pak", SDCARD_PATH, PLATFORM, pak_name);
-	if(exists(pak_path))
+	if (exists(pak_path))
 		return Entry_newNamed(pak_path, ENTRY_PAK, pak_name);
 
 	// Check in Emus
 	sprintf(pak_path, "%s/Emus/%s.pak", PAKS_PATH, pak_name);
-	if(exists(pak_path)) 
+	if (exists(pak_path))
 		return Entry_newNamed(pak_path, ENTRY_PAK, pak_name);
 
 	// Check in platform Emus
 	sprintf(pak_path, "%s/Emus/%s/%s.pak", SDCARD_PATH, PLATFORM, pak_name);
-	if(exists(pak_path)) 
+	if (exists(pak_path))
 		return Entry_newNamed(pak_path, ENTRY_PAK, pak_name);
 
 	return NULL;
 }
 
-static int hasEmu(char* emu_name) {
+static int hasEmu(char *emu_name)
+{
 	char pak_path[256];
 	sprintf(pak_path, "%s/Emus/%s.pak/launch.sh", PAKS_PATH, emu_name);
-	if (exists(pak_path)) return 1;
+	if (exists(pak_path))
+		return 1;
 
 	sprintf(pak_path, "%s/Emus/%s/%s.pak/launch.sh", SDCARD_PATH, PLATFORM, emu_name);
 	return exists(pak_path);
 }
-static int hasCue(char* dir_path, char* cue_path) { // NOTE: dir_path not rom_path
-	char* tmp = strrchr(dir_path, '/') + 1; // folder name
+static int hasCue(char *dir_path, char *cue_path)
+{											// NOTE: dir_path not rom_path
+	char *tmp = strrchr(dir_path, '/') + 1; // folder name
 	sprintf(cue_path, "%s/%s.cue", dir_path, tmp);
 	return exists(cue_path);
 }
-static int hasM3u(char* rom_path, char* m3u_path) { // NOTE: rom_path not dir_path
-	char* tmp;
-	
+static int hasM3u(char *rom_path, char *m3u_path)
+{ // NOTE: rom_path not dir_path
+	char *tmp;
+
 	strcpy(m3u_path, rom_path);
 	tmp = strrchr(m3u_path, '/') + 1;
 	tmp[0] = '\0';
-	
+
 	// path to parent directory
 	char base_path[256];
 	strcpy(base_path, m3u_path);
-	
+
 	tmp = strrchr(m3u_path, '/');
 	tmp[0] = '\0';
-	
+
 	// get parent directory name
 	char dir_name[256];
 	tmp = strrchr(m3u_path, '/');
 	strcpy(dir_name, tmp);
-	
+
 	// dir_name is also our m3u file name
-	tmp = m3u_path + strlen(m3u_path); 
+	tmp = m3u_path + strlen(m3u_path);
 	strcpy(tmp, dir_name);
 
 	// add extension
 	tmp = m3u_path + strlen(m3u_path);
 	strcpy(tmp, ".m3u");
-	
+
 	return exists(m3u_path);
 }
 
-static int hasRecents(void) {
+static int hasRecents(void)
+{
 	LOG_info("hasRecents %s\n", RECENT_PATH);
 	int has = 0;
 	RecentArray_free(recents);
 	recents = Array_new();
 
-	Array* parent_paths = Array_new();
+	Array *parent_paths = Array_new();
 	if (exists(CHANGE_DISC_PATH)) {
 		char sd_path[256];
 		getFile(CHANGE_DISC_PATH, sd_path, 256);
 		if (exists(sd_path)) {
-			char* disc_path = sd_path + strlen(SDCARD_PATH); // makes path platform agnostic
-			Recent* recent = Recent_new(disc_path, NULL);
-			if (recent->available) has += 1;
+			char *disc_path = sd_path + strlen(SDCARD_PATH); // makes path platform agnostic
+			Recent *recent = Recent_new(disc_path, NULL);
+			if (recent->available)
+				has += 1;
 			Array_push(recents, recent);
-		
+
 			char parent_path[256];
 			strcpy(parent_path, disc_path);
-			char* tmp = strrchr(parent_path, '/') + 1;
+			char *tmp = strrchr(parent_path, '/') + 1;
 			tmp[0] = '\0';
 			Array_push(parent_paths, strdup(parent_path));
 		}
@@ -603,93 +656,102 @@ static int hasRecents(void) {
 	FILE *file = fopen(RECENT_PATH, "r"); // newest at top
 	if (file) {
 		char line[256];
-		while (fgets(line,256,file)!=NULL) {
+		while (fgets(line, 256, file) != NULL) {
 			normalizeNewline(line);
 			trimTrailingNewlines(line);
-			if (strlen(line)==0) continue; // skip empty lines
-			
+			if (strlen(line) == 0)
+				continue; // skip empty lines
+
 			// LOG_info("line: %s\n", line);
-			
-			char* path = line;
-			char* alias = NULL;
-			char* tmp = strchr(line,'\t');
+
+			char *path = line;
+			char *alias = NULL;
+			char *tmp = strchr(line, '\t');
 			if (tmp) {
 				tmp[0] = '\0';
-				alias = tmp+1;
+				alias = tmp + 1;
 			}
-			
+
 			char sd_path[256];
 			sprintf(sd_path, "%s%s", SDCARD_PATH, path);
 			if (exists(sd_path)) {
-				if (recents->count<MAX_RECENTS) {
+				if (recents->count < MAX_RECENTS) {
 					// this logic replaces an existing disc from a multi-disc game with the last used
 					char m3u_path[256];
 					if (hasM3u(sd_path, m3u_path)) { // TODO: this might tank launch speed
 						char parent_path[256];
 						strcpy(parent_path, path);
-						char* tmp = strrchr(parent_path, '/') + 1;
+						char *tmp = strrchr(parent_path, '/') + 1;
 						tmp[0] = '\0';
-						
+
 						int found = 0;
-						for (int i=0; i<parent_paths->count; i++) {
-							char* path = parent_paths->items[i];
+						for (int i = 0; i < parent_paths->count; i++) {
+							char *path = parent_paths->items[i];
 							if (prefixMatch(path, parent_path)) {
 								found = 1;
 								break;
 							}
 						}
-						if (found) continue;
-						
+						if (found)
+							continue;
+
 						Array_push(parent_paths, strdup(parent_path));
 					}
-					
+
 					// LOG_info("path:%s alias:%s\n", path, alias);
-					
-					Recent* recent = Recent_new(path, alias);
-					if (recent->available) has += 1;
+
+					Recent *recent = Recent_new(path, alias);
+					if (recent->available)
+						has += 1;
 					Array_push(recents, recent);
 				}
 			}
 		}
 		fclose(file);
 	}
-	
+
 	saveRecents();
-	
+
 	StringArray_free(parent_paths);
-	return has>0;
+	return has > 0;
 }
-static int hasCollections(void) {
+static int hasCollections(void)
+{
 	int has = 0;
-	if (!exists(COLLECTIONS_PATH)) return has;
-	
+	if (!exists(COLLECTIONS_PATH))
+		return has;
+
 	DIR *dh = opendir(COLLECTIONS_PATH);
 	struct dirent *dp;
-	while((dp = readdir(dh)) != NULL) {
-		if (hide(dp->d_name)) continue;
+	while ((dp = readdir(dh)) != NULL) {
+		if (hide(dp->d_name))
+			continue;
 		has = 1;
 		break;
 	}
 	closedir(dh);
 	return has;
 }
-static int hasRoms(char* dir_name) {
+static int hasRoms(char *dir_name)
+{
 	int has = 0;
 	char emu_name[256];
 	char rom_path[256];
 
 	getEmuName(dir_name, emu_name);
-	
+
 	// check for emu pak
-	if (!hasEmu(emu_name)) return has;
-	
+	if (!hasEmu(emu_name))
+		return has;
+
 	// check for at least one non-hidden file (we're going to assume it's a rom)
 	sprintf(rom_path, "%s/%s/", ROMS_PATH, dir_name);
 	DIR *dh = opendir(rom_path);
-	if (dh!=NULL) {
+	if (dh != NULL) {
 		struct dirent *dp;
-		while((dp = readdir(dh)) != NULL) {
-			if (hide(dp->d_name)) continue;
+		while ((dp = readdir(dh)) != NULL) {
+			if (hide(dp->d_name))
+				continue;
 			has = 1;
 			break;
 		}
@@ -699,101 +761,106 @@ static int hasRoms(char* dir_name) {
 	return has;
 }
 
-static int hasTools(void) {
+static int hasTools(void)
+{
 	char tools_path[256];
-    snprintf(tools_path, sizeof(tools_path), "%s/Tools/%s", SDCARD_PATH, PLATFORM);
+	snprintf(tools_path, sizeof(tools_path), "%s/Tools/%s", SDCARD_PATH, PLATFORM);
 	return exists(tools_path);
 }
 
-static Array* getRoms()
-{
-	Array* entries = Array_new();
-    DIR* dh = opendir(ROMS_PATH);
-    if (dh) {
-        struct dirent* dp;
-        char full_path[256];
-        snprintf(full_path, sizeof(full_path), "%s/", ROMS_PATH);
-        char* tmp = full_path + strlen(full_path);
-
-        Array* emus = Array_new();
-        while ((dp = readdir(dh)) != NULL) {
-            if (hide(dp->d_name)) continue;
-            if (hasRoms(dp->d_name)) {
-                strcpy(tmp, dp->d_name);
-                Array_push(emus, Entry_new(full_path, ENTRY_DIR));
-            }
-        }
-        closedir(dh); // Ensure directory is closed immediately after use
-
-        EntryArray_sort(emus);
-        Entry* prev_entry = NULL;
-        for (int i = 0; i < emus->count; i++) {
-            Entry* entry = emus->items[i];
-            if (prev_entry && exactMatch(prev_entry->name, entry->name)) {
-                Entry_free(entry);
-                continue;
-            }
-            Array_push(entries, entry);
-            prev_entry = entry;
-        }
-        Array_free(emus); // Only frees container, entries now owns the items
-    }
+static Array *getRoms()
+{
+	Array *entries = Array_new();
+	DIR *dh = opendir(ROMS_PATH);
+	if (dh) {
+		struct dirent *dp;
+		char full_path[256];
+		snprintf(full_path, sizeof(full_path), "%s/", ROMS_PATH);
+		char *tmp = full_path + strlen(full_path);
+
+		Array *emus = Array_new();
+		while ((dp = readdir(dh)) != NULL) {
+			if (hide(dp->d_name))
+				continue;
+			if (hasRoms(dp->d_name)) {
+				strcpy(tmp, dp->d_name);
+				Array_push(emus, Entry_new(full_path, ENTRY_DIR));
+			}
+		}
+		closedir(dh); // Ensure directory is closed immediately after use
+
+		EntryArray_sort(emus);
+		Entry *prev_entry = NULL;
+		for (int i = 0; i < emus->count; i++) {
+			Entry *entry = emus->items[i];
+			if (prev_entry && exactMatch(prev_entry->name, entry->name)) {
+				Entry_free(entry);
+				continue;
+			}
+			Array_push(entries, entry);
+			prev_entry = entry;
+		}
+		Array_free(emus); // Only frees container, entries now owns the items
+	}
 
 	// Handle mapping logic
-    char map_path[256];
-    snprintf(map_path, sizeof(map_path), "%s/map.txt", ROMS_PATH);
-    if (entries->count > 0 && exists(map_path)) {
-        FILE* file = fopen(map_path, "r");
-        if (file) {
-            Hash* map = Hash_new();
-            char line[256];
-
-            while (fgets(line, sizeof(line), file)) {
-                normalizeNewline(line);
-                trimTrailingNewlines(line);
-                if (strlen(line) == 0) continue; // Skip empty lines
-
-                char* tmp = strchr(line, '\t');
-                if (tmp) {
-                    *tmp = '\0';
-                    char* key = line;
-                    char* value = tmp + 1;
-                    Hash_set(map, key, strdup(value)); // Ensure strdup
-                }
-            }
-            fclose(file);
-
-            int resort = 0;
-            for (int i = 0; i < entries->count; i++) {
-                Entry* entry = entries->items[i];
-                char* filename = strrchr(entry->path, '/') + 1;
-                char* alias = Hash_get(map, filename);
-                if (alias) {
-                    free(entry->name);  // Free before overwriting
-                    entry->name = strdup(alias);
-                    resort = 1;
-                }
-            }
-            if (resort) EntryArray_sort(entries);
-            Hash_free(map);
-        }
-    }
+	char map_path[256];
+	snprintf(map_path, sizeof(map_path), "%s/map.txt", ROMS_PATH);
+	if (entries->count > 0 && exists(map_path)) {
+		FILE *file = fopen(map_path, "r");
+		if (file) {
+			Hash *map = Hash_new();
+			char line[256];
+
+			while (fgets(line, sizeof(line), file)) {
+				normalizeNewline(line);
+				trimTrailingNewlines(line);
+				if (strlen(line) == 0)
+					continue; // Skip empty lines
+
+				char *tmp = strchr(line, '\t');
+				if (tmp) {
+					*tmp = '\0';
+					char *key = line;
+					char *value = tmp + 1;
+					Hash_set(map, key, strdup(value)); // Ensure strdup
+				}
+			}
+			fclose(file);
+
+			int resort = 0;
+			for (int i = 0; i < entries->count; i++) {
+				Entry *entry = entries->items[i];
+				char *filename = strrchr(entry->path, '/') + 1;
+				char *alias = Hash_get(map, filename);
+				if (alias) {
+					free(entry->name); // Free before overwriting
+					entry->name = strdup(alias);
+					resort = 1;
+				}
+			}
+			if (resort)
+				EntryArray_sort(entries);
+			Hash_free(map);
+		}
+	}
 
 	return entries;
 }
 
-static Array* getCollections(void)
+static Array *getCollections(void)
 {
-	DIR* dh = opendir(COLLECTIONS_PATH);
+	DIR *dh = opendir(COLLECTIONS_PATH);
 	if (dh) {
-		struct dirent* dp;
+		struct dirent *dp;
 		char full_path[256];
 		snprintf(full_path, sizeof(full_path), "%s/", COLLECTIONS_PATH);
-		char* tmp = full_path + strlen(full_path);
+		char *tmp = full_path + strlen(full_path);
 
-		Array* collections = Array_new();
+		Array *collections = Array_new();
 		while ((dp = readdir(dh)) != NULL) {
-			if (hide(dp->d_name)) continue;
+			if (hide(dp->d_name))
+				continue;
 			strcpy(tmp, dp->d_name);
 			Array_push(collections, Entry_new(full_path, ENTRY_DIR)); // Collections are fake directories
 		}
@@ -804,8 +871,9 @@ static Array* getCollections(void)
 	return NULL;
 }
 
-static Array* getQuickEntries(void) {
-	Array* entries = Array_new();
+static Array *getQuickEntries(void)
+{
+	Array *entries = Array_new();
 
 	// We assume Menu_init was already called and populated this
 	if (recents && recents->count)
@@ -818,32 +886,33 @@ static Array* getQuickEntries(void) {
 	Array_push(entries, Entry_newNamed(ROMS_PATH, ENTRY_DIR, "Games"));
 
 	// Add tools if applicable
-    if (hasTools() && !simple_mode) {
+	if (hasTools() && !simple_mode) {
 		char tools_path[256];
 		snprintf(tools_path, sizeof(tools_path), "%s/Tools/%s", SDCARD_PATH, PLATFORM);
-        Array_push(entries, Entry_new(tools_path, ENTRY_DIR));
-    }
+		Array_push(entries, Entry_new(tools_path, ENTRY_DIR));
+	}
 
 	return entries;
 }
 
-static Array* getQuickToggles(void) {
+static Array *getQuickToggles(void)
+{
 	Array *entries = Array_new();
 
 	Entry *settings = entryFromPakName("Settings");
 	if (settings)
 		Array_push(entries, settings);
-	
+
 	Entry *store = entryFromPakName("Pak Store");
 	if (store)
 		Array_push(entries, store);
 
 	// quick actions
-	if(WIFI_supported())
+	if (WIFI_supported())
 		Array_push(entries, Entry_new("Wifi", ENTRY_DIP));
-	if(BT_supported())
+	if (BT_supported())
 		Array_push(entries, Entry_new("Bluetooth", ENTRY_DIP));
-	if(PLAT_supportsDeepSleep() && !simple_mode)
+	if (PLAT_supportsDeepSleep() && !simple_mode)
 		Array_push(entries, Entry_new("Sleep", ENTRY_DIP));
 	Array_push(entries, Entry_new("Reboot", ENTRY_DIP));
 	Array_push(entries, Entry_new("Poweroff", ENTRY_DIP));
@@ -851,46 +920,47 @@ static Array* getQuickToggles(void) {
 	return entries;
 }
 
-static Array* getRoot(void) {
-    Array* root = Array_new();
+static Array *getRoot(void)
+{
+	Array *root = Array_new();
 
-    if (hasRecents() && CFG_getShowRecents()) 
+	if (hasRecents() && CFG_getShowRecents())
 		Array_push(root, Entry_new(FAUX_RECENT_PATH, ENTRY_DIR));
 
 	Array *entries = getRoms();
 
 	// Handle collections
-    if (hasCollections()) {
-        if (entries->count) {
-            Array_push(root, Entry_new(COLLECTIONS_PATH, ENTRY_DIR));
-        } else { // No visible systems, promote collections to root
+	if (hasCollections()) {
+		if (entries->count) {
+			Array_push(root, Entry_new(COLLECTIONS_PATH, ENTRY_DIR));
+		} else { // No visible systems, promote collections to root
 			Array *collections = getCollections();
 			Array_yoink(entries, collections);
-        }
-    }
+		}
+	}
 
-    // Move entries to root
+	// Move entries to root
 	Array_yoink(root, entries);
 
 	// Add tools if applicable
-    if (hasTools() && CFG_getShowTools() && !simple_mode) {
+	if (hasTools() && CFG_getShowTools() && !simple_mode) {
 		char tools_path[256];
 		snprintf(tools_path, sizeof(tools_path), "%s/Tools/%s", SDCARD_PATH, PLATFORM);
-        Array_push(root, Entry_new(tools_path, ENTRY_DIR));
-    }
+		Array_push(root, Entry_new(tools_path, ENTRY_DIR));
+	}
 
-    return root;
+	return root;
 }
 
-static Entry* entryFromRecent(Recent* recent)
+static Entry *entryFromRecent(Recent *recent)
 {
-	if(!recent || !recent->available)
+	if (!recent || !recent->available)
 		return NULL;
-	
+
 	char sd_path[256];
 	sprintf(sd_path, "%s%s", SDCARD_PATH, recent->path);
 	int type = suffixMatch(".pak", sd_path) ? ENTRY_PAK : ENTRY_ROM; // ???
-	Entry* entry = Entry_new(sd_path, type);
+	Entry *entry = Entry_new(sd_path, type);
 	if (recent->alias) {
 		free(entry->name);
 		entry->name = strdup(recent->alias);
@@ -898,37 +968,40 @@ static Entry* entryFromRecent(Recent* recent)
 	return entry;
 }
 
-static Array* getRecents(void) {
-	Array* entries = Array_new();
-	for (int i=0; i<recents->count; i++) {
+static Array *getRecents(void)
+{
+	Array *entries = Array_new();
+	for (int i = 0; i < recents->count; i++) {
 		Recent *recent = recents->items[i];
 		Entry *entry = entryFromRecent(recent);
-		if(entry)
+		if (entry)
 			Array_push(entries, entry);
 	}
 	return entries;
 }
 
-static Array* getCollection(char* path) {
-	Array* entries = Array_new();
-	FILE* file = fopen(path, "r");
+static Array *getCollection(char *path)
+{
+	Array *entries = Array_new();
+	FILE *file = fopen(path, "r");
 	if (file) {
 		char line[256];
-		while (fgets(line,256,file)!=NULL) {
+		while (fgets(line, 256, file) != NULL) {
 			normalizeNewline(line);
 			trimTrailingNewlines(line);
-			if (strlen(line)==0) continue; // skip empty lines
-			
+			if (strlen(line) == 0)
+				continue; // skip empty lines
+
 			char sd_path[256];
 			sprintf(sd_path, "%s%s", SDCARD_PATH, line);
 			if (exists(sd_path)) {
 				int type = suffixMatch(".pak", sd_path) ? ENTRY_PAK : ENTRY_ROM; // ???
 				Array_push(entries, Entry_new(sd_path, type));
-				
+
 				// char emu_name[256];
 				// getEmuName(sd_path, emu_name);
 				// if (hasEmu(emu_name)) {
-					// Array_push(entries, Entry_new(sd_path, ENTRY_ROM));
+				// Array_push(entries, Entry_new(sd_path, ENTRY_ROM));
 				// }
 			}
 		}
@@ -936,33 +1009,34 @@ static Array* getCollection(char* path) {
 	}
 	return entries;
 }
-static Array* getDiscs(char* path){
-	
+static Array *getDiscs(char *path)
+{
 	// TODO: does path have SDCARD_PATH prefix?
-	
-	Array* entries = Array_new();
-	
+
+	Array *entries = Array_new();
+
 	char base_path[256];
 	strcpy(base_path, path);
-	char* tmp = strrchr(base_path, '/') + 1;
+	char *tmp = strrchr(base_path, '/') + 1;
 	tmp[0] = '\0';
-	
+
 	// TODO: limit number of discs supported (to 9?)
-	FILE* file = fopen(path, "r");
+	FILE *file = fopen(path, "r");
 	if (file) {
 		char line[256];
 		int disc = 0;
-		while (fgets(line,256,file)!=NULL) {
+		while (fgets(line, 256, file) != NULL) {
 			normalizeNewline(line);
 			trimTrailingNewlines(line);
-			if (strlen(line)==0) continue; // skip empty lines
-			
+			if (strlen(line) == 0)
+				continue; // skip empty lines
+
 			char disc_path[256];
 			sprintf(disc_path, "%s%s", base_path, line);
-						
+
 			if (exists(disc_path)) {
 				disc += 1;
-				Entry* entry = Entry_new(disc_path, ENTRY_ROM);
+				Entry *entry = Entry_new(disc_path, ENTRY_ROM);
 				free(entry->name);
 				char name[16];
 				sprintf(name, "Disc %i", disc);
@@ -974,25 +1048,28 @@ static Array* getDiscs(char* path){
 	}
 	return entries;
 }
-static int getFirstDisc(char* m3u_path, char* disc_path) { // based on getDiscs() natch
+static int getFirstDisc(char *m3u_path, char *disc_path)
+{ // based on getDiscs() natch
 	int found = 0;
 
 	char base_path[256];
 	strcpy(base_path, m3u_path);
-	char* tmp = strrchr(base_path, '/') + 1;
+	char *tmp = strrchr(base_path, '/') + 1;
 	tmp[0] = '\0';
-	
-	FILE* file = fopen(m3u_path, "r");
+
+	FILE *file = fopen(m3u_path, "r");
 	if (file) {
 		char line[256];
-		while (fgets(line,256,file)!=NULL) {
+		while (fgets(line, 256, file) != NULL) {
 			normalizeNewline(line);
 			trimTrailingNewlines(line);
-			if (strlen(line)==0) continue; // skip empty lines
-			
+			if (strlen(line) == 0)
+				continue; // skip empty lines
+
 			sprintf(disc_path, "%s%s", base_path, line);
-						
-			if (exists(disc_path)) found = 1;
+
+			if (exists(disc_path))
+				found = 1;
 			break;
 		}
 		fclose(file);
@@ -1000,33 +1077,32 @@ static int getFirstDisc(char* m3u_path, char* disc_path) { // based on getDiscs(
 	return found;
 }
 
-static void addEntries(Array* entries, char* path) {
+static void addEntries(Array *entries, char *path)
+{
 	DIR *dh = opendir(path);
-	if (dh!=NULL) {
+	if (dh != NULL) {
 		struct dirent *dp;
-		char* tmp;
+		char *tmp;
 		char full_path[256];
 		sprintf(full_path, "%s/", path);
 		tmp = full_path + strlen(full_path);
-		while((dp = readdir(dh)) != NULL) {
-			if (hide(dp->d_name)) continue;
+		while ((dp = readdir(dh)) != NULL) {
+			if (hide(dp->d_name))
+				continue;
 			strcpy(tmp, dp->d_name);
-			int is_dir = dp->d_type==DT_DIR;
+			int is_dir = dp->d_type == DT_DIR;
 			int type;
 			if (is_dir) {
 				// TODO: this should make sure launch.sh exists
 				if (suffixMatch(".pak", dp->d_name)) {
 					type = ENTRY_PAK;
-				}
-				else {
+				} else {
 					type = ENTRY_DIR;
 				}
-			}
-			else {
+			} else {
 				if (prefixMatch(COLLECTIONS_PATH, full_path)) {
 					type = ENTRY_DIR; // :shrug:
-				}
-				else {
+				} else {
 					type = ENTRY_ROM;
 				}
 			}
@@ -1036,86 +1112,102 @@ static void addEntries(Array* entries, char* path) {
 	}
 }
 
-static int isConsoleDir(char* path) {
-	char* tmp;
+static int isConsoleDir(char *path)
+{
+	char *tmp;
 	char parent_dir[256];
 	strcpy(parent_dir, path);
 	tmp = strrchr(parent_dir, '/');
 	tmp[0] = '\0';
-	
+
 	return exactMatch(parent_dir, ROMS_PATH);
 }
 
-static Array* getEntries(char* path){
-	Array* entries = Array_new();
+static Array *getEntries(char *path)
+{
+	Array *entries = Array_new();
 
 	if (isConsoleDir(path)) { // top-level console folder, might collate
 		char collated_path[256];
 		strcpy(collated_path, path);
-		char* tmp = strrchr(collated_path, '(');
-		// 1 because we want to keep the opening parenthesis to avoid collating "Game Boy Color" and "Game Boy Advance" into "Game Boy"
-		// but conditional so we can continue to support a bare tag name as a folder name
-		if (tmp) tmp[1] = '\0'; 
-		
+		char *tmp = strrchr(collated_path, '(');
+		// 1 because we want to keep the opening parenthesis to avoid collating "Game Boy Color" and "Game Boy Advance"
+		// into "Game Boy" but conditional so we can continue to support a bare tag name as a folder name
+		if (tmp)
+			tmp[1] = '\0';
+
 		DIR *dh = opendir(ROMS_PATH);
-		if (dh!=NULL) {
+		if (dh != NULL) {
 			struct dirent *dp;
 			char full_path[256];
 			sprintf(full_path, "%s/", ROMS_PATH);
 			tmp = full_path + strlen(full_path);
 			// while loop so we can collate paths, see above
-			while((dp = readdir(dh)) != NULL) {
-				if (hide(dp->d_name)) continue;
-				if (dp->d_type!=DT_DIR) continue;
+			while ((dp = readdir(dh)) != NULL) {
+				if (hide(dp->d_name))
+					continue;
+				if (dp->d_type != DT_DIR)
+					continue;
 				strcpy(tmp, dp->d_name);
-			
-				if (!prefixMatch(collated_path, full_path)) continue;
+
+				if (!prefixMatch(collated_path, full_path))
+					continue;
 				addEntries(entries, full_path);
 			}
 			closedir(dh);
 		}
-	}
-	else addEntries(entries, path); // just a subfolder
-	
+	} else
+		addEntries(entries, path); // just a subfolder
+
 	EntryArray_sort(entries);
 	return entries;
 }
 
 ///////////////////////////////////////
 
-static void queueNext(char* cmd) {
+static void queueNext(char *cmd)
+{
 	LOG_info("cmd: %s\n", cmd);
 	putFile("/tmp/next", cmd);
 	quit = 1;
 }
 
 // based on https://stackoverflow.com/a/31775567/145965
-static int replaceString(char *line, const char *search, const char *replace) {
-   char *sp; // start of pattern
-   if ((sp = strstr(line, search)) == NULL) {
-      return 0;
-   }
-   int count = 1;
-   int sLen = strlen(search);
-   int rLen = strlen(replace);
-   if (sLen > rLen) {
-      // move from right to left
-      char *src = sp + sLen;
-      char *dst = sp + rLen;
-      while((*dst = *src) != '\0') { dst++; src++; }
-   } else if (sLen < rLen) {
-      // move from left to right
-      int tLen = strlen(sp) - sLen;
-      char *stop = sp + rLen;
-      char *src = sp + sLen + tLen;
-      char *dst = sp + rLen + tLen;
-      while(dst >= stop) { *dst = *src; dst--; src--; }
-   }
-   memcpy(sp, replace, rLen);
-   count += replaceString(sp + rLen, search, replace);
-   return count;
-}
-static char* escapeSingleQuotes(char* str) {
+static int replaceString(char *line, const char *search, const char *replace)
+{
+	char *sp; // start of pattern
+	if ((sp = strstr(line, search)) == NULL) {
+		return 0;
+	}
+	int count = 1;
+	int sLen = strlen(search);
+	int rLen = strlen(replace);
+	if (sLen > rLen) {
+		// move from right to left
+		char *src = sp + sLen;
+		char *dst = sp + rLen;
+		while ((*dst = *src) != '\0') {
+			dst++;
+			src++;
+		}
+	} else if (sLen < rLen) {
+		// move from left to right
+		int tLen = strlen(sp) - sLen;
+		char *stop = sp + rLen;
+		char *src = sp + sLen + tLen;
+		char *dst = sp + rLen + tLen;
+		while (dst >= stop) {
+			*dst = *src;
+			dst--;
+			src--;
+		}
+	}
+	memcpy(sp, replace, rLen);
+	count += replaceString(sp + rLen, search, replace);
+	return count;
+}
+static char *escapeSingleQuotes(char *str)
+{
 	// why not call replaceString directly?
 	// call points require the modified string be returned
 	// but replaceString is recursive and depends on its
@@ -1126,25 +1218,28 @@ static char* escapeSingleQuotes(char* str) {
 
 ///////////////////////////////////////
 
-static void readyResumePath(char* rom_path, int type) {
-	char* tmp;
+static void readyResumePath(char *rom_path, int type)
+{
+	char *tmp;
 	can_resume = 0;
 	has_preview = 0;
 	char path[256];
 	strcpy(path, rom_path);
-	
-	if (!prefixMatch(ROMS_PATH, path)) return;
-	
+
+	if (!prefixMatch(ROMS_PATH, path))
+		return;
+
 	char auto_path[256];
-	if (type==ENTRY_DIR) {
-		if (!hasCue(path, auto_path)) { // no cue?
+	if (type == ENTRY_DIR) {
+		if (!hasCue(path, auto_path)) {		   // no cue?
 			tmp = strrchr(auto_path, '.') + 1; // extension
-			strcpy(tmp, "m3u"); // replace with m3u
-			if (!exists(auto_path)) return; // no m3u
+			strcpy(tmp, "m3u");				   // replace with m3u
+			if (!exists(auto_path))
+				return; // no m3u
 		}
 		strcpy(path, auto_path); // cue or m3u if one exists
 	}
-	
+
 	if (!suffixMatch(".m3u", path)) {
 		char m3u_path[256];
 		if (hasM3u(path, m3u_path)) {
@@ -1152,15 +1247,16 @@ static void readyResumePath(char* rom_path, int type) {
 			strcpy(path, m3u_path);
 		}
 	}
-	
+
 	char emu_name[256];
 	getEmuName(path, emu_name);
-	
+
 	char rom_file[256];
 	tmp = strrchr(path, '/') + 1;
 	strcpy(rom_file, tmp);
-	
-	sprintf(slot_path, "%s/.minui/%s/%s.txt", SHARED_USERDATA_PATH, emu_name, rom_file); // /.userdata/.minui/<EMU>/<romname>.ext.txt
+
+	sprintf(slot_path, "%s/.minui/%s/%s.txt", SHARED_USERDATA_PATH, emu_name,
+			rom_file); // /.userdata/.minui/<EMU>/<romname>.ext.txt
 	can_resume = exists(slot_path);
 
 	// slot_path contains a single integer representing the last used slot
@@ -1168,47 +1264,53 @@ static void readyResumePath(char* rom_path, int type) {
 		char slot[16];
 		getFile(slot_path, slot, 16);
 		int s = atoi(slot);
-		sprintf(preview_path, "%s/.minui/%s/%s.%0d.bmp", SHARED_USERDATA_PATH, emu_name, rom_file, s); // /.userdata/.minui/<EMU>/<romname>.ext.<n>.bmp
+		sprintf(preview_path, "%s/.minui/%s/%s.%0d.bmp", SHARED_USERDATA_PATH, emu_name, rom_file,
+				s); // /.userdata/.minui/<EMU>/<romname>.ext.<n>.bmp
 		has_preview = exists(preview_path);
 	}
 }
-static void readyResume(Entry* entry) {
+static void readyResume(Entry *entry)
+{
 	readyResumePath(entry->path, entry->type);
 }
 
-static void saveLast(char* path);
+static void saveLast(char *path);
 static void loadLast(void);
 
-static int autoResume(void) {
+static int autoResume(void)
+{
 	// NOTE: bypasses recents
 
-	if (!exists(AUTO_RESUME_PATH)) return 0;
-	
+	if (!exists(AUTO_RESUME_PATH))
+		return 0;
+
 	char path[256];
 	getFile(AUTO_RESUME_PATH, path, 256);
 	unlink(AUTO_RESUME_PATH);
 	sync();
-	
+
 	// make sure rom still exists
 	char sd_path[256];
 	sprintf(sd_path, "%s%s", SDCARD_PATH, path);
-	if (!exists(sd_path)) return 0;
-	
+	if (!exists(sd_path))
+		return 0;
+
 	// make sure emu still exists
 	char emu_name[256];
 	getEmuName(sd_path, emu_name);
-	
+
 	char emu_path[256];
 	getEmuPath(emu_name, emu_path);
-	
-	if (!exists(emu_path)) return 0;
-	
+
+	if (!exists(emu_path))
+		return 0;
+
 	// putFile(LAST_PATH, FAUX_RECENT_PATH); // saveLast() will crash here because top is NULL
 
 	char act[256];
 	sprintf(act, "gametimectl.elf start '%s'", escapeSingleQuotes(sd_path));
 	system(act);
-	
+
 	char cmd[256];
 	// dont escape sd_path again because it was already escaped for gametimectl and function modifies input str aswell
 	sprintf(cmd, "'%s' '%s'", escapeSingleQuotes(emu_path), sd_path);
@@ -1217,30 +1319,32 @@ static int autoResume(void) {
 	return 1;
 }
 
-static void openPak(char* path) {
-	// NOTE: escapeSingleQuotes() modifies the passed string 
+static void openPak(char *path)
+{
+	// NOTE: escapeSingleQuotes() modifies the passed string
 	// so we need to save the path before we call that
 	// if (prefixMatch(ROMS_PATH, path)) {
 	// 	addRecent(path);
 	// }
 	saveLast(path);
-	
+
 	char cmd[256];
 	sprintf(cmd, "'%s/launch.sh'", escapeSingleQuotes(path));
 	queueNext(cmd);
 }
-static void openRom(char* path, char* last) {
+static void openRom(char *path, char *last)
+{
 	LOG_info("openRom(%s,%s)\n", path, last);
-	
+
 	char sd_path[256];
 	strcpy(sd_path, path);
-	
+
 	char m3u_path[256];
 	int has_m3u = hasM3u(sd_path, m3u_path);
-	
+
 	char recent_path[256];
 	strcpy(recent_path, has_m3u ? m3u_path : sd_path);
-	
+
 	if (has_m3u && suffixMatch(".m3u", sd_path)) {
 		getFirstDisc(m3u_path, sd_path);
 	}
@@ -1257,33 +1361,35 @@ static void openRom(char* path, char* last) {
 		if (has_m3u) {
 			char rom_file[256];
 			strcpy(rom_file, strrchr(m3u_path, '/') + 1);
-			
+
 			// get disc for state
 			char disc_path_path[256];
-			sprintf(disc_path_path, "%s/.minui/%s/%s.%s.txt", SHARED_USERDATA_PATH, emu_name, rom_file, slot); // /.userdata/arm-480/.minui/<EMU>/<romname>.ext.0.txt
+			sprintf(disc_path_path, "%s/.minui/%s/%s.%s.txt", SHARED_USERDATA_PATH, emu_name, rom_file,
+					slot); // /.userdata/arm-480/.minui/<EMU>/<romname>.ext.0.txt
 
 			if (exists(disc_path_path)) {
 				// switch to disc path
 				char disc_path[256];
 				getFile(disc_path_path, disc_path, 256);
-				if (disc_path[0]=='/') strcpy(sd_path, disc_path); // absolute
-				else { // relative
+				if (disc_path[0] == '/')
+					strcpy(sd_path, disc_path); // absolute
+				else {							// relative
 					strcpy(sd_path, m3u_path);
-					char* tmp = strrchr(sd_path, '/') + 1;
+					char *tmp = strrchr(sd_path, '/') + 1;
 					strcpy(tmp, disc_path);
 				}
 			}
 		}
-	}
-	else putInt(RESUME_SLOT_PATH,8); // resume hidden default state
-	
+	} else
+		putInt(RESUME_SLOT_PATH, 8); // resume hidden default state
+
 	char emu_path[256];
 	getEmuPath(emu_name, emu_path);
-	
-	// NOTE: escapeSingleQuotes() modifies the passed string 
+
+	// NOTE: escapeSingleQuotes() modifies the passed string
 	// so we need to save the path before we call that
 	addRecent(recent_path, recent_alias); // yiiikes
-	saveLast(last==NULL ? sd_path : last);
+	saveLast(last == NULL ? sd_path : last);
 	char act[256];
 	sprintf(act, "gametimectl.elf start '%s'", escapeSingleQuotes(sd_path));
 	system(act);
@@ -1293,74 +1399,85 @@ static void openRom(char* path, char* last) {
 	queueNext(cmd);
 }
 
-static bool isDirectSubdirectory(const Directory* parent, const char* child_path) {
-    const char* parent_path = parent->path;
+static bool isDirectSubdirectory(const Directory *parent, const char *child_path)
+{
+	const char *parent_path = parent->path;
 
-    size_t parent_len = strlen(parent_path);
-    size_t child_len = strlen(child_path);
+	size_t parent_len = strlen(parent_path);
+	size_t child_len = strlen(child_path);
 
-    // Child must be longer than parent to be a subdirectory
-    if (child_len <= parent_len || strncmp(child_path, parent_path, parent_len) != 0) {
-        return false;
-    }
+	// Child must be longer than parent to be a subdirectory
+	if (child_len <= parent_len || strncmp(child_path, parent_path, parent_len) != 0) {
+		return false;
+	}
 
-    // Next char after parent path must be '/'
-    if (child_path[parent_len] != '/') return false;
+	// Next char after parent path must be '/'
+	if (child_path[parent_len] != '/')
+		return false;
 
-    // Walk through the child path after parent, skipping PLATFORM segments
-    const char* cursor = child_path + parent_len + 1; // skip the slash
+	// Walk through the child path after parent, skipping PLATFORM segments
+	const char *cursor = child_path + parent_len + 1; // skip the slash
 
-    int levels = 0;
-    while (*cursor) {
-        const char* next = strchr(cursor, '/');
-        size_t segment_len = next ? (size_t)(next - cursor) : strlen(cursor);
+	int levels = 0;
+	while (*cursor) {
+		const char *next = strchr(cursor, '/');
+		size_t segment_len = next ? (size_t)(next - cursor) : strlen(cursor);
 
-        if (segment_len == 0) break;
+		if (segment_len == 0)
+			break;
 
-        // Copy segment into a buffer to compare
-        char segment[PATH_MAX];
-        if (segment_len >= PATH_MAX) return false;
-        strncpy(segment, cursor, segment_len);
-        segment[segment_len] = '\0';
+		// Copy segment into a buffer to compare
+		char segment[PATH_MAX];
+		if (segment_len >= PATH_MAX)
+			return false;
+		strncpy(segment, cursor, segment_len);
+		segment[segment_len] = '\0';
 
-        // Count level only if it's not PLATFORM
-        if (strcmp(segment, PLATFORM) != 0 && strcmp(segment, "Roms") != 0) {
-            levels++;
-        }
+		// Count level only if it's not PLATFORM
+		if (strcmp(segment, PLATFORM) != 0 && strcmp(segment, "Roms") != 0) {
+			levels++;
+		}
 
-        if (!next) break;
-        cursor = next + 1;
-    }
+		if (!next)
+			break;
+		cursor = next + 1;
+	}
 
-    return (levels == 1);  // exactly one meaningful level deeper
+	return (levels == 1); // exactly one meaningful level deeper
 }
 
-Array* pathToStack(const char* path) {
-	Array* array = Array_new();
+Array *pathToStack(const char *path)
+{
+	Array *array = Array_new();
 
-	if (!path || strlen(path) == 0) return array;
+	if (!path || strlen(path) == 0)
+		return array;
 
-	if (!prefixMatch(SDCARD_PATH, path)) return array;
+	if (!prefixMatch(SDCARD_PATH, path))
+		return array;
 
 	// Always include root directory
-	Directory* root_dir = Directory_new(SDCARD_PATH, 0);
+	Directory *root_dir = Directory_new(SDCARD_PATH, 0);
 	root_dir->start = 0;
 	root_dir->end = (root_dir->entries->count < MAIN_ROW_COUNT) ? root_dir->entries->count : MAIN_ROW_COUNT;
 	Array_push(array, root_dir);
 
-	if (exactMatch(path, SDCARD_PATH)) return array;
+	if (exactMatch(path, SDCARD_PATH))
+		return array;
 
 	char temp_path[PATH_MAX];
 	strcpy(temp_path, SDCARD_PATH);
 	size_t current_len = strlen(SDCARD_PATH);
 
-	const char* cursor = path + current_len;
-	if (*cursor == '/') cursor++;
+	const char *cursor = path + current_len;
+	if (*cursor == '/')
+		cursor++;
 
 	while (*cursor) {
-		const char* next = strchr(cursor, '/');
+		const char *next = strchr(cursor, '/');
 		size_t segment_len = next ? (size_t)(next - cursor) : strlen(cursor);
-		if (segment_len == 0 || segment_len >= PATH_MAX) break;
+		if (segment_len == 0 || segment_len >= PATH_MAX)
+			break;
 
 		char segment[PATH_MAX];
 		strncpy(segment, cursor, segment_len);
@@ -1368,13 +1485,15 @@ Array* pathToStack(const char* path) {
 
 		// Append '/' if needed
 		if (temp_path[current_len - 1] != '/') {
-			if (current_len + 1 >= PATH_MAX) break;
+			if (current_len + 1 >= PATH_MAX)
+				break;
 			temp_path[current_len++] = '/';
 			temp_path[current_len] = '\0';
 		}
 
 		// Append segment
-		if (current_len + segment_len >= PATH_MAX) break;
+		if (current_len + segment_len >= PATH_MAX)
+			break;
 		strcat(temp_path, segment);
 		current_len += segment_len;
 
@@ -1382,31 +1501,33 @@ Array* pathToStack(const char* path) {
 			// Merge with previous directory
 			if (array->count > 0) {
 				// Remove the previous directory
-				Directory* last = (Directory*)array->items[array->count - 1];
+				Directory *last = (Directory *)array->items[array->count - 1];
 				Array_pop(array);
 				Directory_free(last); // assuming you have a Directory_free
 
 				// Replace with updated one using combined path
-				Directory* merged = Directory_new(temp_path, 0);
+				Directory *merged = Directory_new(temp_path, 0);
 				merged->start = 0;
 				merged->end = (merged->entries->count < MAIN_ROW_COUNT) ? merged->entries->count : MAIN_ROW_COUNT;
 				Array_push(array, merged);
 			}
 		} else {
-			Directory* dir = Directory_new(temp_path, 0);
+			Directory *dir = Directory_new(temp_path, 0);
 			dir->start = 0;
 			dir->end = (dir->entries->count < MAIN_ROW_COUNT) ? dir->entries->count : MAIN_ROW_COUNT;
 			Array_push(array, dir);
 		}
 
-		if (!next) break;
+		if (!next)
+			break;
 		cursor = next + 1;
 	}
 
 	return array;
 }
 
-static void openDirectory(char* path, int auto_launch) {
+static void openDirectory(char *path, int auto_launch)
+{
 	char auto_path[256];
 	if (hasCue(path, auto_path) && auto_launch) {
 		openRom(auto_path, path);
@@ -1415,8 +1536,8 @@ static void openDirectory(char* path, int auto_launch) {
 
 	char m3u_path[256];
 	strcpy(m3u_path, auto_path);
-	char* tmp = strrchr(m3u_path, '.') + 1; // extension
-	strcpy(tmp, "m3u"); // replace with m3u
+	char *tmp = strrchr(m3u_path, '.') + 1; // extension
+	strcpy(tmp, "m3u");						// replace with m3u
 	if (exists(m3u_path) && auto_launch) {
 		auto_path[0] = '\0';
 		if (getFirstDisc(m3u_path, auto_path)) {
@@ -1427,17 +1548,17 @@ static void openDirectory(char* path, int auto_launch) {
 	}
 
 	// If this is the exact same directory for some reason, just return.
-	if(top && strcmp(top->path, path) == 0)
+	if (top && strcmp(top->path, path) == 0)
 		return;
 
 	// If this path is a direct subdirectory of top, push it on top of the stack
 	// If it isnt, we need to recreate the stack to keep navigation consistent
-	if(!top || isDirectSubdirectory(top, path)) {
+	if (!top || isDirectSubdirectory(top, path)) {
 		int selected = 0;
 		int start = 0;
 		int end = 0;
-		if (top && top->entries->count>0) {
-			if (restore_depth==stack->count && top->selected==restore_relative) {
+		if (top && top->entries->count > 0) {
+			if (restore_depth == stack->count && top->selected == restore_relative) {
 				selected = restore_selected;
 				start = restore_start;
 				end = restore_end;
@@ -1446,11 +1567,10 @@ static void openDirectory(char* path, int auto_launch) {
 
 		top = Directory_new(path, selected);
 		top->start = start;
-		top->end = end ? end : ((top->entries->count<MAIN_ROW_COUNT) ? top->entries->count : MAIN_ROW_COUNT);
-	
+		top->end = end ? end : ((top->entries->count < MAIN_ROW_COUNT) ? top->entries->count : MAIN_ROW_COUNT);
+
 		Array_push(stack, top);
-	}
-	else {
+	} else {
 		// construct a fresh stack by walking upwards until SDCARD_ROOT
 		DirectoryArray_free(stack);
 
@@ -1459,71 +1579,68 @@ static void openDirectory(char* path, int auto_launch) {
 	}
 }
 
-static void closeDirectory(void) {
+static void closeDirectory(void)
+{
 	restore_selected = top->selected;
 	restore_start = top->start;
 	restore_end = top->end;
 	DirectoryArray_pop(stack);
 	restore_depth = stack->count;
-	top = stack->items[stack->count-1];
+	top = stack->items[stack->count - 1];
 	restore_relative = top->selected;
 }
 
-static void toggleQuick(Entry* self)
+static void toggleQuick(Entry *self)
 {
-	if(!self)
+	if (!self)
 		return;
 
-	if(!strcmp(self->name, "Wifi")) {
+	if (!strcmp(self->name, "Wifi")) {
 		WIFI_enable(!WIFI_enabled());
-	}
-	else if(!strcmp(self->name, "Bluetooth")) {
+	} else if (!strcmp(self->name, "Bluetooth")) {
 		BT_enable(!BT_enabled());
-	}
-	else if(!strcmp(self->name, "Sleep")) {
+	} else if (!strcmp(self->name, "Sleep")) {
 		PWR_sleep();
-	}
-	else if(!strcmp(self->name, "Reboot")) {
+	} else if (!strcmp(self->name, "Reboot")) {
 		PWR_powerOff(1);
-	}
-	else if(!strcmp(self->name, "Poweroff")) {
+	} else if (!strcmp(self->name, "Poweroff")) {
 		PWR_powerOff(0);
 	}
 }
 
-static void Entry_open(Entry* self) {
-	recent_alias = self->name;  // yiiikes
-	if (self->type==ENTRY_ROM) {
+static void Entry_open(Entry *self)
+{
+	recent_alias = self->name; // yiiikes
+	if (self->type == ENTRY_ROM) {
 		startgame = 1;
 		char *last = NULL;
 		if (prefixMatch(COLLECTIONS_PATH, top->path)) {
-			char* tmp;
+			char *tmp;
 			char filename[256];
-			
+
 			tmp = strrchr(self->path, '/');
-			if (tmp) strcpy(filename, tmp+1);
-			
+			if (tmp)
+				strcpy(filename, tmp + 1);
+
 			char last_path[256];
 			sprintf(last_path, "%s/%s", top->path, filename);
 			last = last_path;
 		}
 		openRom(self->path, last);
-	}
-	else if (self->type==ENTRY_PAK) {
+	} else if (self->type == ENTRY_PAK) {
 		startgame = 1;
 		openPak(self->path);
-	}
-	else if (self->type==ENTRY_DIR) {
+	} else if (self->type == ENTRY_DIR) {
 		openDirectory(self->path, 1);
-	}
-	else if (self->type==ENTRY_DIP) {
+	} else if (self->type == ENTRY_DIP) {
 		toggleQuick(self);
 	}
 }
 
 ///////////////////////////////////////
 
-static void saveLast(char* path) {
+static void saveLast(char *path)
+{
 	// special case for recently played
 	if (exactMatch(top->path, FAUX_RECENT_PATH)) {
 		// NOTE: that we don't have to save the file because
@@ -1533,56 +1650,65 @@ static void saveLast(char* path) {
 	}
 	putFile(LAST_PATH, path);
 }
-static void loadLast(void) { // call after loading root directory
-	if (!exists(LAST_PATH)) return;
+static void loadLast(void)
+{ // call after loading root directory
+	if (!exists(LAST_PATH))
+		return;
 
 	char last_path[256];
 	getFile(LAST_PATH, last_path, 256);
-	
+
 	char full_path[256];
 	strcpy(full_path, last_path);
-	
-	char* tmp;
+
+	char *tmp;
 	char filename[256];
 	tmp = strrchr(last_path, '/');
-	if (tmp) strcpy(filename, tmp);
-	
-	Array* last = Array_new();
+	if (tmp)
+		strcpy(filename, tmp);
+
+	Array *last = Array_new();
 	while (!exactMatch(last_path, SDCARD_PATH)) {
 		Array_push(last, strdup(last_path));
-		
-		char* slash = strrchr(last_path, '/');
-		last_path[(slash-last_path)] = '\0';
+
+		char *slash = strrchr(last_path, '/');
+		last_path[(slash - last_path)] = '\0';
 	}
-	
-	while (last->count>0) {
-		char* path = Array_pop(last);
+
+	while (last->count > 0) {
+		char *path = Array_pop(last);
 		if (!exactMatch(path, ROMS_PATH)) { // romsDir is effectively root as far as restoring state after a game
 			char collated_path[256];
 			collated_path[0] = '\0';
 			if (suffixMatch(")", path) && isConsoleDir(path)) {
 				strcpy(collated_path, path);
 				tmp = strrchr(collated_path, '(');
-				if (tmp) tmp[1] = '\0'; // 1 because we want to keep the opening parenthesis to avoid collating "Game Boy Color" and "Game Boy Advance" into "Game Boy"
+				if (tmp)
+					tmp[1] = '\0'; // 1 because we want to keep the opening parenthesis to avoid collating "Game Boy
+								   // Color" and "Game Boy Advance" into "Game Boy"
 			}
-			
-			for (int i=0; i<top->entries->count; i++) {
-				Entry* entry = top->entries->items[i];
-			
+
+			for (int i = 0; i < top->entries->count; i++) {
+				Entry *entry = top->entries->items[i];
+
 				// NOTE: strlen() is required for collated_path, '\0' wasn't reading as NULL for some reason
-				if (exactMatch(entry->path, path) || (strlen(collated_path) && prefixMatch(collated_path, entry->path)) || (prefixMatch(COLLECTIONS_PATH, full_path) && suffixMatch(filename, entry->path))) {
+				if (exactMatch(entry->path, path) ||
+					(strlen(collated_path) && prefixMatch(collated_path, entry->path)) ||
+					(prefixMatch(COLLECTIONS_PATH, full_path) && suffixMatch(filename, entry->path))) {
 					top->selected = i;
-					if (i>=top->end) {
+					if (i >= top->end) {
 						top->start = i;
 						top->end = top->start + MAIN_ROW_COUNT;
-						if (top->end>top->entries->count) {
+						if (top->end > top->entries->count) {
 							top->end = top->entries->count;
 							top->start = top->end - MAIN_ROW_COUNT;
 						}
 					}
-					if (last->count==0 && !exactMatch(entry->path, FAUX_RECENT_PATH) && !(!exactMatch(entry->path, COLLECTIONS_PATH) && prefixMatch(COLLECTIONS_PATH, entry->path))) break; // don't show contents of auto-launch dirs
-				
-					if (entry->type==ENTRY_DIR) {
+					if (last->count == 0 && !exactMatch(entry->path, FAUX_RECENT_PATH) &&
+						!(!exactMatch(entry->path, COLLECTIONS_PATH) && prefixMatch(COLLECTIONS_PATH, entry->path)))
+						break; // don't show contents of auto-launch dirs
+
+					if (entry->type == ENTRY_DIR) {
 						openDirectory(entry->path, 0);
 						break;
 					}
@@ -1591,7 +1717,7 @@ static void loadLast(void) { // call after loading root directory
 		}
 		free(path); // we took ownership when we popped it
 	}
-	
+
 	StringArray_free(last);
 
 	if (top->selected >= 0 && top->selected < top->entries->count) {
@@ -1602,16 +1728,19 @@ static void loadLast(void) { // call after loading root directory
 
 ///////////////////////////////////////
 
-static void QuickMenu_init(void) {
+static void QuickMenu_init(void)
+{
 	quick = getQuickEntries();
 	quickActions = getQuickToggles();
 }
-static void QuickMenu_quit(void) {
+static void QuickMenu_quit(void)
+{
 	EntryArray_free(quick);
 	EntryArray_free(quickActions);
 }
 
-static void Menu_init(void) {
+static void Menu_init(void)
+{
 	stack = Array_new(); // array of open Directories
 	recents = Array_new();
 
@@ -1620,7 +1749,8 @@ static void Menu_init(void) {
 
 	QuickMenu_init(); // needs Menu_init
 }
-static void Menu_quit(void) {
+static void Menu_quit(void)
+{
 	RecentArray_free(recents);
 	DirectoryArray_free(stack);
 
@@ -1641,12 +1771,12 @@ enum {
 	SLIDE_RIGHT = 2,
 };
 
-typedef void (*BackgroundLoadedCallback)(SDL_Surface* surface);
+typedef void (*BackgroundLoadedCallback)(SDL_Surface *surface);
 
 typedef struct {
-    char imagePath[MAX_PATH];
-    BackgroundLoadedCallback callback;
-    void* userData;
+	char imagePath[MAX_PATH];
+	BackgroundLoadedCallback callback;
+	void *userData;
 } LoadBackgroundTask;
 
 typedef struct finishedTask {
@@ -1656,12 +1786,12 @@ typedef struct finishedTask {
 	int targetY;
 	int targetTextY;
 	int move_y;
-	int move_w; 
+	int move_w;
 	int move_h;
 	int frames;
 	int done;
-	void* userData;
-	  char *entry_name;
+	void *userData;
+	char *entry_name;
 	SDL_Rect dst;
 } finishedTask;
 
@@ -1672,54 +1802,54 @@ typedef struct AnimTask {
 	int startY;
 	int targetY;
 	int targetTextY;
-	int move_w; 
+	int move_w;
 	int move_h;
 	int frames;
 	AnimTaskCallback callback;
-	void* userData;
-	 char *entry_name;
+	void *userData;
+	char *entry_name;
 	SDL_Rect dst;
 } AnimTask;
 
 typedef struct TaskNode {
-    LoadBackgroundTask* task;
-    struct TaskNode* next;
+	LoadBackgroundTask *task;
+	struct TaskNode *next;
 } TaskNode;
 typedef struct AnimTaskNode {
-	AnimTask* task;
-    struct AnimTaskNode* next;
+	AnimTask *task;
+	struct AnimTaskNode *next;
 } AnimTaskNode;
 
-static TaskNode* taskBGQueueHead = NULL;
-static TaskNode* taskBGQueueTail = NULL;
-static TaskNode* taskThumbQueueHead = NULL;
-static TaskNode* taskThumbQueueTail = NULL;
-static AnimTaskNode* animTaskQueueHead = NULL;
-static AnimTaskNode* animTtaskQueueTail = NULL;
-static SDL_mutex* bgqueueMutex = NULL;
-static SDL_mutex* thumbqueueMutex = NULL;
-static SDL_mutex* animqueueMutex = NULL;
-static SDL_cond* bgqueueCond = NULL;
-static SDL_cond* thumbqueueCond = NULL;
-static SDL_cond* animqueueCond = NULL;
-
-static SDL_mutex* bgMutex = NULL;
-static SDL_mutex* thumbMutex = NULL;
-static SDL_mutex* animMutex = NULL;
-static SDL_mutex* frameMutex = NULL;
-static SDL_cond* flipCond = NULL;
-
-static SDL_Surface* folderbgbmp = NULL;
-static SDL_Surface* thumbbmp = NULL;
-static SDL_Surface* screen = NULL; // Must be assigned externally
+static TaskNode *taskBGQueueHead = NULL;
+static TaskNode *taskBGQueueTail = NULL;
+static TaskNode *taskThumbQueueHead = NULL;
+static TaskNode *taskThumbQueueTail = NULL;
+static AnimTaskNode *animTaskQueueHead = NULL;
+static AnimTaskNode *animTtaskQueueTail = NULL;
+static SDL_mutex *bgqueueMutex = NULL;
+static SDL_mutex *thumbqueueMutex = NULL;
+static SDL_mutex *animqueueMutex = NULL;
+static SDL_cond *bgqueueCond = NULL;
+static SDL_cond *thumbqueueCond = NULL;
+static SDL_cond *animqueueCond = NULL;
+
+static SDL_mutex *bgMutex = NULL;
+static SDL_mutex *thumbMutex = NULL;
+static SDL_mutex *animMutex = NULL;
+static SDL_mutex *frameMutex = NULL;
+static SDL_cond *flipCond = NULL;
+
+static SDL_Surface *folderbgbmp = NULL;
+static SDL_Surface *thumbbmp = NULL;
+static SDL_Surface *screen = NULL; // Must be assigned externally
 
 static int had_thumb = 0;
 static int ox;
 static int oy;
 int animationDraw = 1;
 int needDraw = 0;
-int folderbgchanged=0;
-int thumbchanged=0;
+int folderbgchanged = 0;
+int thumbchanged = 0;
 
 // queue a new image load task :D
 #define MAX_QUEUE_SIZE 1
@@ -1728,211 +1858,224 @@ int currentBGQueueSize = 0;
 int currentThumbQueueSize = 0;
 int currentAnimQueueSize = 0;
 
-void enqueueBGTask(LoadBackgroundTask* task) {
+void enqueueBGTask(LoadBackgroundTask *task)
+{
 	SDL_LockMutex(bgqueueMutex);
-    TaskNode* node = (TaskNode*)malloc(sizeof(TaskNode));
-    node->task = task;
-    node->next = NULL;
-
-    // If queue is full, drop the oldest task (head)
-    if (currentBGQueueSize >= MAX_QUEUE_SIZE) {
-        TaskNode* oldNode = taskBGQueueHead;
-        if (oldNode) {
-            taskBGQueueHead = oldNode->next;
-            if (!taskBGQueueHead) {
-                taskBGQueueTail = NULL;
-            }
-            if (oldNode->task) {
-                free(oldNode->task);  // Only if task was malloc'd
-            }
-            free(oldNode);
-            currentBGQueueSize--;
-        }
-    }
-
-    // Enqueue the new task
-    if (taskBGQueueTail) {
-        taskBGQueueTail->next = node;
-        taskBGQueueTail = node;
-    } else {
-        taskBGQueueHead = taskBGQueueTail = node;
-    }
- 
-    currentBGQueueSize++;
-    SDL_CondSignal(bgqueueCond);
-    SDL_UnlockMutex(bgqueueMutex);
-}
-void enqueueThumbTask(LoadBackgroundTask* task) {
+	TaskNode *node = (TaskNode *)malloc(sizeof(TaskNode));
+	node->task = task;
+	node->next = NULL;
+
+	// If queue is full, drop the oldest task (head)
+	if (currentBGQueueSize >= MAX_QUEUE_SIZE) {
+		TaskNode *oldNode = taskBGQueueHead;
+		if (oldNode) {
+			taskBGQueueHead = oldNode->next;
+			if (!taskBGQueueHead) {
+				taskBGQueueTail = NULL;
+			}
+			if (oldNode->task) {
+				free(oldNode->task); // Only if task was malloc'd
+			}
+			free(oldNode);
+			currentBGQueueSize--;
+		}
+	}
+
+	// Enqueue the new task
+	if (taskBGQueueTail) {
+		taskBGQueueTail->next = node;
+		taskBGQueueTail = node;
+	} else {
+		taskBGQueueHead = taskBGQueueTail = node;
+	}
+
+	currentBGQueueSize++;
+	SDL_CondSignal(bgqueueCond);
+	SDL_UnlockMutex(bgqueueMutex);
+}
+void enqueueThumbTask(LoadBackgroundTask *task)
+{
 	SDL_LockMutex(thumbqueueMutex);
-    TaskNode* node = (TaskNode*)malloc(sizeof(TaskNode));
-    node->task = task;
-    node->next = NULL;
-
-    // If queue is full, drop the oldest task (head)
-    if (currentThumbQueueSize >= MAX_QUEUE_SIZE) {
-        TaskNode* oldNode = taskThumbQueueHead;
-        if (oldNode) {
-            taskThumbQueueHead = oldNode->next;
-            if (!taskThumbQueueHead) {
-                taskThumbQueueTail = NULL;
-            }
-            if (oldNode->task) {
-                free(oldNode->task);  // Only if task was malloc'd
-            }
-            free(oldNode);
-            currentThumbQueueSize--;
-        }
-    }
-
-    // Enqueue the new task
-    if (taskThumbQueueTail) {
-        taskThumbQueueTail->next = node;
-        taskThumbQueueTail = node;
-    } else {
-        taskThumbQueueHead = taskThumbQueueTail = node;
-    }
- 
-    currentThumbQueueSize++;
-    SDL_CondSignal(thumbqueueCond);
-    SDL_UnlockMutex(thumbqueueMutex);
+	TaskNode *node = (TaskNode *)malloc(sizeof(TaskNode));
+	node->task = task;
+	node->next = NULL;
+
+	// If queue is full, drop the oldest task (head)
+	if (currentThumbQueueSize >= MAX_QUEUE_SIZE) {
+		TaskNode *oldNode = taskThumbQueueHead;
+		if (oldNode) {
+			taskThumbQueueHead = oldNode->next;
+			if (!taskThumbQueueHead) {
+				taskThumbQueueTail = NULL;
+			}
+			if (oldNode->task) {
+				free(oldNode->task); // Only if task was malloc'd
+			}
+			free(oldNode);
+			currentThumbQueueSize--;
+		}
+	}
+
+	// Enqueue the new task
+	if (taskThumbQueueTail) {
+		taskThumbQueueTail->next = node;
+		taskThumbQueueTail = node;
+	} else {
+		taskThumbQueueHead = taskThumbQueueTail = node;
+	}
+
+	currentThumbQueueSize++;
+	SDL_CondSignal(thumbqueueCond);
+	SDL_UnlockMutex(thumbqueueMutex);
 }
 
 // Worker threadd
-int BGLoadWorker(void* unused) {
-    while (true) {
-        SDL_LockMutex(bgqueueMutex);
-        while (!taskBGQueueHead) {
-        	SDL_CondWait(bgqueueCond, bgqueueMutex);
-        }
-        TaskNode* node = taskBGQueueHead;
-        taskBGQueueHead = node->next;
-        if (!taskBGQueueHead) taskBGQueueTail = NULL;
-        SDL_UnlockMutex(bgqueueMutex);
+int BGLoadWorker(void *unused)
+{
+	while (true) {
+		SDL_LockMutex(bgqueueMutex);
+		while (!taskBGQueueHead) {
+			SDL_CondWait(bgqueueCond, bgqueueMutex);
+		}
+		TaskNode *node = taskBGQueueHead;
+		taskBGQueueHead = node->next;
+		if (!taskBGQueueHead)
+			taskBGQueueTail = NULL;
+		SDL_UnlockMutex(bgqueueMutex);
 		// give processor lil space in between queue items for other shit
-		//SDL_Delay(100);
-        LoadBackgroundTask* task = node->task;
-        free(node);
-
-        SDL_Surface* result = NULL;
-        if (access(task->imagePath, F_OK) == 0) {
-            SDL_Surface* image = IMG_Load(task->imagePath);
-            if (image) {
-                SDL_Surface* imageRGBA = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
-                SDL_FreeSurface(image);
-                result = imageRGBA;
-            }
-        }
-
-        if (task->callback) {
+		// SDL_Delay(100);
+		LoadBackgroundTask *task = node->task;
+		free(node);
+
+		SDL_Surface *result = NULL;
+		if (access(task->imagePath, F_OK) == 0) {
+			SDL_Surface *image = IMG_Load(task->imagePath);
+			if (image) {
+				SDL_Surface *imageRGBA = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
+				SDL_FreeSurface(image);
+				result = imageRGBA;
+			}
+		}
+
+		if (task->callback) {
 			task->callback(result);
 		}
-        free(task);
+		free(task);
 		SDL_LockMutex(bgqueueMutex);
-		if (!taskBGQueueHead) taskBGQueueTail = NULL;
-		currentBGQueueSize--;  // <-- add this
+		if (!taskBGQueueHead)
+			taskBGQueueTail = NULL;
+		currentBGQueueSize--; // <-- add this
 		SDL_UnlockMutex(bgqueueMutex);
-    }
-    return 0;
-}
-int ThumbLoadWorker(void* unused) {
-    while (true) {
-        SDL_LockMutex(thumbqueueMutex);
-        while (!taskThumbQueueHead) {
-        	SDL_CondWait(thumbqueueCond, thumbqueueMutex);
-        }
-        TaskNode* node = taskThumbQueueHead;
-        taskThumbQueueHead = node->next;
-        if (!taskThumbQueueHead) taskThumbQueueTail = NULL;
-        SDL_UnlockMutex(thumbqueueMutex);
+	}
+	return 0;
+}
+int ThumbLoadWorker(void *unused)
+{
+	while (true) {
+		SDL_LockMutex(thumbqueueMutex);
+		while (!taskThumbQueueHead) {
+			SDL_CondWait(thumbqueueCond, thumbqueueMutex);
+		}
+		TaskNode *node = taskThumbQueueHead;
+		taskThumbQueueHead = node->next;
+		if (!taskThumbQueueHead)
+			taskThumbQueueTail = NULL;
+		SDL_UnlockMutex(thumbqueueMutex);
 		// give processor lil space in between queue items for other shit
-		//SDL_Delay(100);
-        LoadBackgroundTask* task = node->task;
-        free(node);
-
-        SDL_Surface* result = NULL;
-        if (access(task->imagePath, F_OK) == 0) {
-            SDL_Surface* image = IMG_Load(task->imagePath);
-            if (image) {
-                SDL_Surface* imageRGBA = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
-                SDL_FreeSurface(image);
-                result = imageRGBA;
-            }
-        }
-
-        if (task->callback) {
+		// SDL_Delay(100);
+		LoadBackgroundTask *task = node->task;
+		free(node);
+
+		SDL_Surface *result = NULL;
+		if (access(task->imagePath, F_OK) == 0) {
+			SDL_Surface *image = IMG_Load(task->imagePath);
+			if (image) {
+				SDL_Surface *imageRGBA = SDL_ConvertSurfaceFormat(image, SDL_PIXELFORMAT_RGBA8888, 0);
+				SDL_FreeSurface(image);
+				result = imageRGBA;
+			}
+		}
+
+		if (task->callback) {
 			task->callback(result);
 		}
-        free(task);
+		free(task);
 		SDL_LockMutex(thumbqueueMutex);
-		if (!taskThumbQueueHead) taskThumbQueueTail = NULL;
-		currentThumbQueueSize--;  // <-- add this
+		if (!taskThumbQueueHead)
+			taskThumbQueueTail = NULL;
+		currentThumbQueueSize--; // <-- add this
 		SDL_UnlockMutex(thumbqueueMutex);
-    }
-    return 0;
+	}
+	return 0;
 }
 
-void startLoadFolderBackground(const char* imagePath, BackgroundLoadedCallback callback, void* userData) {
-    LoadBackgroundTask* task = malloc(sizeof(LoadBackgroundTask));
-    if (!task) return;
+void startLoadFolderBackground(const char *imagePath, BackgroundLoadedCallback callback, void *userData)
+{
+	LoadBackgroundTask *task = malloc(sizeof(LoadBackgroundTask));
+	if (!task)
+		return;
 
- 	snprintf(task->imagePath, sizeof(task->imagePath), "%s", imagePath);
-    task->callback = callback;
-    task->userData = userData;
-    enqueueBGTask(task);
+	snprintf(task->imagePath, sizeof(task->imagePath), "%s", imagePath);
+	task->callback = callback;
+	task->userData = userData;
+	enqueueBGTask(task);
 }
 
-void onBackgroundLoaded(SDL_Surface* surface) {
+void onBackgroundLoaded(SDL_Surface *surface)
+{
 	SDL_LockMutex(bgMutex);
 	folderbgchanged = 1;
-	if (folderbgbmp) SDL_FreeSurface(folderbgbmp);
-    if (!surface) {
+	if (folderbgbmp)
+		SDL_FreeSurface(folderbgbmp);
+	if (!surface) {
 		folderbgbmp = NULL;
 		SDL_UnlockMutex(bgMutex);
 		return;
 	}
-    folderbgbmp = surface;
+	folderbgbmp = surface;
 	needDraw = 1;
 	SDL_UnlockMutex(bgMutex);
 }
 
-void startLoadThumb(const char* thumbpath, BackgroundLoadedCallback callback, void* userData) {
-    LoadBackgroundTask* task = malloc(sizeof(LoadBackgroundTask));
-    if (!task) return;
+void startLoadThumb(const char *thumbpath, BackgroundLoadedCallback callback, void *userData)
+{
+	LoadBackgroundTask *task = malloc(sizeof(LoadBackgroundTask));
+	if (!task)
+		return;
 
-    snprintf(task->imagePath, sizeof(task->imagePath), "%s", thumbpath);
-    task->callback = callback;
-    task->userData = userData;
-    enqueueThumbTask(task);
+	snprintf(task->imagePath, sizeof(task->imagePath), "%s", thumbpath);
+	task->callback = callback;
+	task->userData = userData;
+	enqueueThumbTask(task);
 }
-void onThumbLoaded(SDL_Surface* surface) {
+void onThumbLoaded(SDL_Surface *surface)
+{
 	SDL_LockMutex(thumbMutex);
 	thumbchanged = 1;
-	if (thumbbmp) SDL_FreeSurface(thumbbmp);
-    if (!surface) {
+	if (thumbbmp)
+		SDL_FreeSurface(thumbbmp);
+	if (!surface) {
 		thumbbmp = NULL;
 		SDL_UnlockMutex(thumbMutex);
 		return;
 	}
-  
-		
-    thumbbmp = surface;
+
+
+	thumbbmp = surface;
 	int img_w = thumbbmp->w;
 	int img_h = thumbbmp->h;
 	double aspect_ratio = (double)img_h / img_w;
-	int max_w = (int)(screen->w * CFG_getGameArtWidth()); 
-	int max_h = (int)(screen->h * 0.6);  
+	int max_w = (int)(screen->w * CFG_getGameArtWidth());
+	int max_h = (int)(screen->h * 0.6);
 	int new_w = max_w;
-	int new_h = (int)(new_w * aspect_ratio); 
-	
+	int new_h = (int)(new_w * aspect_ratio);
+
 	if (new_h > max_h) {
 		new_h = max_h;
 		new_w = (int)(new_h / aspect_ratio);
 	}
-	GFX_ApplyRoundedCorners_RGBA8888(
-		thumbbmp,
-		&(SDL_Rect){0, 0, thumbbmp->w, thumbbmp->h},
-		SCALE1((float)CFG_getThumbnailRadius() * ((float)img_w / (float)new_w))
-	);
+	GFX_ApplyRoundedCorners_RGBA8888(thumbbmp, &(SDL_Rect){0, 0, thumbbmp->w, thumbbmp->h},
+									 SCALE1((float)CFG_getThumbnailRadius() * ((float)img_w / (float)new_w)));
 	needDraw = 1;
 	SDL_UnlockMutex(thumbMutex);
 }
@@ -1940,14 +2083,15 @@ void onThumbLoaded(SDL_Surface* surface) {
 SDL_Rect pillRect;
 SDL_Surface *globalpill;
 SDL_Surface *globalText;
-int pilltargetY =0;
-int pilltargetTextY =0;
-void animcallback(finishedTask *task) {
+int pilltargetY = 0;
+int pilltargetTextY = 0;
+void animcallback(finishedTask *task)
+{
 	SDL_LockMutex(animMutex);
-	pillRect = task->dst; 
-	if(pillRect.w > 0 && pillRect.h > 0) {
+	pillRect = task->dst;
+	if (pillRect.w > 0 && pillRect.h > 0) {
 		pilltargetY = +screen->w; // move offscreen
-		if(task->done) {
+		if (task->done) {
 			pilltargetY = task->targetY;
 			pilltargetTextY = task->targetTextY;
 			SDL_Color text_color = uintToColour(THEME_COLOR5_255);
@@ -1956,15 +2100,14 @@ void animcallback(finishedTask *task) {
 			SDL_Surface *converted = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_RGBA8888, 0);
 			SDL_FreeSurface(tmp); // tmp no longer needed
 
-			SDL_Rect crop_rect = { 0, 0, task->move_w - SCALE1(BUTTON_PADDING * 2), converted->h };
-			SDL_Surface *cropped = SDL_CreateRGBSurfaceWithFormat(
-				0, crop_rect.w, crop_rect.h, 32, SDL_PIXELFORMAT_RGBA8888
-			);
+			SDL_Rect crop_rect = {0, 0, task->move_w - SCALE1(BUTTON_PADDING * 2), converted->h};
+			SDL_Surface *cropped =
+				SDL_CreateRGBSurfaceWithFormat(0, crop_rect.w, crop_rect.h, 32, SDL_PIXELFORMAT_RGBA8888);
 			if (!cropped) {
 				SDL_FreeSurface(converted);
 			}
 
-			SDL_SetSurfaceBlendMode(converted, SDL_BLENDMODE_NONE); 
+			SDL_SetSurfaceBlendMode(converted, SDL_BLENDMODE_NONE);
 			SDL_BlitSurface(converted, &crop_rect, cropped, NULL);
 			SDL_FreeSurface(converted);
 
@@ -1978,37 +2121,41 @@ void animcallback(finishedTask *task) {
 bool frameReady = true;
 bool pillanimdone = false;
 
-int animWorker(void* unused) {
-	  while (true) {
- 		SDL_LockMutex(animqueueMutex);
-        while (!animTaskQueueHead) {
-            SDL_CondWait(animqueueCond, animqueueMutex);
-        }
-        AnimTaskNode* node = animTaskQueueHead;
-        animTaskQueueHead = node->next;
-        if (!animTaskQueueHead) animTtaskQueueTail = NULL;
+int animWorker(void *unused)
+{
+	while (true) {
+		SDL_LockMutex(animqueueMutex);
+		while (!animTaskQueueHead) {
+			SDL_CondWait(animqueueCond, animqueueMutex);
+		}
+		AnimTaskNode *node = animTaskQueueHead;
+		animTaskQueueHead = node->next;
+		if (!animTaskQueueHead)
+			animTtaskQueueTail = NULL;
 		SDL_UnlockMutex(animqueueMutex);
 
-        AnimTask* task = node->task;
-		finishedTask* finaltask = (finishedTask*)malloc(sizeof(finishedTask));
+		AnimTask *task = node->task;
+		finishedTask *finaltask = (finishedTask *)malloc(sizeof(finishedTask));
 		int total_frames = task->frames;
-		// This somehow leads to the pill not rendering correctly when wrapping the list (last element to first, or reverse).
-		// TODO: Figure out why this is here. Ideally we shouldnt refer to specific platforms in here, but the commit message doesnt
-		// help all that much and comparing magic numbers also isnt that descriptive on its own.
-		if(strcmp("Desktop", PLAT_getModel()) != 0) {
-			if(task->targetY > task->startY + SCALE1(PILL_SIZE) || task->targetY < task->startY - SCALE1(PILL_SIZE)) {
+		// This somehow leads to the pill not rendering correctly when wrapping the list (last element to first, or
+		// reverse).
+		// TODO: Figure out why this is here. Ideally we shouldnt refer to specific platforms in here, but the commit
+		// message doesnt help all that much and comparing magic numbers also isnt that descriptive on its own.
+		if (strcmp("Desktop", PLAT_getModel()) != 0) {
+			if (task->targetY > task->startY + SCALE1(PILL_SIZE) || task->targetY < task->startY - SCALE1(PILL_SIZE)) {
 				total_frames = 0;
 			}
 		}
-			
+
 		for (int frame = 0; frame <= total_frames; frame++) {
 			float t = (float)frame / total_frames;
-			if (t > 1.0f) t = 1.0f;
+			if (t > 1.0f)
+				t = 1.0f;
 
 			int current_x = task->startX + (int)((task->targetX - task->startX) * t);
-			int current_y = task->startY + (int)(( task->targetY -  task->startY) * t);
-			
-			SDL_Rect moveDst = { current_x, current_y, task->move_w, task->move_h };
+			int current_y = task->startY + (int)((task->targetY - task->startY) * t);
+
+			SDL_Rect moveDst = {current_x, current_y, task->move_w, task->move_h};
 			finaltask->dst = moveDst;
 			finaltask->entry_name = task->entry_name;
 			finaltask->move_w = task->move_w;
@@ -2017,7 +2164,8 @@ int animWorker(void* unused) {
 			finaltask->targetTextY = task->targetTextY;
 			finaltask->move_y = SCALE1(PADDING + task->targetY) + (task->targetTextY - task->targetY);
 			finaltask->done = 0;
-			if(frame >= total_frames) finaltask->done=1;
+			if (frame >= total_frames)
+				finaltask->done = 1;
 			task->callback(finaltask);
 			SDL_LockMutex(frameMutex);
 			while (!frameReady) {
@@ -2025,13 +2173,13 @@ int animWorker(void* unused) {
 			}
 			frameReady = false;
 			SDL_UnlockMutex(frameMutex);
-			
 		}
 		SDL_LockMutex(animqueueMutex);
-		if (!animTaskQueueHead) animTtaskQueueTail = NULL;
-		currentAnimQueueSize--;  // <-- add this
+		if (!animTaskQueueHead)
+			animTtaskQueueTail = NULL;
+		currentAnimQueueSize--; // <-- add this
 		SDL_UnlockMutex(animqueueMutex);
-	
+
 		SDL_LockMutex(animMutex);
 		pillanimdone = true;
 		free(finaltask);
@@ -2039,52 +2187,55 @@ int animWorker(void* unused) {
 	}
 }
 
-void enqueueanmimtask(AnimTask* task) {
-    AnimTaskNode* node = (AnimTaskNode*)malloc(sizeof(AnimTaskNode));
-    node->task = task;
-    node->next = NULL;
-	
-    SDL_LockMutex(animqueueMutex);
+void enqueueanmimtask(AnimTask *task)
+{
+	AnimTaskNode *node = (AnimTaskNode *)malloc(sizeof(AnimTaskNode));
+	node->task = task;
+	node->next = NULL;
+
+	SDL_LockMutex(animqueueMutex);
 	pillanimdone = false;
-    // If queue is full, drop the oldest task (head)
-    if (currentAnimQueueSize >= 1) {
-        AnimTaskNode* oldNode = animTaskQueueHead;
-        if (oldNode) {
-            animTaskQueueHead = oldNode->next;
-            if (!animTaskQueueHead) {
-                animTtaskQueueTail = NULL;
-            }
-            if (oldNode->task) {
-                free(oldNode->task);  // Only if task was malloc'd
-            }
-            free(oldNode);
-            currentAnimQueueSize--;
-        }
-    }
-
-    // Enqueue the new task
-    if (animTtaskQueueTail) {
-        animTtaskQueueTail->next = node;
-        animTtaskQueueTail = node;
-    } else {
-        animTaskQueueHead = animTtaskQueueTail = node;
-    }
-
-    currentAnimQueueSize++;
-    SDL_CondSignal(animqueueCond);
-    SDL_UnlockMutex(animqueueMutex);
-}
-
-void animPill(AnimTask *task) {
+	// If queue is full, drop the oldest task (head)
+	if (currentAnimQueueSize >= 1) {
+		AnimTaskNode *oldNode = animTaskQueueHead;
+		if (oldNode) {
+			animTaskQueueHead = oldNode->next;
+			if (!animTaskQueueHead) {
+				animTtaskQueueTail = NULL;
+			}
+			if (oldNode->task) {
+				free(oldNode->task); // Only if task was malloc'd
+			}
+			free(oldNode);
+			currentAnimQueueSize--;
+		}
+	}
+
+	// Enqueue the new task
+	if (animTtaskQueueTail) {
+		animTtaskQueueTail->next = node;
+		animTtaskQueueTail = node;
+	} else {
+		animTaskQueueHead = animTtaskQueueTail = node;
+	}
+
+	currentAnimQueueSize++;
+	SDL_CondSignal(animqueueCond);
+	SDL_UnlockMutex(animqueueMutex);
+}
+
+void animPill(AnimTask *task)
+{
 	task->callback = animcallback;
 	enqueueanmimtask(task);
 }
 
-void initImageLoaderPool() {
-    thumbqueueMutex = SDL_CreateMutex();
-    bgqueueMutex = SDL_CreateMutex();
-    bgqueueCond = SDL_CreateCond();
-    thumbqueueCond = SDL_CreateCond();
+void initImageLoaderPool()
+{
+	thumbqueueMutex = SDL_CreateMutex();
+	bgqueueMutex = SDL_CreateMutex();
+	bgqueueCond = SDL_CreateCond();
+	thumbqueueCond = SDL_CreateCond();
 	bgMutex = SDL_CreateMutex();
 	thumbMutex = SDL_CreateMutex();
 	animMutex = SDL_CreateMutex();
@@ -2093,35 +2244,38 @@ void initImageLoaderPool() {
 	frameMutex = SDL_CreateMutex();
 	flipCond = SDL_CreateCond();
 
-    SDL_CreateThread(BGLoadWorker, "BGLoadWorker", NULL);
-    SDL_CreateThread(ThumbLoadWorker, "ThumbLoadWorker", NULL);
+	SDL_CreateThread(BGLoadWorker, "BGLoadWorker", NULL);
+	SDL_CreateThread(ThumbLoadWorker, "ThumbLoadWorker", NULL);
 	SDL_CreateThread(animWorker, "animWorker", NULL);
 }
 ///////////////////////////////////////
 
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 	// LOG_info("time from launch to:\n");
 	// unsigned long main_begin = SDL_GetTicks();
 	// unsigned long first_draw = 0;
-	
-	if (autoResume()) return 0; // nothing to do
-	
+
+	if (autoResume())
+		return 0; // nothing to do
+
 	simple_mode = exists(SIMPLE_MODE_PATH);
 
 	LOG_info("NextUI\n");
 	InitSettings();
-	
+
 	screen = GFX_init(MODE_MAIN);
 	// LOG_info("- graphics init: %lu\n", SDL_GetTicks() - main_begin);
-	
+
 	PAD_init();
 	// LOG_info("- input init: %lu\n", SDL_GetTicks() - main_begin);
 	VIB_init();
 	WIFI_init();
 	PWR_init();
-	if (!HAS_POWER_BUTTON && !simple_mode) PWR_disableSleep();
+	if (!HAS_POWER_BUTTON && !simple_mode)
+		PWR_disableSleep();
 	// LOG_info("- power init: %lu\n", SDL_GetTicks() - main_begin);
-	
+
 	// start my threaded image loader :D
 	initImageLoaderPool();
 	Menu_init();
@@ -2135,19 +2289,19 @@ int main (int argc, char *argv[]) {
 	int lastScreen = SCREEN_OFF;
 	int currentScreen = CFG_getDefaultView();
 
-	if(exists(GAME_SWITCHER_PERSIST_PATH)) {
+	if (exists(GAME_SWITCHER_PERSIST_PATH)) {
 		// consider this "consumed", dont bring up the switcher next time we regularly exit a game
 		unlink(GAME_SWITCHER_PERSIST_PATH);
 		currentScreen = SCREEN_GAMESWITCHER;
 	}
 
 	// add a nice fade into the game switcher
-	if(currentScreen == SCREEN_GAMESWITCHER)
+	if (currentScreen == SCREEN_GAMESWITCHER)
 		lastScreen = SCREEN_GAME;
 
 	// make sure we have no running games logged as active anymore (we might be launching back into the UI here)
 	system("gametimectl.elf stop_all");
-	
+
 	GFX_setVsync(VSYNC_STRICT);
 
 	PAD_reset();
@@ -2156,10 +2310,10 @@ int main (int argc, char *argv[]) {
 
 	int show_setting = 0; // 1=brightness,2=volume
 	int was_online = PLAT_isOnline();
-    int had_bt = PLAT_btIsConnected();
+	int had_bt = PLAT_btIsConnected();
 
 	pthread_t cpucheckthread;
-    pthread_create(&cpucheckthread, NULL, PLAT_cpu_monitor, NULL);
+	pthread_create(&cpucheckthread, NULL, PLAT_cpu_monitor, NULL);
 
 	int selected_row = top->selected - top->start;
 	float targetY;
@@ -2170,36 +2324,38 @@ int main (int argc, char *argv[]) {
 	char folderBgPath[1024];
 	folderbgbmp = NULL;
 
-	SDL_Surface * blackBG = SDL_CreateRGBSurfaceWithFormat(0,screen->w,screen->h,32,SDL_PIXELFORMAT_RGBA8888);
-	SDL_FillRect(blackBG,NULL,SDL_MapRGBA(screen->format,0,0,0,255));
+	SDL_Surface *blackBG = SDL_CreateRGBSurfaceWithFormat(0, screen->w, screen->h, 32, SDL_PIXELFORMAT_RGBA8888);
+	SDL_FillRect(blackBG, NULL, SDL_MapRGBA(screen->format, 0, 0, 0, 255));
 
 	SDL_LockMutex(animMutex);
-	globalpill = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, screen->w, SCALE1(PILL_SIZE), FIXED_DEPTH, SDL_PIXELFORMAT_RGBA8888);
-	globalText = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, screen->w, SCALE1(PILL_SIZE), FIXED_DEPTH, SDL_PIXELFORMAT_RGBA8888);
+	globalpill = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, screen->w, SCALE1(PILL_SIZE), FIXED_DEPTH,
+												SDL_PIXELFORMAT_RGBA8888);
+	globalText = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, screen->w, SCALE1(PILL_SIZE), FIXED_DEPTH,
+												SDL_PIXELFORMAT_RGBA8888);
 	static int globallpillW = 0;
 	SDL_UnlockMutex(animMutex);
 
-	//LOG_info("Start time time %ims\n",SDL_GetTicks());
+	// LOG_info("Start time time %ims\n",SDL_GetTicks());
 	while (!quit) {
 		GFX_startFrame();
 		unsigned long now = SDL_GetTicks();
-		
+
 		PAD_poll();
-			
+
 		int selected = top->selected;
 		int total = top->entries->count;
-		
+
 		PWR_update(&dirty, &show_setting, NULL, NULL);
-		
+
 		int is_online = PLAT_isOnline();
-		if (was_online!=is_online) 
+		if (was_online != is_online)
 			dirty = 1;
 		was_online = is_online;
 
-        int has_bt = PLAT_btIsConnected();
-        if (had_bt != has_bt)
-            dirty = 1;
-        had_bt = has_bt;
+		int has_bt = PLAT_btIsConnected();
+		if (had_bt != has_bt)
+			dirty = 1;
+		had_bt = has_bt;
 
 		int gsanimdir = ANIM_NONE;
 
@@ -2210,10 +2366,9 @@ int main (int argc, char *argv[]) {
 				currentScreen = SCREEN_GAMELIST;
 				folderbgchanged = 1; // The background painting code is a clusterfuck, just force a repaint here
 				dirty = 1;
-			}
-			else if (PAD_justReleased(BTN_A)) {
+			} else if (PAD_justReleased(BTN_A)) {
 				Entry *selected = qm_row == 0 ? quick->items[qm_col] : quickActions->items[qm_col];
-				if(selected->type != ENTRY_DIP) {
+				if (selected->type != ENTRY_DIP) {
 					currentScreen = SCREEN_GAMELIST;
 					total = top->entries->count;
 					// prevent restoring list state, game list screen currently isnt our nav origin
@@ -2228,78 +2383,68 @@ int main (int argc, char *argv[]) {
 				}
 				Entry_open(selected);
 				dirty = 1;
-			}
-			else if (PAD_justPressed(BTN_RIGHT)) {
-				if(qm_row == 0 && qm_total > qm_slots) {
+			} else if (PAD_justPressed(BTN_RIGHT)) {
+				if (qm_row == 0 && qm_total > qm_slots) {
 					qm_col++;
-					if(qm_col >= qm_total) {
+					if (qm_col >= qm_total) {
 						qm_col = 0;
 						qm_shift = 0;
 						qm_slot = 0;
-					}
-					else {
+					} else {
 						qm_slot++;
-						if(qm_slot >= qm_slots) {
+						if (qm_slot >= qm_slots) {
 							qm_slot = qm_slots - 1;
 							qm_shift++;
 						}
 					}
-				}
-				else {
+				} else {
 					qm_col += 1;
-					if(qm_col >= qm_total) {
+					if (qm_col >= qm_total) {
 						qm_col = 0;
 					}
 				}
 				dirty = 1;
-			}
-			else if (PAD_justPressed(BTN_LEFT)) {
-				if(qm_row == 0  && qm_total > qm_slots) {
+			} else if (PAD_justPressed(BTN_LEFT)) {
+				if (qm_row == 0 && qm_total > qm_slots) {
 					qm_col -= 1;
-					if(qm_col < 0) {
+					if (qm_col < 0) {
 						qm_col = qm_total - 1;
 						qm_shift = qm_total - qm_slots;
 						qm_slot = qm_slots - 1;
-					}
-					else {
+					} else {
 						qm_slot--;
-						if(qm_slot < 0) {
+						if (qm_slot < 0) {
 							qm_slot = 0;
 							qm_shift--;
 						}
 					}
-				}
-				else {
+				} else {
 					qm_col -= 1;
-					if(qm_col < 0) {
+					if (qm_col < 0) {
 						qm_col = qm_total - 1;
 					}
 				}
 				dirty = 1;
-			}
-			else if(PAD_justPressed(BTN_DOWN)) {
-				if(qm_row == 0) {
+			} else if (PAD_justPressed(BTN_DOWN)) {
+				if (qm_row == 0) {
 					qm_row = 1;
 					qm_col = 0;
 					dirty = 1;
 				}
-			}
-			else if(PAD_justPressed(BTN_UP)) {
-				if(qm_row == 1) {
+			} else if (PAD_justPressed(BTN_UP)) {
+				if (qm_row == 1) {
 					qm_row = 0;
 					qm_col = qm_slot + qm_shift;
 					dirty = 1;
 				}
 			}
-		}
-		else if(currentScreen == SCREEN_GAMESWITCHER) {
+		} else if (currentScreen == SCREEN_GAMESWITCHER) {
 			if (PAD_justPressed(BTN_B) || PAD_tappedSelect(now)) {
 				currentScreen = SCREEN_GAMELIST;
 				switcher_selected = 0;
 				dirty = 1;
 				folderbgchanged = 1; // The background painting code is a clusterfuck, just force a repaint here
-			}
-			else if (recents->count > 0 && PAD_justReleased(BTN_A)) {
+			} else if (recents->count > 0 && PAD_justReleased(BTN_A)) {
 				// this will drop us back into game switcher after leaving the game
 				putFile(GAME_SWITCHER_PERSIST_PATH, "unused");
 				startgame = 1;
@@ -2308,33 +2453,29 @@ int main (int argc, char *argv[]) {
 				Entry_open(selectedEntry);
 				dirty = 1;
 				Entry_free(selectedEntry);
-			}
-			else if (recents->count > 0 && PAD_justReleased(BTN_Y)) {
+			} else if (recents->count > 0 && PAD_justReleased(BTN_Y)) {
 				// remove
-				Recent* recentEntry = recents->items[switcher_selected--];
+				Recent *recentEntry = recents->items[switcher_selected--];
 				Array_remove(recents, recentEntry);
 				Recent_free(recentEntry);
 				saveRecents();
-				if(switcher_selected < 0)
+				if (switcher_selected < 0)
 					switcher_selected = recents->count - 1; // wrap
 				dirty = 1;
-			}
-			else if (PAD_justPressed(BTN_RIGHT)) {
+			} else if (PAD_justPressed(BTN_RIGHT)) {
 				switcher_selected++;
-				if(switcher_selected == recents->count)
+				if (switcher_selected == recents->count)
 					switcher_selected = 0; // wrap
 				dirty = 1;
 				gsanimdir = SLIDE_LEFT;
-			}
-			else if (PAD_justPressed(BTN_LEFT)) {
+			} else if (PAD_justPressed(BTN_LEFT)) {
 				switcher_selected--;
-				if(switcher_selected < 0)
+				if (switcher_selected < 0)
 					switcher_selected = recents->count - 1; // wrap
 				dirty = 1;
 				gsanimdir = SLIDE_RIGHT;
 			}
-		}
-		else {
+		} else {
 			if (PAD_tappedMenu(now)) {
 				currentScreen = SCREEN_QUICKMENU;
 				qm_col = 0;
@@ -2343,44 +2484,38 @@ int main (int argc, char *argv[]) {
 				qm_slot = 0;
 				dirty = 1;
 				folderbgchanged = 1; // The background painting code is a clusterfuck, just force a repaint here
-				if (!HAS_POWER_BUTTON && !simple_mode) PWR_enableSleep();
-			}
-			else if (PAD_tappedSelect(now)) {
+				if (!HAS_POWER_BUTTON && !simple_mode)
+					PWR_enableSleep();
+			} else if (PAD_tappedSelect(now)) {
 				currentScreen = SCREEN_GAMESWITCHER;
-				switcher_selected = 0; 
+				switcher_selected = 0;
 				dirty = 1;
-			}
-			else if (total>0) {
+			} else if (total > 0) {
 				if (PAD_justRepeated(BTN_UP)) {
-					if (selected==0 && !PAD_justPressed(BTN_UP)) {
+					if (selected == 0 && !PAD_justPressed(BTN_UP)) {
 						// stop at top
-					}
-					else {
+					} else {
 						selected -= 1;
-						if (selected<0) {
-							selected = total-1;
+						if (selected < 0) {
+							selected = total - 1;
 							int start = total - MAIN_ROW_COUNT;
-							top->start = (start<0) ? 0 : start;
-							top->end = total; 
-						}
-						else if (selected<top->start) {
+							top->start = (start < 0) ? 0 : start;
+							top->end = total;
+						} else if (selected < top->start) {
 							top->start -= 1;
 							top->end -= 1;
 						}
 					}
-				}
-				else if (PAD_justRepeated(BTN_DOWN)) {
-					if (selected==total-1 && !PAD_justPressed(BTN_DOWN)) {
+				} else if (PAD_justRepeated(BTN_DOWN)) {
+					if (selected == total - 1 && !PAD_justPressed(BTN_DOWN)) {
 						// stop at bottom
-					}
-					else {
+					} else {
 						selected += 1;
-						if (selected>=total) {
+						if (selected >= total) {
 							selected = 0;
 							top->start = 0;
-							top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
-						}
-						else if (selected>=top->end) {
+							top->end = (total < MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
+						} else if (selected >= top->end) {
 							top->start += 1;
 							top->end += 1;
 						}
@@ -2388,113 +2523,117 @@ int main (int argc, char *argv[]) {
 				}
 				if (PAD_justRepeated(BTN_LEFT)) {
 					selected -= MAIN_ROW_COUNT;
-					if (selected<0) {
+					if (selected < 0) {
 						selected = 0;
 						top->start = 0;
-						top->end = (total<MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
-					}
-					else if (selected<top->start) {
+						top->end = (total < MAIN_ROW_COUNT) ? total : MAIN_ROW_COUNT;
+					} else if (selected < top->start) {
 						top->start -= MAIN_ROW_COUNT;
-						if (top->start<0) top->start = 0;
+						if (top->start < 0)
+							top->start = 0;
 						top->end = top->start + MAIN_ROW_COUNT;
 					}
-				}
-				else if (PAD_justRepeated(BTN_RIGHT)) {
+				} else if (PAD_justRepeated(BTN_RIGHT)) {
 					selected += MAIN_ROW_COUNT;
-					if (selected>=total) {
-						selected = total-1;
+					if (selected >= total) {
+						selected = total - 1;
 						int start = total - MAIN_ROW_COUNT;
-						top->start = (start<0) ? 0 : start;
+						top->start = (start < 0) ? 0 : start;
 						top->end = total;
-					}
-					else if (selected>=top->end) {
+					} else if (selected >= top->end) {
 						top->end += MAIN_ROW_COUNT;
-						if (top->end>total) top->end = total;
+						if (top->end > total)
+							top->end = total;
 						top->start = top->end - MAIN_ROW_COUNT;
 					}
 				}
 			}
-		
-			if (PAD_justRepeated(BTN_L1) && !PAD_isPressed(BTN_R1) && !PWR_ignoreSettingInput(BTN_L1, show_setting)) { // previous alpha
-				Entry* entry = top->entries->items[selected];
-				int i = entry->alpha-1;
-				if (i>=0) {
+
+			if (PAD_justRepeated(BTN_L1) && !PAD_isPressed(BTN_R1) &&
+				!PWR_ignoreSettingInput(BTN_L1, show_setting)) { // previous alpha
+				Entry *entry = top->entries->items[selected];
+				int i = entry->alpha - 1;
+				if (i >= 0) {
 					selected = top->alphas->items[i];
-					if (total>MAIN_ROW_COUNT) {
+					if (total > MAIN_ROW_COUNT) {
 						top->start = selected;
 						top->end = top->start + MAIN_ROW_COUNT;
-						if (top->end>total) top->end = total;
+						if (top->end > total)
+							top->end = total;
 						top->start = top->end - MAIN_ROW_COUNT;
 					}
 				}
-			}
-			else if (PAD_justRepeated(BTN_R1) && !PAD_isPressed(BTN_L1) && !PWR_ignoreSettingInput(BTN_R1, show_setting)) { // next alpha
-				Entry* entry = top->entries->items[selected];
-				int i = entry->alpha+1;
-				if (i<top->alphas->count) {
+			} else if (PAD_justRepeated(BTN_R1) && !PAD_isPressed(BTN_L1) &&
+					   !PWR_ignoreSettingInput(BTN_R1, show_setting)) { // next alpha
+				Entry *entry = top->entries->items[selected];
+				int i = entry->alpha + 1;
+				if (i < top->alphas->count) {
 					selected = top->alphas->items[i];
-					if (total>MAIN_ROW_COUNT) {
+					if (total > MAIN_ROW_COUNT) {
 						top->start = selected;
 						top->end = top->start + MAIN_ROW_COUNT;
-						if (top->end>total) top->end = total;
+						if (top->end > total)
+							top->end = total;
 						top->start = top->end - MAIN_ROW_COUNT;
 					}
 				}
 			}
-	
-			if (selected!=top->selected) {
+
+			if (selected != top->selected) {
 				top->selected = selected;
 				dirty = 1;
 			}
 
-			Entry* entry = top->entries->items[top->selected];
-	
-			if (dirty && total>0) 
+			Entry *entry = top->entries->items[top->selected];
+
+			if (dirty && total > 0)
 				readyResume(entry);
 
-			if (total>0 && can_resume && PAD_justReleased(BTN_RESUME)) {
+			if (total > 0 && can_resume && PAD_justReleased(BTN_RESUME)) {
 				should_resume = 1;
 				Entry_open(entry);
-				
+
 				dirty = 1;
-			}
-			else if (total>0 && PAD_justPressed(BTN_A)) {
+			} else if (total > 0 && PAD_justPressed(BTN_A)) {
 				Entry_open(entry);
-				if(entry->type == ENTRY_DIR) {
+				if (entry->type == ENTRY_DIR) {
 					animationdirection = SLIDE_LEFT;
 					total = top->entries->count;
 				}
 				dirty = 1;
 
-				if (total>0) readyResume(top->entries->items[top->selected]);
-			}
-			else if (PAD_justPressed(BTN_B) && stack->count>1) {
+				if (total > 0)
+					readyResume(top->entries->items[top->selected]);
+			} else if (PAD_justPressed(BTN_B) && stack->count > 1) {
 				closeDirectory();
 				animationdirection = SLIDE_RIGHT;
 				total = top->entries->count;
 				dirty = 1;
-				
-				if (total>0) readyResume(top->entries->items[top->selected]);
+
+				if (total > 0)
+					readyResume(top->entries->items[top->selected]);
 			}
 		}
-		
-		if(dirty) {
+
+		if (dirty) {
 			SDL_Surface *tmpOldScreen = NULL;
-			SDL_Surface * switcherSur = NULL;
-			// NOTE:22 This causes slowdown when CFG_getMenuTransitions is set to false because animationdirection turns > 0 somewhere but is never set back to 0 and so this code runs on every action, will fix later
-			if(animationdirection != ANIM_NONE || (lastScreen==SCREEN_GAMELIST && currentScreen == SCREEN_GAMESWITCHER)) {
-				if(tmpOldScreen) SDL_FreeSurface(tmpOldScreen);
+			SDL_Surface *switcherSur = NULL;
+			// NOTE:22 This causes slowdown when CFG_getMenuTransitions is set to false because animationdirection turns
+			// > 0 somewhere but is never set back to 0 and so this code runs on every action, will fix later
+			if (animationdirection != ANIM_NONE ||
+				(lastScreen == SCREEN_GAMELIST && currentScreen == SCREEN_GAMESWITCHER)) {
+				if (tmpOldScreen)
+					SDL_FreeSurface(tmpOldScreen);
 				tmpOldScreen = GFX_captureRendererToSurface();
-				SDL_SetSurfaceBlendMode(tmpOldScreen,SDL_BLENDMODE_BLEND);
+				SDL_SetSurfaceBlendMode(tmpOldScreen, SDL_BLENDMODE_BLEND);
 			}
 
 			// clear only background layer on start
-			if(lastScreen==SCREEN_GAME || lastScreen==SCREEN_OFF) {
+			if (lastScreen == SCREEN_GAME || lastScreen == SCREEN_OFF) {
 				GFX_clearLayers(LAYER_ALL);
-			}
-			else {	
+			} else {
 				GFX_clearLayers(LAYER_TRANSITION);
-				if(lastScreen!=SCREEN_GAMELIST)	
+				if (lastScreen != SCREEN_GAMELIST)
 					GFX_clearLayers(LAYER_THUMBNAIL);
 				GFX_clearLayers(LAYER_SCROLLTEXT);
 				GFX_clearLayers(LAYER_IDK2);
@@ -2503,7 +2642,7 @@ int main (int argc, char *argv[]) {
 
 			int ow = GFX_blitHardwareGroup(screen, show_setting);
 			if (currentScreen == SCREEN_QUICKMENU) {
-				if(lastScreen != SCREEN_QUICKMENU) {
+				if (lastScreen != SCREEN_QUICKMENU) {
 					GFX_clearLayers(LAYER_BACKGROUND);
 					GFX_clearLayers(LAYER_THUMBNAIL);
 				}
@@ -2511,48 +2650,55 @@ int main (int argc, char *argv[]) {
 				Entry *current = qm_row == 0 ? quick->items[qm_col] : quickActions->items[qm_col];
 				char newBgPath[MAX_PATH];
 				char fallbackBgPath[MAX_PATH];
-				sprintf(newBgPath, SDCARD_PATH "/.media/quick_%s%s.png", current->name, 
-					!strcmp(current->name,"Wifi") && CFG_getWifi() || 							// wifi or wifi_off, based on state
-					!strcmp(current->name,"Bluetooth") && CFG_getBluetooth() ? "_off" : "");	// bluetooth or bluetooth_off, based on state
+				sprintf(newBgPath, SDCARD_PATH "/.media/quick_%s%s.png", current->name,
+						!strcmp(current->name, "Wifi") && CFG_getWifi() || // wifi or wifi_off, based on state
+								!strcmp(current->name, "Bluetooth") && CFG_getBluetooth()
+							? "_off"
+							: ""); // bluetooth or bluetooth_off, based on state
 				sprintf(fallbackBgPath, SDCARD_PATH "/.media/quick.png");
-				
+
 				// background
-				if(!exists(newBgPath))
+				if (!exists(newBgPath))
 					strncpy(newBgPath, fallbackBgPath, sizeof(newBgPath) - 1);
 
-				if(strcmp(newBgPath, folderBgPath) != 0) {
+				if (strcmp(newBgPath, folderBgPath) != 0) {
 					strncpy(folderBgPath, newBgPath, sizeof(folderBgPath) - 1);
 					startLoadFolderBackground(newBgPath, onBackgroundLoaded, NULL);
 				}
-				
+
 				// buttons (duped and trimmed from below)
-				if (show_setting && !GetHDMI()) GFX_blitHardwareHints(screen, show_setting);
-				else GFX_blitButtonGroup((char*[]){ BTN_SLEEP==BTN_POWER?"POWER":"MENU","SLEEP",  NULL }, 0, screen, 0);
-				
-				GFX_blitButtonGroup((char*[]){ "B","BACK", "A","OPEN", NULL }, 1, screen, 1);
-
-				if(CFG_getShowQuickswitcherUI()) {
-					#define MENU_ITEM_SIZE 72 // item size, top line
-					#define MENU_MARGIN_Y 32 // space between main UI elements and quick menu
-					#define MENU_MARGIN_X 40 // space between main UI elements and quick menu
-					#define MENU_ITEM_MARGIN 18 // space between items, top line
-					#define MENU_TOGGLE_MARGIN 8 // space between items, bottom line
-					#define MENU_LINE_MARGIN 8 // space between top and bottom line
+				if (show_setting && !GetHDMI())
+					GFX_blitHardwareHints(screen, show_setting);
+				else
+					GFX_blitButtonGroup((char *[]){BTN_SLEEP == BTN_POWER ? "POWER" : "MENU", "SLEEP", NULL}, 0, screen,
+										0);
+
+				GFX_blitButtonGroup((char *[]){"B", "BACK", "A", "OPEN", NULL}, 1, screen, 1);
+
+				if (CFG_getShowQuickswitcherUI()) {
+#define MENU_ITEM_SIZE 72	 // item size, top line
+#define MENU_MARGIN_Y 32	 // space between main UI elements and quick menu
+#define MENU_MARGIN_X 40	 // space between main UI elements and quick menu
+#define MENU_ITEM_MARGIN 18	 // space between items, top line
+#define MENU_TOGGLE_MARGIN 8 // space between items, bottom line
+#define MENU_LINE_MARGIN 8	 // space between top and bottom line
 
 					// this is flexible, not sure I like it at smaller scales than 3 though
-					//int item_size = screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + // top pill area
+					// int item_size = screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + // top pill area
 					//	MENU_MARGIN_Y + MENU_LINE_MARGIN + PILL_SIZE + MENU_MARGIN_Y + // our own area
 					//	BUTTON_MARGIN + PILL_SIZE + PADDING); // bottom pill area
 
 					int item_space_y = screen->h - SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + // top pill area
-						MENU_MARGIN_Y + MENU_LINE_MARGIN + PILL_SIZE + MENU_MARGIN_Y + // our own area
-						BUTTON_MARGIN + PILL_SIZE + PADDING);
+														  MENU_MARGIN_Y + MENU_LINE_MARGIN + PILL_SIZE +
+														  MENU_MARGIN_Y + // our own area
+														  BUTTON_MARGIN + PILL_SIZE + PADDING);
 					int item_size = SCALE1(MENU_ITEM_SIZE);
 					int item_extra_y = item_space_y - item_size;
 					int item_space_x = screen->w - SCALE1(PADDING + MENU_MARGIN_X + MENU_MARGIN_X + PADDING);
-					// extra left margin for the first item in order to properly center all of them in the 
+					// extra left margin for the first item in order to properly center all of them in the
 					// available space
-					int item_inset_x = (item_space_x - SCALE1(qm_slots * MENU_ITEM_SIZE + (qm_slots - 1) * MENU_ITEM_MARGIN)) / 2;
+					int item_inset_x =
+						(item_space_x - SCALE1(qm_slots * MENU_ITEM_SIZE + (qm_slots - 1) * MENU_ITEM_MARGIN)) / 2;
 
 					// primary
 					ox = SCALE1(PADDING + MENU_MARGIN_X) + item_inset_x;
@@ -2560,8 +2706,7 @@ int main (int argc, char *argv[]) {
 					// just to keep selection visible.
 					// every display should be able to fit three items, we shift horizontally to accomodate.
 					ox -= qm_shift * (item_size + SCALE1(MENU_ITEM_MARGIN));
-					for (int c = 0; c < quick->count; c++)
-					{
+					for (int c = 0; c < quick->count; c++) {
 						SDL_Rect item_rect = {ox, oy, item_size, item_size};
 						Entry *item = quick->items[c];
 
@@ -2569,37 +2714,38 @@ int main (int argc, char *argv[]) {
 						uint32_t item_color = THEME_COLOR3;
 						uint32_t icon_color = THEME_COLOR4;
 
-						if(qm_row == 0 && qm_col == c) {
+						if (qm_row == 0 && qm_col == c) {
 							text_color = uintToColour(THEME_COLOR5_255);
 							item_color = THEME_COLOR1;
 							icon_color = THEME_COLOR5;
 						}
-						
+
 						GFX_blitRectColor(ASSET_STATE_BG, screen, &item_rect, item_color);
 
 						char icon_path[MAX_PATH];
 						sprintf(icon_path, SDCARD_PATH "/.system/res/%s@%ix.png", item->name, FIXED_SCALE);
-						SDL_Surface* bmp = IMG_Load(icon_path);
-						if(bmp) {
-							SDL_Surface* converted = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888, 0);
+						SDL_Surface *bmp = IMG_Load(icon_path);
+						if (bmp) {
+							SDL_Surface *converted = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888, 0);
 							if (converted) {
-								SDL_FreeSurface(bmp); 
-								bmp = converted; 
+								SDL_FreeSurface(bmp);
+								bmp = converted;
 							}
 						}
-						if(bmp) {
+						if (bmp) {
 							// Calculate the position to center the source surface
 							int x = (item_rect.w - bmp->w) / 2;
 							int y = (item_rect.h - SCALE1(FONT_TINY + BUTTON_MARGIN) - bmp->h) / 2;
-							SDL_Rect destRect = { ox+x, oy+y, 0, 0 };  // width/height not required
-							//SDL_BlitSurface(bmp, NULL, screen, &destRect);
+							SDL_Rect destRect = {ox + x, oy + y, 0, 0}; // width/height not required
+							// SDL_BlitSurface(bmp, NULL, screen, &destRect);
 
 							GFX_blitSurfaceColor(bmp, NULL, screen, &destRect, icon_color);
 						}
 
 						int w, h;
 						GFX_sizeText(font.tiny, item->name, SCALE1(FONT_TINY), &w, &h);
-						SDL_Rect text_rect = {item_rect.x + (item_size - w) / 2, item_rect.y + item_size - h - SCALE1(BUTTON_MARGIN), w, h};
+						SDL_Rect text_rect = {item_rect.x + (item_size - w) / 2,
+											  item_rect.y + item_size - h - SCALE1(BUTTON_MARGIN), w, h};
 						GFX_blitText(font.tiny, item->name, SCALE1(FONT_TINY), text_color, screen, &text_rect);
 
 						ox += item_rect.w + SCALE1(MENU_ITEM_MARGIN);
@@ -2607,8 +2753,12 @@ int main (int argc, char *argv[]) {
 
 					// secondary
 					ox = SCALE1(PADDING + MENU_MARGIN_X);
-					ox += (screen->w - SCALE1(PADDING + MENU_MARGIN_X + MENU_MARGIN_X + PADDING) - SCALE1(quickActions->count * PILL_SIZE) - SCALE1((quickActions->count - 1) * MENU_TOGGLE_MARGIN))/2;
-					oy = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + MENU_MARGIN_Y + MENU_LINE_MARGIN) + item_size + item_extra_y / 2;
+					ox += (screen->w - SCALE1(PADDING + MENU_MARGIN_X + MENU_MARGIN_X + PADDING) -
+						   SCALE1(quickActions->count * PILL_SIZE) -
+						   SCALE1((quickActions->count - 1) * MENU_TOGGLE_MARGIN)) /
+						  2;
+					oy = SCALE1(PADDING + PILL_SIZE + BUTTON_MARGIN + MENU_MARGIN_Y + MENU_LINE_MARGIN) + item_size +
+						 item_extra_y / 2;
 					for (int c = 0; c < quickActions->count; c++) {
 						SDL_Rect item_rect = {ox, oy, SCALE1(PILL_SIZE), SCALE1(PILL_SIZE)};
 						Entry *item = quickActions->items[c];
@@ -2617,7 +2767,7 @@ int main (int argc, char *argv[]) {
 						uint32_t item_color = THEME_COLOR3;
 						uint32_t icon_color = THEME_COLOR4;
 
-						if(qm_row == 1 && qm_col == c) {
+						if (qm_row == 1 && qm_col == c) {
 							text_color = uintToColour(THEME_COLOR5_255);
 							item_color = THEME_COLOR1;
 							icon_color = THEME_COLOR5;
@@ -2626,19 +2776,19 @@ int main (int argc, char *argv[]) {
 						GFX_blitPillColor(ASSET_WHITE_PILL, screen, &item_rect, item_color, RGB_WHITE);
 
 						int asset = ASSET_WIFI;
-						if (!strcmp(item->name,"Wifi"))
+						if (!strcmp(item->name, "Wifi"))
 							asset = CFG_getWifi() ? ASSET_WIFI_OFF : ASSET_WIFI;
-						else if (!strcmp(item->name,"Bluetooth"))
+						else if (!strcmp(item->name, "Bluetooth"))
 							asset = CFG_getBluetooth() ? ASSET_BLUETOOTH_OFF : ASSET_BLUETOOTH;
-						else if (!strcmp(item->name,"Sleep"))
+						else if (!strcmp(item->name, "Sleep"))
 							asset = ASSET_SUSPEND;
-						else if (!strcmp(item->name,"Reboot"))
+						else if (!strcmp(item->name, "Reboot"))
 							asset = ASSET_RESTART;
-						else if (!strcmp(item->name,"Poweroff"))
+						else if (!strcmp(item->name, "Poweroff"))
 							asset = ASSET_POWEROFF;
-						else if (!strcmp(item->name,"Settings"))
+						else if (!strcmp(item->name, "Settings"))
 							asset = ASSET_SETTINGS;
-						else if (!strcmp(item->name,"Pak Store"))
+						else if (!strcmp(item->name, "Pak Store"))
 							asset = ASSET_STORE;
 
 						SDL_Rect rect;
@@ -2647,84 +2797,80 @@ int main (int argc, char *argv[]) {
 						int y = item_rect.y;
 						x += (SCALE1(PILL_SIZE) - rect.w) / 2;
 						y += (SCALE1(PILL_SIZE) - rect.h) / 2;
-						
-						GFX_blitAssetColor(asset, NULL, screen, &(SDL_Rect){x,y}, icon_color);
-						
+
+						GFX_blitAssetColor(asset, NULL, screen, &(SDL_Rect){x, y}, icon_color);
+
 						ox += item_rect.w + SCALE1(MENU_TOGGLE_MARGIN);
 					}
 				}
 				lastScreen = SCREEN_QUICKMENU;
-			}
-			else if(startgame) {
-				//pilltargetY = +screen->w;
-				//animationdirection = ANIM_NONE;
+			} else if (startgame) {
+				// pilltargetY = +screen->w;
+				// animationdirection = ANIM_NONE;
 				GFX_clearLayers(LAYER_ALL);
 				GFX_clear(screen);
 				GFX_flipHidden();
-				GFX_animateSurfaceOpacity(tmpOldScreen,0,0,screen->w,screen->h,255,0,CFG_getMenuTransitions() ? 150:20,LAYER_BACKGROUND);
-			}
-			else if(currentScreen == SCREEN_GAMESWITCHER) {
+				GFX_animateSurfaceOpacity(tmpOldScreen, 0, 0, screen->w, screen->h, 255, 0,
+										  CFG_getMenuTransitions() ? 150 : 20, LAYER_BACKGROUND);
+			} else if (currentScreen == SCREEN_GAMESWITCHER) {
 				GFX_clearLayers(LAYER_ALL);
 				ox = 0;
 				oy = 0;
-				
+
 				// For all recents with resumable state (i.e. has savegame), show game switcher carousel
-				if(recents->count > 0) {
+				if (recents->count > 0) {
 					Entry *selectedEntry = entryFromRecent(recents->items[switcher_selected]);
 					readyResume(selectedEntry);
 					// title pill
 					{
 						int max_width = screen->w - SCALE1(PADDING * 2) - ow;
-						
+
 						char display_name[256];
-						int text_width = GFX_truncateText(font.large, selectedEntry->name, display_name, max_width, SCALE1(BUTTON_PADDING*2));
+						int text_width = GFX_truncateText(font.large, selectedEntry->name, display_name, max_width,
+														  SCALE1(BUTTON_PADDING * 2));
 						max_width = MIN(max_width, text_width);
 
-						SDL_Surface* text;
+						SDL_Surface *text;
 						SDL_Color textColor = uintToColour(THEME_COLOR6_255);
 						text = TTF_RenderUTF8_Blended(font.large, display_name, textColor);
 						const int text_offset_y = (SCALE1(PILL_SIZE) - text->h + 1) >> 1;
-						GFX_blitPillLight(ASSET_WHITE_PILL, screen, &(SDL_Rect){
-							SCALE1(PADDING),
-							SCALE1(PADDING),
-							max_width,
-							SCALE1(PILL_SIZE)
-						});
-						SDL_BlitSurface(text, &(SDL_Rect){
-							0,
-							0,
-							max_width-SCALE1(BUTTON_PADDING*2),
-							text->h
-						}, screen, &(SDL_Rect){
-							SCALE1(PADDING+BUTTON_PADDING),
-							SCALE1(PADDING) + text_offset_y,
-						});
+						GFX_blitPillLight(ASSET_WHITE_PILL, screen,
+										  &(SDL_Rect){SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)});
+						SDL_BlitSurface(text, &(SDL_Rect){0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h},
+										screen,
+										&(SDL_Rect){
+											SCALE1(PADDING + BUTTON_PADDING),
+											SCALE1(PADDING) + text_offset_y,
+										});
 						SDL_FreeSurface(text);
 					}
 
-					if(can_resume) GFX_blitButtonGroup((char*[]){ "B","BACK",  NULL }, 0, screen, 0);
-					else GFX_blitButtonGroup((char*[]){ BTN_SLEEP==BTN_POWER?"POWER":"MENU","SLEEP",  NULL }, 0, screen, 0);
+					if (can_resume)
+						GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 0, screen, 0);
+					else
+						GFX_blitButtonGroup((char *[]){BTN_SLEEP == BTN_POWER ? "POWER" : "MENU", "SLEEP", NULL}, 0,
+											screen, 0);
 
-					GFX_blitButtonGroup((char*[]){ "Y", "REMOVE", "A","RESUME", NULL }, 1, screen, 1);
+					GFX_blitButtonGroup((char *[]){"Y", "REMOVE", "A", "RESUME", NULL}, 1, screen, 1);
 
-					if(has_preview) {
+					if (has_preview) {
 						// lotta memory churn here
-					
-						SDL_Surface* bmp = IMG_Load(preview_path);
-						SDL_Surface* raw_preview = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888, 0);
+
+						SDL_Surface *bmp = IMG_Load(preview_path);
+						SDL_Surface *raw_preview = SDL_ConvertSurfaceFormat(bmp, SDL_PIXELFORMAT_RGBA8888, 0);
 						if (raw_preview) {
-							SDL_FreeSurface(bmp); 
-							bmp = raw_preview; 
+							SDL_FreeSurface(bmp);
+							bmp = raw_preview;
 						}
-						if(bmp) {
+						if (bmp) {
 							int aw = screen->w;
 							int ah = screen->h;
 							int ax = 0;
 							int ay = 0;
-						
+
 							float aspectRatio = (float)bmp->w / (float)bmp->h;
 							float screenRatio = (float)screen->w / (float)screen->h;
-					
+
 							if (screenRatio > aspectRatio) {
 								aw = (int)(screen->h * aspectRatio);
 								ah = screen->h;
@@ -2734,96 +2880,104 @@ int main (int argc, char *argv[]) {
 							}
 							ax = (screen->w - aw) / 2;
 							ay = (screen->h - ah) / 2;
-						
-							if(lastScreen == SCREEN_GAME) {
+
+							if (lastScreen == SCREEN_GAME) {
 								// need to flip once so streaming_texture1 is updated
 								GFX_flipHidden();
-								GFX_animateSurfaceOpacity(bmp,0,0,screen->w,screen->h,0,255,CFG_getMenuTransitions() ? 150:20,LAYER_ALL);
-							} else if(lastScreen == SCREEN_GAMELIST) { 
-								
-								GFX_drawOnLayer(blackBG,0,0,screen->w,screen->h,1.0f,0,LAYER_BACKGROUND);
-								GFX_drawOnLayer(bmp,ax,ay,aw, ah,1.0f,0,LAYER_BACKGROUND);
+								GFX_animateSurfaceOpacity(bmp, 0, 0, screen->w, screen->h, 0, 255,
+														  CFG_getMenuTransitions() ? 150 : 20, LAYER_ALL);
+							} else if (lastScreen == SCREEN_GAMELIST) {
+								GFX_drawOnLayer(blackBG, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
+								GFX_drawOnLayer(bmp, ax, ay, aw, ah, 1.0f, 0, LAYER_BACKGROUND);
 								GFX_flipHidden();
 								SDL_Surface *tmpNewScreen = GFX_captureRendererToSurface();
 								GFX_clearLayers(LAYER_ALL);
-								folderbgchanged=1;
-								GFX_drawOnLayer(tmpOldScreen,0,0,screen->w, screen->h,1.0f,0,LAYER_ALL);
-								GFX_animateSurface(tmpNewScreen,0,0-screen->h,0,0,screen->w,screen->h,CFG_getMenuTransitions() ? 100:20,255,255,LAYER_BACKGROUND);
+								folderbgchanged = 1;
+								GFX_drawOnLayer(tmpOldScreen, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_ALL);
+								GFX_animateSurface(tmpNewScreen, 0, 0 - screen->h, 0, 0, screen->w, screen->h,
+												   CFG_getMenuTransitions() ? 100 : 20, 255, 255, LAYER_BACKGROUND);
 								SDL_FreeSurface(tmpNewScreen);
-								
-							} else if(lastScreen == SCREEN_GAMESWITCHER) {
+
+							} else if (lastScreen == SCREEN_GAMESWITCHER) {
 								GFX_flipHidden();
-								GFX_drawOnLayer(blackBG,0,0,screen->w, screen->h,1.0f,0,LAYER_BACKGROUND);
-								if(gsanimdir == SLIDE_LEFT) 
-									GFX_animateSurface(bmp,ax+screen->w,ay,ax,ay,aw,ah,CFG_getMenuTransitions() ? 80:20,0,255,LAYER_ALL);
-								else if(gsanimdir == SLIDE_RIGHT)
-									GFX_animateSurface(bmp,ax-screen->w,ay,ax,ay,aw,ah,CFG_getMenuTransitions() ? 80:20,0,255,LAYER_ALL);
-								
-								GFX_drawOnLayer(bmp,ax,ay,aw,ah,1.0f,0,LAYER_BACKGROUND);
-							} else if(lastScreen == SCREEN_QUICKMENU) {
+								GFX_drawOnLayer(blackBG, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
+								if (gsanimdir == SLIDE_LEFT)
+									GFX_animateSurface(bmp, ax + screen->w, ay, ax, ay, aw, ah,
+													   CFG_getMenuTransitions() ? 80 : 20, 0, 255, LAYER_ALL);
+								else if (gsanimdir == SLIDE_RIGHT)
+									GFX_animateSurface(bmp, ax - screen->w, ay, ax, ay, aw, ah,
+													   CFG_getMenuTransitions() ? 80 : 20, 0, 255, LAYER_ALL);
+
+								GFX_drawOnLayer(bmp, ax, ay, aw, ah, 1.0f, 0, LAYER_BACKGROUND);
+							} else if (lastScreen == SCREEN_QUICKMENU) {
 								GFX_flipHidden();
-								GFX_drawOnLayer(blackBG,0,0,screen->w, screen->h,1.0f,0,LAYER_BACKGROUND);								
-								GFX_drawOnLayer(bmp,ax,ay,aw,ah,1.0f,0,LAYER_BACKGROUND);
+								GFX_drawOnLayer(blackBG, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
+								GFX_drawOnLayer(bmp, ax, ay, aw, ah, 1.0f, 0, LAYER_BACKGROUND);
 							}
-							SDL_FreeSurface(bmp);  // Free after rendering
+							SDL_FreeSurface(bmp); // Free after rendering
 						}
-					}
-					else {
-						SDL_Rect preview_rect = {ox,oy,screen->w,screen->h};
-						SDL_Surface * tmpsur = SDL_CreateRGBSurfaceWithFormat(0,screen->w,screen->h,32,SDL_PIXELFORMAT_RGBA8888);
-						SDL_FillRect(tmpsur, &preview_rect, SDL_MapRGBA(screen->format,0,0,0,255));
-						if(lastScreen == SCREEN_GAME) {
-							GFX_animateSurfaceOpacity(tmpsur,0,0,screen->w,screen->h,255,0,CFG_getMenuTransitions() ? 150:20,LAYER_BACKGROUND);
-						} else if(lastScreen == SCREEN_GAMELIST) { 
-							GFX_animateSurface(tmpsur,0,0-screen->h,0,0,screen->w,screen->h,CFG_getMenuTransitions() ? 100:20,255,255,LAYER_ALL);
-						} else if(lastScreen == SCREEN_GAMESWITCHER) {
+					} else {
+						SDL_Rect preview_rect = {ox, oy, screen->w, screen->h};
+						SDL_Surface *tmpsur =
+							SDL_CreateRGBSurfaceWithFormat(0, screen->w, screen->h, 32, SDL_PIXELFORMAT_RGBA8888);
+						SDL_FillRect(tmpsur, &preview_rect, SDL_MapRGBA(screen->format, 0, 0, 0, 255));
+						if (lastScreen == SCREEN_GAME) {
+							GFX_animateSurfaceOpacity(tmpsur, 0, 0, screen->w, screen->h, 255, 0,
+													  CFG_getMenuTransitions() ? 150 : 20, LAYER_BACKGROUND);
+						} else if (lastScreen == SCREEN_GAMELIST) {
+							GFX_animateSurface(tmpsur, 0, 0 - screen->h, 0, 0, screen->w, screen->h,
+											   CFG_getMenuTransitions() ? 100 : 20, 255, 255, LAYER_ALL);
+						} else if (lastScreen == SCREEN_GAMESWITCHER) {
 							GFX_flipHidden();
-							if(gsanimdir == SLIDE_LEFT) 
-								GFX_animateSurface(tmpsur,0+screen->w,0,0,0,screen->w,screen->h,CFG_getMenuTransitions() ? 80:20,0,255,LAYER_ALL);
-							else if(gsanimdir == SLIDE_RIGHT)
-								GFX_animateSurface(tmpsur,0-screen->w,0,0,0,screen->w,screen->h,CFG_getMenuTransitions() ? 80:20,0,255,LAYER_ALL);
+							if (gsanimdir == SLIDE_LEFT)
+								GFX_animateSurface(tmpsur, 0 + screen->w, 0, 0, 0, screen->w, screen->h,
+												   CFG_getMenuTransitions() ? 80 : 20, 0, 255, LAYER_ALL);
+							else if (gsanimdir == SLIDE_RIGHT)
+								GFX_animateSurface(tmpsur, 0 - screen->w, 0, 0, 0, screen->w, screen->h,
+												   CFG_getMenuTransitions() ? 80 : 20, 0, 255, LAYER_ALL);
 						}
 						SDL_FreeSurface(tmpsur);
 						GFX_blitMessage(font.large, "No Preview", screen, &preview_rect);
 					}
 					Entry_free(selectedEntry);
-				}
-				else {
-					SDL_Rect preview_rect = {ox,oy,screen->w,screen->h};
+				} else {
+					SDL_Rect preview_rect = {ox, oy, screen->w, screen->h};
 					SDL_FillRect(screen, &preview_rect, 0);
 					GFX_blitMessage(font.large, "No Recents", screen, &preview_rect);
-					GFX_blitButtonGroup((char*[]){ "B","BACK", NULL }, 1, screen, 1);
+					GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 1, screen, 1);
 				}
-				
+
 				GFX_flipHidden();
 
-				if(switcherSur) SDL_FreeSurface(switcherSur);
+				if (switcherSur)
+					SDL_FreeSurface(switcherSur);
 				switcherSur = GFX_captureRendererToSurface();
 				lastScreen = SCREEN_GAMESWITCHER;
-			}
-			else { // if currentscreen == SCREEN_GAMELIST
+			} else { // if currentscreen == SCREEN_GAMELIST
 				// background and game art file path stuff
-				Entry* entry = top->entries->items[top->selected];
+				Entry *entry = top->entries->items[top->selected];
 				assert(entry);
 				char tmp_path[MAX_PATH];
 				strncpy(tmp_path, entry->path, sizeof(tmp_path) - 1);
 				tmp_path[sizeof(tmp_path) - 1] = '\0';
-			
-				char* res_name = strrchr(tmp_path, '/');
-				if (res_name) res_name++;
+
+				char *res_name = strrchr(tmp_path, '/');
+				if (res_name)
+					res_name++;
 
 				char path_copy[1024];
 				strncpy(path_copy, entry->path, sizeof(path_copy) - 1);
 				path_copy[sizeof(path_copy) - 1] = '\0';
-		
-				char* rompath = dirname(path_copy);
-			
+
+				char *rompath = dirname(path_copy);
+
 				char res_copy[1024];
 				strncpy(res_copy, res_name, sizeof(res_copy) - 1);
 				res_copy[sizeof(res_copy) - 1] = '\0';
-		
-				char* dot = strrchr(res_copy, '.');
-				if (dot) *dot = '\0'; 
+
+				char *dot = strrchr(res_copy, '.');
+				if (dot)
+					*dot = '\0';
 
 				static int lastType = -1;
 
@@ -2834,9 +2988,9 @@ int main (int argc, char *argv[]) {
 				char defaultBgPath[512];
 				snprintf(defaultBgPath, sizeof(defaultBgPath), SDCARD_PATH "/bg.png");
 
-				if(((entry->type == ENTRY_DIR || entry->type == ENTRY_ROM) && CFG_getRomsUseFolderBackground())) {
-					char *newBg = entry->type == ENTRY_DIR ? entry->path:rompath;
-					if((strcmp(newBg, folderBgPath) != 0 || lastType != entry->type) && sizeof(folderBgPath) != 1) {
+				if (((entry->type == ENTRY_DIR || entry->type == ENTRY_ROM) && CFG_getRomsUseFolderBackground())) {
+					char *newBg = entry->type == ENTRY_DIR ? entry->path : rompath;
+					if ((strcmp(newBg, folderBgPath) != 0 || lastType != entry->type) && sizeof(folderBgPath) != 1) {
 						lastType = entry->type;
 						char tmppath[512];
 						strncpy(folderBgPath, newBg, sizeof(folderBgPath) - 1);
@@ -2844,61 +2998,59 @@ int main (int argc, char *argv[]) {
 							snprintf(tmppath, sizeof(tmppath), "%s/.media/bg.png", folderBgPath);
 						else if (entry->type == ENTRY_ROM)
 							snprintf(tmppath, sizeof(tmppath), "%s/.media/bglist.png", folderBgPath);
-						if(!exists(tmppath)) {
-							// Safeguard: If no background is available, still render the text to leave the user a way out
+						if (!exists(tmppath)) {
+							// Safeguard: If no background is available, still render the text to leave the user a way
+							// out
 							list_show_entry_names = true;
 							snprintf(tmppath, sizeof(tmppath), defaultBgPath, folderBgPath);
 						}
 						startLoadFolderBackground(tmppath, onBackgroundLoaded, NULL);
 					}
-				} 
-				else if(strcmp(defaultBgPath, folderBgPath) != 0 && exists(defaultBgPath)) {
+				} else if (strcmp(defaultBgPath, folderBgPath) != 0 && exists(defaultBgPath)) {
 					strncpy(folderBgPath, defaultBgPath, sizeof(folderBgPath) - 1);
 					startLoadFolderBackground(defaultBgPath, onBackgroundLoaded, NULL);
-				}
-				else {
+				} else {
 					// Safeguard: If no background is available, still render the text to leave the user a way out
 					list_show_entry_names = true;
 				}
 				// load game thumbnails
 				if (total > 0) {
-					if(CFG_getShowGameArt()) {
+					if (CFG_getShowGameArt()) {
 						char thumbpath[1024];
 						snprintf(thumbpath, sizeof(thumbpath), "%s/.media/%s.png", rompath, res_copy);
 						had_thumb = 0;
 						startLoadThumb(thumbpath, onThumbLoaded, NULL);
-						int max_w = (int)(screen->w - (screen->w * CFG_getGameArtWidth())); 
-						int max_h = (int)(screen->h * 0.6);  
+						int max_w = (int)(screen->w - (screen->w * CFG_getGameArtWidth()));
+						int max_h = (int)(screen->h * 0.6);
 						int new_w = max_w;
-						int new_h = max_h; 
-						if(exists(thumbpath)) {
-							ox = (int)(max_w) - SCALE1(BUTTON_MARGIN*5);
+						int new_h = max_h;
+						if (exists(thumbpath)) {
+							ox = (int)(max_w)-SCALE1(BUTTON_MARGIN * 5);
 							had_thumb = 1;
-						}
-						else
+						} else
 							ox = screen->w;
 					}
 				}
 
 				// buttons
-				if (show_setting && !GetHDMI()) GFX_blitHardwareHints(screen, show_setting);
-				else if (can_resume) GFX_blitButtonGroup((char*[]){ "X","RESUME",  NULL }, 0, screen, 0);
-				else GFX_blitButtonGroup((char*[]){ 
-					BTN_SLEEP==BTN_POWER?"POWER":"MENU",
-					BTN_SLEEP==BTN_POWER||simple_mode?"SLEEP":"INFO",  
-					NULL }, 0, screen, 0);
-			
-				if (total==0) {
-					if (stack->count>1) {
-						GFX_blitButtonGroup((char*[]){ "B","BACK",  NULL }, 0, screen, 1);
-					}
-				}
-				else {
-					if (stack->count>1) {
-						GFX_blitButtonGroup((char*[]){ "B","BACK", "A","OPEN", NULL }, 1, screen, 1);
+				if (show_setting && !GetHDMI())
+					GFX_blitHardwareHints(screen, show_setting);
+				else if (can_resume)
+					GFX_blitButtonGroup((char *[]){"X", "RESUME", NULL}, 0, screen, 0);
+				else
+					GFX_blitButtonGroup((char *[]){BTN_SLEEP == BTN_POWER ? "POWER" : "MENU",
+												   BTN_SLEEP == BTN_POWER || simple_mode ? "SLEEP" : "INFO", NULL},
+										0, screen, 0);
+
+				if (total == 0) {
+					if (stack->count > 1) {
+						GFX_blitButtonGroup((char *[]){"B", "BACK", NULL}, 0, screen, 1);
 					}
-					else {
-						GFX_blitButtonGroup((char*[]){ "A","OPEN", NULL }, 0, screen, 1);
+				} else {
+					if (stack->count > 1) {
+						GFX_blitButtonGroup((char *[]){"B", "BACK", "A", "OPEN", NULL}, 1, screen, 1);
+					} else {
+						GFX_blitButtonGroup((char *[]){"A", "OPEN", NULL}, 0, screen, 1);
 					}
 				}
 
@@ -2908,99 +3060,120 @@ int main (int argc, char *argv[]) {
 					previousY = remember_row * PILL_SIZE;
 					targetY = selected_row * PILL_SIZE;
 					for (int i = top->start, j = 0; i < top->end; i++, j++) {
-						Entry* entry = top->entries->items[i];
-						char* entry_name = entry->name;
-						char* entry_unique = entry->unique;
-						int available_width = MAX(0,(had_thumb ? ox + SCALE1(BUTTON_MARGIN) : screen->w - SCALE1(BUTTON_MARGIN)) - SCALE1(PADDING * 2));
-						if (i == top->start && !(had_thumb)) available_width -= ow;
+						Entry *entry = top->entries->items[i];
+						char *entry_name = entry->name;
+						char *entry_unique = entry->unique;
+						int available_width =
+							MAX(0, (had_thumb ? ox + SCALE1(BUTTON_MARGIN) : screen->w - SCALE1(BUTTON_MARGIN)) -
+									   SCALE1(PADDING * 2));
+						if (i == top->start && !(had_thumb))
+							available_width -= ow;
 						trimSortingMeta(&entry_name);
 
 						if (entry_unique) // Only render if a unique name exists
 							trimSortingMeta(&entry_unique);
-						
+
 						char display_name[256];
-						int text_width = GFX_getTextWidth(font.large, entry_unique ? entry_unique : entry_name,display_name, available_width, SCALE1(BUTTON_PADDING * 2));
+						int text_width = GFX_getTextWidth(font.large, entry_unique ? entry_unique : entry_name,
+														  display_name, available_width, SCALE1(BUTTON_PADDING * 2));
 
 						int max_width = MIN(available_width, text_width);
-					
+
 						SDL_Color text_color = uintToColour(THEME_COLOR4_255);
 						int notext = 0;
-						if(selected_row == remember_row && j == selected_row && (selected_row+1 >= (top->end-top->start) || selected_row == 0 || selected_row == remember_row)) {
+						if (selected_row == remember_row && j == selected_row &&
+							(selected_row + 1 >= (top->end - top->start) || selected_row == 0 ||
+							 selected_row == remember_row)) {
 							text_color = uintToColour(THEME_COLOR5_255);
-							notext=1;
+							notext = 1;
 						}
-						SDL_Surface* text = TTF_RenderUTF8_Blended(font.large, entry_name, text_color);
-						SDL_Surface* text_unique = TTF_RenderUTF8_Blended(font.large, display_name, COLOR_DARK_TEXT);
+						SDL_Surface *text = TTF_RenderUTF8_Blended(font.large, entry_name, text_color);
+						SDL_Surface *text_unique = TTF_RenderUTF8_Blended(font.large, display_name, COLOR_DARK_TEXT);
 						const int text_offset_y = (SCALE1(PILL_SIZE) - text->h + 1) >> 1;
 						if (j == selected_row) {
-							is_scrolling = GFX_resetScrollText(font.large,display_name, max_width - SCALE1(BUTTON_PADDING*2));
+							is_scrolling =
+								GFX_resetScrollText(font.large, display_name, max_width - SCALE1(BUTTON_PADDING * 2));
 							bool is_scrolling = remember_depth == stack->count;
 							SDL_LockMutex(animMutex);
-							if(globalpill) { SDL_FreeSurface(globalpill); globalpill=NULL; }
-							globalpill = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, max_width, SCALE1(PILL_SIZE), FIXED_DEPTH, SDL_PIXELFORMAT_RGBA8888);
-							GFX_blitPillDark(ASSET_WHITE_PILL, globalpill, &(SDL_Rect){0,0, max_width, SCALE1(PILL_SIZE)});
-							globallpillW =  max_width;
+							if (globalpill) {
+								SDL_FreeSurface(globalpill);
+								globalpill = NULL;
+							}
+							globalpill = SDL_CreateRGBSurfaceWithFormat(SDL_SWSURFACE, max_width, SCALE1(PILL_SIZE),
+																		FIXED_DEPTH, SDL_PIXELFORMAT_RGBA8888);
+							GFX_blitPillDark(ASSET_WHITE_PILL, globalpill,
+											 &(SDL_Rect){0, 0, max_width, SCALE1(PILL_SIZE)});
+							globallpillW = max_width;
 							SDL_UnlockMutex(animMutex);
-							AnimTask* task = malloc(sizeof(AnimTask));
+							AnimTask *task = malloc(sizeof(AnimTask));
 							task->startX = SCALE1(BUTTON_MARGIN);
-							task->startY = SCALE1(previousY+PADDING);
+							task->startY = SCALE1(previousY + PADDING);
 							task->targetX = SCALE1(BUTTON_MARGIN);
-							task->targetY = SCALE1(targetY+PADDING);
+							task->targetY = SCALE1(targetY + PADDING);
 							task->targetTextY = SCALE1(PADDING + targetY) + text_offset_y;
 							pilltargetTextY = +screen->w;
 							task->move_w = max_width;
 							task->move_h = SCALE1(PILL_SIZE);
-							task->frames = is_scrolling && CFG_getMenuAnimations() ? 3:0;
-							task->entry_name = notext ? " ":entry_name;
+							task->frames = is_scrolling && CFG_getMenuAnimations() ? 3 : 0;
+							task->entry_name = notext ? " " : entry_name;
 							animPill(task);
 						}
-						SDL_Rect text_rect = { 0, 0, max_width - SCALE1(BUTTON_PADDING*2), text->h };
-						SDL_Rect dest_rect = { SCALE1(BUTTON_MARGIN + BUTTON_PADDING), SCALE1(PADDING + (j * PILL_SIZE)) + text_offset_y };
+						SDL_Rect text_rect = {0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h};
+						SDL_Rect dest_rect = {SCALE1(BUTTON_MARGIN + BUTTON_PADDING),
+											  SCALE1(PADDING + (j * PILL_SIZE)) + text_offset_y};
 
-						if(list_show_entry_names) {
+						if (list_show_entry_names) {
 							SDL_BlitSurface(text_unique, &text_rect, screen, &dest_rect);
 							SDL_BlitSurface(text, &text_rect, screen, &dest_rect);
 						}
 						SDL_FreeSurface(text_unique); // Free after use
-						SDL_FreeSurface(text); // Free after use
+						SDL_FreeSurface(text);		  // Free after use
 					}
-					if(lastScreen==SCREEN_GAMESWITCHER) {
-						if(switcherSur) {
+					if (lastScreen == SCREEN_GAMESWITCHER) {
+						if (switcherSur) {
 							// update cpu surface here first
 							GFX_clearLayers(LAYER_ALL);
-							folderbgchanged=1;
-							
+							folderbgchanged = 1;
+
 							GFX_flipHidden();
-							GFX_animateSurface(switcherSur,0,0,0,0-screen->h,screen->w,screen->h,CFG_getMenuTransitions() ? 100:20,255,255,LAYER_BACKGROUND);
+							GFX_animateSurface(switcherSur, 0, 0, 0, 0 - screen->h, screen->w, screen->h,
+											   CFG_getMenuTransitions() ? 100 : 20, 255, 255, LAYER_BACKGROUND);
 							animationdirection = ANIM_NONE;
 						}
 					}
-					if(lastScreen==SCREEN_OFF) {
-						GFX_animateSurfaceOpacity(blackBG,0,0,screen->w,screen->h,255,0,CFG_getMenuTransitions() ? 200:20,LAYER_THUMBNAIL);
+					if (lastScreen == SCREEN_OFF) {
+						GFX_animateSurfaceOpacity(blackBG, 0, 0, screen->w, screen->h, 255, 0,
+												  CFG_getMenuTransitions() ? 200 : 20, LAYER_THUMBNAIL);
 					}
-		
+
 					remember_row = selected_row;
 					remember_depth = stack->count;
-				}
-				else {
+				} else {
 					// TODO: for some reason screen's dimensions end up being 0x0 in GFX_blitMessage...
-					GFX_blitMessage(font.large, "Empty folder", screen, &(SDL_Rect){0,0,screen->w,screen->h}); //, NULL);
+					GFX_blitMessage(font.large, "Empty folder", screen,
+									&(SDL_Rect){0, 0, screen->w, screen->h}); //, NULL);
 				}
-				
+
 				lastScreen = SCREEN_GAMELIST;
 			}
 
-			if(animationdirection != ANIM_NONE) {
-				if(CFG_getMenuTransitions()) {
+			if (animationdirection != ANIM_NONE) {
+				if (CFG_getMenuTransitions()) {
 					GFX_clearLayers(LAYER_BACKGROUND);
 					folderbgchanged = 1;
 					GFX_clearLayers(LAYER_TRANSITION);
 					GFX_flipHidden();
 					SDL_Surface *tmpNewScreen = GFX_captureRendererToSurface();
-					SDL_SetSurfaceBlendMode(tmpNewScreen,SDL_BLENDMODE_BLEND);
+					SDL_SetSurfaceBlendMode(tmpNewScreen, SDL_BLENDMODE_BLEND);
 					GFX_clearLayers(LAYER_THUMBNAIL);
-					if(animationdirection == SLIDE_LEFT) GFX_animateAndFadeSurface(tmpOldScreen,0,0,0-FIXED_WIDTH,0,FIXED_WIDTH,FIXED_HEIGHT,200,tmpNewScreen,1,0,FIXED_WIDTH,FIXED_HEIGHT,0,255,LAYER_THUMBNAIL);
-					if(animationdirection == SLIDE_RIGHT) GFX_animateAndFadeSurface(tmpOldScreen,0,0,0+FIXED_WIDTH,0,FIXED_WIDTH,FIXED_HEIGHT,200,tmpNewScreen,1,0,FIXED_WIDTH,FIXED_HEIGHT,0,255,LAYER_THUMBNAIL);
+					if (animationdirection == SLIDE_LEFT)
+						GFX_animateAndFadeSurface(tmpOldScreen, 0, 0, 0 - FIXED_WIDTH, 0, FIXED_WIDTH, FIXED_HEIGHT,
+												  200, tmpNewScreen, 1, 0, FIXED_WIDTH, FIXED_HEIGHT, 0, 255,
+												  LAYER_THUMBNAIL);
+					if (animationdirection == SLIDE_RIGHT)
+						GFX_animateAndFadeSurface(tmpOldScreen, 0, 0, 0 + FIXED_WIDTH, 0, FIXED_WIDTH, FIXED_HEIGHT,
+												  200, tmpNewScreen, 1, 0, FIXED_WIDTH, FIXED_HEIGHT, 0, 255,
+												  LAYER_THUMBNAIL);
 					GFX_clearLayers(LAYER_THUMBNAIL);
 					SDL_FreeSurface(tmpNewScreen);
 				}
@@ -3008,104 +3181,106 @@ int main (int argc, char *argv[]) {
 				animationdirection = ANIM_NONE;
 			}
 
-			if(lastScreen == SCREEN_QUICKMENU) {
+			if (lastScreen == SCREEN_QUICKMENU) {
 				SDL_LockMutex(bgMutex);
-				if(folderbgchanged) {
-					if(folderbgbmp)
-						GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,LAYER_BACKGROUND);
+				if (folderbgchanged) {
+					if (folderbgbmp)
+						GFX_drawOnLayer(folderbgbmp, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
 					else
 						GFX_clearLayers(LAYER_BACKGROUND);
 					folderbgchanged = 0;
 				}
 				SDL_UnlockMutex(bgMutex);
-			}
-			else if(lastScreen == SCREEN_GAMELIST) {
+			} else if (lastScreen == SCREEN_GAMELIST) {
 				SDL_LockMutex(bgMutex);
-				if(folderbgchanged) {
-					if(folderbgbmp)
-						GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,LAYER_BACKGROUND);
+				if (folderbgchanged) {
+					if (folderbgbmp)
+						GFX_drawOnLayer(folderbgbmp, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
 					else
 						GFX_clearLayers(LAYER_BACKGROUND);
 					folderbgchanged = 0;
 				}
 				SDL_UnlockMutex(bgMutex);
 				SDL_LockMutex(thumbMutex);
-				if(thumbbmp && thumbchanged) {
+				if (thumbbmp && thumbchanged) {
 					int img_w = thumbbmp->w;
 					int img_h = thumbbmp->h;
 					double aspect_ratio = (double)img_h / img_w;
-					int max_w = (int)(screen->w * CFG_getGameArtWidth()); 
-					int max_h = (int)(screen->h * 0.6);  
+					int max_w = (int)(screen->w * CFG_getGameArtWidth());
+					int max_h = (int)(screen->h * 0.6);
 					int new_w = max_w;
-					int new_h = (int)(new_w * aspect_ratio); 
-					
+					int new_h = (int)(new_w * aspect_ratio);
+
 					if (new_h > max_h) {
 						new_h = max_h;
 						new_w = (int)(new_h / aspect_ratio);
 					}
 
-					int target_x = screen->w-(new_w + SCALE1(BUTTON_MARGIN*3));
+					int target_x = screen->w - (new_w + SCALE1(BUTTON_MARGIN * 3));
 					int target_y = (int)(screen->h * 0.50);
 					int center_y = target_y - (new_h / 2); // FIX: use new_h instead of thumbbmp->h
 					GFX_clearLayers(LAYER_THUMBNAIL);
-					GFX_drawOnLayer(thumbbmp,target_x,center_y,new_w,new_h,1.0f,0,LAYER_THUMBNAIL);
-				} else if(thumbchanged) {
+					GFX_drawOnLayer(thumbbmp, target_x, center_y, new_w, new_h, 1.0f, 0, LAYER_THUMBNAIL);
+				} else if (thumbchanged) {
 					GFX_clearLayers(LAYER_THUMBNAIL);
 				}
 				SDL_UnlockMutex(thumbMutex);
 
 				GFX_clearLayers(LAYER_TRANSITION);
 				GFX_clearLayers(LAYER_SCROLLTEXT);
-				
+
 				SDL_LockMutex(animMutex);
 				if (list_show_entry_names) {
-					GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0, LAYER_TRANSITION);
-					// GFX_drawOnLayer(globalText, SCALE1(PADDING+BUTTON_PADDING), pilltargetTextY, globalText->w, globalText->h, 1.0f, 0, LAYER_SCROLLTEXT);
+					GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0,
+									LAYER_TRANSITION);
+					// GFX_drawOnLayer(globalText, SCALE1(PADDING+BUTTON_PADDING), pilltargetTextY, globalText->w,
+					// globalText->h, 1.0f, 0, LAYER_SCROLLTEXT);
 				}
 				SDL_UnlockMutex(animMutex);
 			}
-			if(!startgame) // dont flip if game gonna start
+			if (!startgame) // dont flip if game gonna start
 				GFX_flip(screen);
 
 			dirty = 0;
-		} else if(animationDraw || folderbgchanged || thumbchanged || is_scrolling) {
-			// honestly this whole thing is here only for the scrolling text, I set it now to run this at 30fps which is enough for scrolling text, should move this to seperate animation function eventually
+		} else if (animationDraw || folderbgchanged || thumbchanged || is_scrolling) {
+			// honestly this whole thing is here only for the scrolling text, I set it now to run this at 30fps which is
+			// enough for scrolling text, should move this to seperate animation function eventually
 			Uint32 now = SDL_GetTicks();
 			Uint32 frame_start = now;
 			static char cached_display_name[256] = "";
 			SDL_LockMutex(bgMutex);
-			if(folderbgchanged) {
-				if(folderbgbmp)
-					GFX_drawOnLayer(folderbgbmp,0, 0, screen->w, screen->h,1.0f,0,LAYER_BACKGROUND);
-				else 
+			if (folderbgchanged) {
+				if (folderbgbmp)
+					GFX_drawOnLayer(folderbgbmp, 0, 0, screen->w, screen->h, 1.0f, 0, LAYER_BACKGROUND);
+				else
 					GFX_clearLayers(LAYER_BACKGROUND);
 				folderbgchanged = 0;
 			}
 			SDL_UnlockMutex(bgMutex);
 			SDL_LockMutex(thumbMutex);
-			if(thumbbmp && thumbchanged) {
+			if (thumbbmp && thumbchanged) {
 				int img_w = thumbbmp->w;
 				int img_h = thumbbmp->h;
 				double aspect_ratio = (double)img_h / img_w;
-				
-				int max_w = (int)(screen->w * CFG_getGameArtWidth()); 
-				int max_h = (int)(screen->h * 0.6);  
-				
+
+				int max_w = (int)(screen->w * CFG_getGameArtWidth());
+				int max_h = (int)(screen->h * 0.6);
+
 				int new_w = max_w;
-				int new_h = (int)(new_w * aspect_ratio); 
-				
+				int new_h = (int)(new_w * aspect_ratio);
+
 				if (new_h > max_h) {
 					new_h = max_h;
 					new_w = (int)(new_h / aspect_ratio);
 				}
-	
-				int target_x = screen->w-(new_w + SCALE1(BUTTON_MARGIN*3));
+
+				int target_x = screen->w - (new_w + SCALE1(BUTTON_MARGIN * 3));
 				int target_y = (int)(screen->h * 0.50);
 				int center_y = target_y - (new_h / 2); // FIX: use new_h instead of thumbbmp->h
 				GFX_clearLayers(LAYER_THUMBNAIL);
-				GFX_drawOnLayer(thumbbmp,target_x,center_y,new_w,new_h,1.0f,0,LAYER_THUMBNAIL);
+				GFX_drawOnLayer(thumbbmp, target_x, center_y, new_w, new_h, 1.0f, 0, LAYER_THUMBNAIL);
 				thumbchanged = 0;
-			} else if(thumbchanged) {
+			} else if (thumbchanged) {
 				GFX_clearLayers(LAYER_THUMBNAIL);
 				thumbchanged = 0;
 			}
@@ -3114,78 +3289,76 @@ int main (int argc, char *argv[]) {
 			if (animationDraw) {
 				GFX_clearLayers(LAYER_TRANSITION);
 				if (list_show_entry_names)
-					GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0, LAYER_TRANSITION);
+					GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0,
+									LAYER_TRANSITION);
 				animationDraw = 0;
 			}
 			SDL_UnlockMutex(animMutex);
 			if (currentScreen != SCREEN_GAMESWITCHER && currentScreen != SCREEN_QUICKMENU) {
-				if(is_scrolling && pillanimdone && currentAnimQueueSize < 1) {
+				if (is_scrolling && pillanimdone && currentAnimQueueSize < 1) {
 					int ow = GFX_blitHardwareGroup(screen, show_setting);
-					Entry* entry = top->entries->items[top->selected];
+					Entry *entry = top->entries->items[top->selected];
 					trimSortingMeta(&entry->name);
-					char* entry_text = entry->name;
+					char *entry_text = entry->name;
 					if (entry->unique) {
 						trimSortingMeta(&entry->unique);
 						entry_text = entry->unique;
 					}
 
-					int available_width = (had_thumb ? ox + SCALE1(BUTTON_MARGIN) : screen->w - SCALE1(BUTTON_MARGIN)) - SCALE1(PADDING * 2);
-					if (top->selected == top->start && !had_thumb) available_width -= ow;
+					int available_width = (had_thumb ? ox + SCALE1(BUTTON_MARGIN) : screen->w - SCALE1(BUTTON_MARGIN)) -
+										  SCALE1(PADDING * 2);
+					if (top->selected == top->start && !had_thumb)
+						available_width -= ow;
 
 					SDL_Color text_color = uintToColour(THEME_COLOR5_255);
 
-					int text_width = GFX_getTextWidth(font.large, entry_text, cached_display_name, available_width, SCALE1(BUTTON_PADDING * 2));
+					int text_width = GFX_getTextWidth(font.large, entry_text, cached_display_name, available_width,
+													  SCALE1(BUTTON_PADDING * 2));
 					int max_width = MIN(available_width, text_width);
 					int text_offset_y = (SCALE1(PILL_SIZE) - TTF_FontHeight(font.large) + 1) >> 1;
-				
+
 					GFX_clearLayers(LAYER_SCROLLTEXT);
 					if (list_show_entry_names) {
-						GFX_scrollTextTexture(
-							font.large,
-							entry_text,
-							SCALE1(BUTTON_MARGIN + BUTTON_PADDING), SCALE1(PADDING + remember_row * PILL_SIZE) + text_offset_y,
-							max_width - SCALE1(BUTTON_PADDING * 2),
-							0,
-							text_color,
-							1
-						);
+						GFX_scrollTextTexture(font.large, entry_text, SCALE1(BUTTON_MARGIN + BUTTON_PADDING),
+											  SCALE1(PADDING + remember_row * PILL_SIZE) + text_offset_y,
+											  max_width - SCALE1(BUTTON_PADDING * 2), 0, text_color, 1);
 					}
-				}
-				else {
+				} else {
 					GFX_clearLayers(LAYER_TRANSITION);
 					GFX_clearLayers(LAYER_SCROLLTEXT);
 					SDL_LockMutex(animMutex);
 					if (list_show_entry_names) {
-						GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0, LAYER_TRANSITION);
-						GFX_drawOnLayer(globalText, SCALE1(BUTTON_MARGIN + BUTTON_PADDING),pilltargetTextY, globalText->w, globalText->h, 1.0f, 0, LAYER_SCROLLTEXT);
+						GFX_drawOnLayer(globalpill, pillRect.x, pillRect.y, globallpillW, globalpill->h, 1.0f, 0,
+										LAYER_TRANSITION);
+						GFX_drawOnLayer(globalText, SCALE1(BUTTON_MARGIN + BUTTON_PADDING), pilltargetTextY,
+										globalText->w, globalText->h, 1.0f, 0, LAYER_SCROLLTEXT);
 					}
 					SDL_UnlockMutex(animMutex);
 					PLAT_GPU_Flip();
-				} 
-			}
-			else {
+				}
+			} else {
 				SDL_Delay(100); // why are we running long delays on the render thread, wtf?
 			}
 			dirty = 0;
-		} 
-		else {
+		} else {
 			// want to draw only if needed
 			SDL_LockMutex(bgqueueMutex);
 			SDL_LockMutex(thumbqueueMutex);
 			SDL_LockMutex(animqueueMutex);
-			if(needDraw) {
+			if (needDraw) {
 				PLAT_GPU_Flip();
 				needDraw = 0;
 			} else {
 				// TODO: Why 17? Seems like an odd choice for 60fps, it almost guarantees we miss at least one frame.
-				// This should either be 16(.66666667) or make proper use of SDL_Ticks to only wait for the next render pass.
-				SDL_Delay(17); 
+				// This should either be 16(.66666667) or make proper use of SDL_Ticks to only wait for the next render
+				// pass.
+				SDL_Delay(17);
 			}
 			SDL_UnlockMutex(animqueueMutex);
 			SDL_UnlockMutex(thumbqueueMutex);
 			SDL_UnlockMutex(bgqueueMutex);
 		}
-	
+
 		SDL_LockMutex(frameMutex);
 		frameReady = true;
 		SDL_CondSignal(flipCond);
@@ -3198,20 +3371,24 @@ int main (int argc, char *argv[]) {
 		// handle HDMI change
 		static int had_hdmi = -1;
 		int has_hdmi = GetHDMI();
-		if (had_hdmi==-1) had_hdmi = has_hdmi;
-		if (has_hdmi!=had_hdmi) {
+		if (had_hdmi == -1)
+			had_hdmi = has_hdmi;
+		if (has_hdmi != had_hdmi) {
 			had_hdmi = has_hdmi;
 
-			Entry* entry = top->entries->items[top->selected];
+			Entry *entry = top->entries->items[top->selected];
 			LOG_info("restarting after HDMI change... (%s)\n", entry->path);
 			saveLast(entry->path); // NOTE: doesn't work in Recents (by design)
 			sleep(4);
 			quit = 1;
 		}
 	}
-	if(blackBG)	SDL_FreeSurface(blackBG);
-	if (folderbgbmp) SDL_FreeSurface(folderbgbmp);
-	if (thumbbmp) SDL_FreeSurface(thumbbmp);
+	if (blackBG)
+		SDL_FreeSurface(blackBG);
+	if (folderbgbmp)
+		SDL_FreeSurface(folderbgbmp);
+	if (thumbbmp)
+		SDL_FreeSurface(thumbbmp);
 
 	Menu_quit();
 	PWR_quit();
diff --git a/workspace/all/nextval/nextval.c b/workspace/all/nextval/nextval.c
index fc68bf40a..b54c84d47 100644
--- a/workspace/all/nextval/nextval.c
+++ b/workspace/all/nextval/nextval.c
@@ -6,42 +6,41 @@
 
 void printUsage()
 {
-    printf("usage: nextval <key>\n");
+	printf("usage: nextval <key>\n");
 }
 
 int main(int argc, char *argv[])
 {
-    CFG_init(NULL, NULL);
+	CFG_init(NULL, NULL);
 
-    if (argc <= 1) {
-        CFG_print();
-        return EXIT_SUCCESS;
-    }
+	if (argc <= 1) {
+		CFG_print();
+		return EXIT_SUCCESS;
+	}
 
-    if (strcmp(argv[1], "-h") == 0
-       || strcmp(argv[1], "--help") == 0) {
-        printUsage();
-    }
-    // get
-    // not really maintainable this way, this should really all be c++ with proper type deduction
-    // instead of naive copy paste
-    else if (argc == 2) {
-        char setting_value[MAX_PATH];
-        CFG_get(argv[1], setting_value);
-        if(strcmp(setting_value, "") != 0)
-            printf("{\"%s\": %s}\n", argv[1], setting_value);
-        else
-            printf("{}\n");
-    }
-    // set
-    //else if(argc == 3) {
-    //
-    //}
-    else {
-        printf("Error: Invalid argument '%s'\n", argv[1]);
-        printUsage();
-        return EXIT_FAILURE;
-    }
+	if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) {
+		printUsage();
+	}
+	// get
+	// not really maintainable this way, this should really all be c++ with proper type deduction
+	// instead of naive copy paste
+	else if (argc == 2) {
+		char setting_value[MAX_PATH];
+		CFG_get(argv[1], setting_value);
+		if (strcmp(setting_value, "") != 0)
+			printf("{\"%s\": %s}\n", argv[1], setting_value);
+		else
+			printf("{}\n");
+	}
+	// set
+	// else if(argc == 3) {
+	//
+	//}
+	else {
+		printf("Error: Invalid argument '%s'\n", argv[1]);
+		printUsage();
+		return EXIT_FAILURE;
+	}
 
-    return EXIT_SUCCESS;
+	return EXIT_SUCCESS;
 }
\ No newline at end of file
diff --git a/workspace/all/settings/btmenu.cpp b/workspace/all/settings/btmenu.cpp
index 4fab2c217..4596a6057 100644
--- a/workspace/all/settings/btmenu.cpp
+++ b/workspace/all/settings/btmenu.cpp
@@ -13,358 +13,353 @@ typedef std::shared_lock<Lock> ReadLock;
 using namespace Bluetooth;
 using namespace std::placeholders;
 
-Menu::Menu(const int &globalQuit, int &globalDirty) : MenuList(MenuItemType::Fixed, "Network", {}), globalQuit(globalQuit), globalDirty(globalDirty)
+Menu::Menu(const int &globalQuit, int &globalDirty)
+	: MenuList(MenuItemType::Fixed, "Network", {}), globalQuit(globalQuit), globalDirty(globalDirty)
 {
-    toggleItem = new MenuItem(ListItemType::Generic, "Bluetooth", "Enable/disable Bluetooth", {false, true}, {"Off", "On"},
-                              std::bind(&Menu::getBtToggleState, this),
-                              std::bind(&Menu::setBtToggleState, this, std::placeholders::_1),
-                              std::bind(&Menu::resetBtToggleState, this));
-    diagItem = new MenuItem(ListItemType::Generic, "Bluetooth diagnostics", "Enable/disable Bluetooth logging", {false, true}, {"Off", "On"},
-                              std::bind(&Menu::getBtDiagnosticsState, this),
-                              std::bind(&Menu::setBtDiagnosticsState, this, std::placeholders::_1),
-                              std::bind(&Menu::resetBtDiagnosticsState, this));
-    rateItem = new MenuItem(ListItemType::Generic, "Maximmum sampling rate", "44100 Hz: better compatibility\n48000 Hz: better quality", {44100, 48000}, {"44100 Hz", "48000 Hz"},
-                              std::bind(&Menu::getSamplerateMaximum, this),
-                              std::bind(&Menu::setSamplerateMaximum, this, std::placeholders::_1),
-                              std::bind(&Menu::resetSamplerateMaximum, this));
-    items.push_back(toggleItem);
-    items.push_back(diagItem);
-    items.push_back(rateItem);
-
-    // best effort layout based on the platform defines, user should really call performLayout manually
-    MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-    layout_called = false;
-
-    worker = std::thread{&Menu::updater, this};
+	toggleItem = new MenuItem(ListItemType::Generic, "Bluetooth", "Enable/disable Bluetooth", {false, true},
+							  {"Off", "On"}, std::bind(&Menu::getBtToggleState, this),
+							  std::bind(&Menu::setBtToggleState, this, std::placeholders::_1),
+							  std::bind(&Menu::resetBtToggleState, this));
+	diagItem = new MenuItem(ListItemType::Generic, "Bluetooth diagnostics", "Enable/disable Bluetooth logging",
+							{false, true}, {"Off", "On"}, std::bind(&Menu::getBtDiagnosticsState, this),
+							std::bind(&Menu::setBtDiagnosticsState, this, std::placeholders::_1),
+							std::bind(&Menu::resetBtDiagnosticsState, this));
+	rateItem = new MenuItem(ListItemType::Generic, "Maximmum sampling rate",
+							"44100 Hz: better compatibility\n48000 Hz: better quality", {44100, 48000},
+							{"44100 Hz", "48000 Hz"}, std::bind(&Menu::getSamplerateMaximum, this),
+							std::bind(&Menu::setSamplerateMaximum, this, std::placeholders::_1),
+							std::bind(&Menu::resetSamplerateMaximum, this));
+	items.push_back(toggleItem);
+	items.push_back(diagItem);
+	items.push_back(rateItem);
+
+	// best effort layout based on the platform defines, user should really call performLayout manually
+	MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+	layout_called = false;
+
+	worker = std::thread{&Menu::updater, this};
 }
 
 Menu::~Menu()
 {
-    quit = true;
-    if (worker.joinable())
-        worker.join();
+	quit = true;
+	if (worker.joinable())
+		worker.join();
 }
 
 InputReactionHint Menu::handleInput(int &dirty, int &quit)
 {
-    auto ret = MenuList::handleInput(dirty, quit);
-    if (selectionDirty)
-    {
-        dirty = true;
-        selectionDirty = false; // handled
-        //LOG_info("collected selectionDirty\n");
-    }
-    return ret;
+	auto ret = MenuList::handleInput(dirty, quit);
+	if (selectionDirty) {
+		dirty = true;
+		selectionDirty = false; // handled
+								// LOG_info("collected selectionDirty\n");
+	}
+	return ret;
 }
 
 std::any Menu::getBtToggleState() const
 {
-    return BT_enabled();
+	return BT_enabled();
 }
 
 void Menu::setBtToggleState(const std::any &on)
 {
-    BT_enable(std::any_cast<bool>(on));
+	BT_enable(std::any_cast<bool>(on));
 }
 
 void Menu::resetBtToggleState()
 {
-    //
+	//
 }
 
 std::any Menu::getBtDiagnosticsState() const
 {
-    return BT_diagnosticsEnabled();
+	return BT_diagnosticsEnabled();
 }
 
 void Menu::setBtDiagnosticsState(const std::any &on)
 {
-    BT_diagnosticsEnable(std::any_cast<bool>(on));
+	BT_diagnosticsEnable(std::any_cast<bool>(on));
 }
 
 void Menu::resetBtDiagnosticsState()
 {
-    //
+	//
 }
 
 std::any Menu::getSamplerateMaximum() const
 {
-    return CFG_getBluetoothSamplingrateLimit();
+	return CFG_getBluetoothSamplingrateLimit();
 }
 
 void Menu::setSamplerateMaximum(const std::any &value)
 {
-    CFG_setBluetoothSamplingrateLimit(std::any_cast<int>(value));
+	CFG_setBluetoothSamplingrateLimit(std::any_cast<int>(value));
 }
 
 void Menu::resetSamplerateMaximum()
 {
-    CFG_setBluetoothSamplingrateLimit(CFG_DEFAULT_BLUETOOTH_MAXRATE);
+	CFG_setBluetoothSamplingrateLimit(CFG_DEFAULT_BLUETOOTH_MAXRATE);
 }
 
-template <typename Map>
-bool key_compare(Map const &lhs, Map const &rhs)
+template <typename Map> bool key_compare(Map const &lhs, Map const &rhs)
 {
-    return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin(),
-                                                  [](auto a, auto b)
-                                                  { return a.first == b.first; });
+	return lhs.size() == rhs.size() &&
+		   std::equal(lhs.begin(), lhs.end(), rhs.begin(), [](auto a, auto b) { return a.first == b.first; });
 }
 
 void Menu::updater()
 {
-    int pollSecs = 15;
-
-    while (!quit && !globalQuit)
-    {
-        // TODO: pause when menu is not rendered
-        // TODO: improve repaint logic in a way that remembers selection
-        // Scan
-        if (BT_enabled())
-        {
-            if(!BT_discovering())
-                BT_discovery(true);
-
-            std::map<std::string, BT_devicePaired> pairedMap;
-            std::vector<BT_devicePaired> kl(SCAN_MAX_RESULTS);
-            int known = BT_pairedDevices(kl.data(), SCAN_MAX_RESULTS);
-            for (int i = 0; i < known; i++)
-                pairedMap.emplace(kl[i].remote_name, kl[i]);
-
-            // grab list and compare it to previous result
-            // only relayout the menu if changes happended
-            std::map<std::string, BT_device> scanMap;
-            std::vector<BT_device> sr(SCAN_MAX_RESULTS);
-            int cnt = BT_availableDevices(sr.data(), SCAN_MAX_RESULTS);
-            for (int i = 0; i < cnt; i++)
-                scanMap.emplace(sr[i].name, sr[i]);
-
-            // dont repopulate if any submenu is open
-            bool menuOpen = false;
-            for (auto i : items)
-            {
-                if (i->isDeferred())
-                {
-                    menuOpen = true;
-                    break;
-                }
-            }
-
-            // something changed?
-            if (!menuOpen)
-            {
-                // remember selection and restore
-                std::string selectedName;
-                bool selectionApplied = false;
-
-                {
-                    WriteLock w(itemLock);
-                    selectedName = getSelectedItemName();
-                    items.clear();
-                    items.push_back(toggleItem);
-                    items.push_back(diagItem);
-                    items.push_back(rateItem);
-                    layout_called = false;
-
-                    for (auto &[s, r] : scanMap)
-                    {
-                        MenuList *options;
-                        options = new MenuList(MenuItemType::List, "Options", {new PairNewItem(r, selectionDirty)});
-                        auto itm = new PairableItem{r, options};
-                        items.push_back(itm);
-                    }
-
-                    for (auto &[s, r] : pairedMap)
-                    {
-                        MenuList *options;
-                        if (r.is_connected)
-                        {
-                            options = new MenuList(MenuItemType::List, "Options", {
-                                                                                    new DisconnectKnownItem(r, selectionDirty),
-                                                                                    new UnpairItem(r, selectionDirty),
-                                                                                });
-                        }
-                        else
-                        {
-                            options = new MenuList(MenuItemType::List, "Options", {
-                                                                                    new ConnectKnownItem(r, selectionDirty),
-                                                                                    new UnpairItem(r, selectionDirty),
-                                                                                });
-                        }
-                        auto itm = new PairedItem{r, options};
-                        itm->setDesc(std::string(r.remote_addr) + " | " + std::to_string(r.rssi));
-                        items.push_back(itm);
-                    }
-                }
-                MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-
-                // Attempt to restore prev selection
-                selectionApplied = selectByName(selectedName);
-                globalDirty |= selectionApplied;
-                // If selection was restored, we already called performLayout internally
-                selectionDirty |= !selectionApplied;
-            }
-            pollSecs = 2;
-        }
-        else
-        {
-            WriteLock w(itemLock);
-            items.clear();
-            items.push_back(toggleItem);
-            items.push_back(diagItem);
-            items.push_back(rateItem);
-            layout_called = false;
-            selectionDirty = true;
-            pollSecs = 15;
-        }
-
-        // reset selection scope (locks internally)
-        if (selectionDirty)
-        {
-            MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-            selectionDirty = false;
-        }
-
-        std::this_thread::sleep_for(std::chrono::seconds(pollSecs));
-    }
+	int pollSecs = 15;
+
+	while (!quit && !globalQuit) {
+		// TODO: pause when menu is not rendered
+		// TODO: improve repaint logic in a way that remembers selection
+		// Scan
+		if (BT_enabled()) {
+			if (!BT_discovering())
+				BT_discovery(true);
+
+			std::map<std::string, BT_devicePaired> pairedMap;
+			std::vector<BT_devicePaired> kl(SCAN_MAX_RESULTS);
+			int known = BT_pairedDevices(kl.data(), SCAN_MAX_RESULTS);
+			for (int i = 0; i < known; i++)
+				pairedMap.emplace(kl[i].remote_name, kl[i]);
+
+			// grab list and compare it to previous result
+			// only relayout the menu if changes happended
+			std::map<std::string, BT_device> scanMap;
+			std::vector<BT_device> sr(SCAN_MAX_RESULTS);
+			int cnt = BT_availableDevices(sr.data(), SCAN_MAX_RESULTS);
+			for (int i = 0; i < cnt; i++)
+				scanMap.emplace(sr[i].name, sr[i]);
+
+			// dont repopulate if any submenu is open
+			bool menuOpen = false;
+			for (auto i : items) {
+				if (i->isDeferred()) {
+					menuOpen = true;
+					break;
+				}
+			}
+
+			// something changed?
+			if (!menuOpen) {
+				// remember selection and restore
+				std::string selectedName;
+				bool selectionApplied = false;
+
+				{
+					WriteLock w(itemLock);
+					selectedName = getSelectedItemName();
+					items.clear();
+					items.push_back(toggleItem);
+					items.push_back(diagItem);
+					items.push_back(rateItem);
+					layout_called = false;
+
+					for (auto &[s, r] : scanMap) {
+						MenuList *options;
+						options = new MenuList(MenuItemType::List, "Options", {new PairNewItem(r, selectionDirty)});
+						auto itm = new PairableItem{r, options};
+						items.push_back(itm);
+					}
+
+					for (auto &[s, r] : pairedMap) {
+						MenuList *options;
+						if (r.is_connected) {
+							options = new MenuList(MenuItemType::List, "Options",
+												   {
+													   new DisconnectKnownItem(r, selectionDirty),
+													   new UnpairItem(r, selectionDirty),
+												   });
+						} else {
+							options = new MenuList(MenuItemType::List, "Options",
+												   {
+													   new ConnectKnownItem(r, selectionDirty),
+													   new UnpairItem(r, selectionDirty),
+												   });
+						}
+						auto itm = new PairedItem{r, options};
+						itm->setDesc(std::string(r.remote_addr) + " | " + std::to_string(r.rssi));
+						items.push_back(itm);
+					}
+				}
+				MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+
+				// Attempt to restore prev selection
+				selectionApplied = selectByName(selectedName);
+				globalDirty |= selectionApplied;
+				// If selection was restored, we already called performLayout internally
+				selectionDirty |= !selectionApplied;
+			}
+			pollSecs = 2;
+		} else {
+			WriteLock w(itemLock);
+			items.clear();
+			items.push_back(toggleItem);
+			items.push_back(diagItem);
+			items.push_back(rateItem);
+			layout_called = false;
+			selectionDirty = true;
+			pollSecs = 15;
+		}
+
+		// reset selection scope (locks internally)
+		if (selectionDirty) {
+			MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+			selectionDirty = false;
+		}
+
+		std::this_thread::sleep_for(std::chrono::seconds(pollSecs));
+	}
 }
 
-PairNewItem::PairNewItem(BT_device d, bool& dirty)
-    : MenuItem(ListItemType::Button, "Pair", "Pair this device.", 
-        [&](AbstractMenuItem &item) -> InputReactionHint {
-            BT_pair(dev.addr); 
-            dirty = true;
-            return Exit; 
-        }), dev(d)
-{}
-
-UnpairItem::UnpairItem(BT_devicePaired d, bool& dirty)
-    : MenuItem(ListItemType::Button, "Forget", "Forget this device.",
-        [&](AbstractMenuItem &item) -> InputReactionHint {
-            BT_unpair(dev.remote_addr); 
-            dirty = true;
-            return Exit; 
-        }), dev(d)
-{}
-
-ConnectKnownItem::ConnectKnownItem(BT_devicePaired d, bool& dirty)
-    : MenuItem(ListItemType::Button, "Connect", "Connect this device.",
-        [&](AbstractMenuItem &item) -> InputReactionHint {
-            BT_connect(dev.remote_addr); 
-            dirty = true;
-            return Exit; 
-        }), dev(d)
-{}
-
-DisconnectKnownItem::DisconnectKnownItem(BT_devicePaired d, bool& dirty)
-    : MenuItem(ListItemType::Button, "Disconnect", "Disconnect this device.",
-        [&](AbstractMenuItem &item) -> InputReactionHint {
-            BT_disconnect(dev.remote_addr); 
-            dirty = true;
-            return Exit; 
-        }), dev(d)
-{}
-
-PairableItem::PairableItem(BT_device d, MenuList* submenu)
-    : MenuItem(ListItemType::Custom, d.name, d.addr, DeferToSubmenu, submenu), dev(d)
-{}
-
-void PairableItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const
+PairNewItem::PairNewItem(BT_device d, bool &dirty)
+	: MenuItem(ListItemType::Button, "Pair", "Pair this device.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   BT_pair(dev.addr);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  dev(d)
 {
-    SDL_Color text_color = uintToColour(THEME_COLOR4_255);
-    SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
-
-    // hack - this should be correlated to max_width
-    int mw = dst.w;
-
-    if (selected)
-    {
-        // gray pill
-        GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
-    }
-
-    // device icon
-    if(dev.kind != BLUETOOTH_NONE) {
-        auto asset = (dev.kind == BLUETOOTH_AUDIO) ? ASSET_AUDIO : ASSET_CONTROLLER;
-        SDL_Rect rect = (dev.kind == BLUETOOTH_AUDIO) ? SDL_Rect{0, 0, 12, 12} : SDL_Rect{0, 0, 12, 12};
-        int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
-        int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-        SDL_Rect tgt{ix, y};
-        GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
-    }
-
-    if (selected)
-    {
-        // white pill
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = uintToColour(THEME_COLOR5_255);
-    }
-
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
-    SDL_FreeSurface(text);
 }
 
-PairedItem::PairedItem(BT_devicePaired d, MenuList* submenu)
-    : MenuItem(ListItemType::Custom, d.remote_name, d.remote_addr, DeferToSubmenu, submenu), dev(d)
-{}
+UnpairItem::UnpairItem(BT_devicePaired d, bool &dirty)
+	: MenuItem(ListItemType::Button, "Forget", "Forget this device.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   BT_unpair(dev.remote_addr);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  dev(d)
+{
+}
+
+ConnectKnownItem::ConnectKnownItem(BT_devicePaired d, bool &dirty)
+	: MenuItem(ListItemType::Button, "Connect", "Connect this device.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   BT_connect(dev.remote_addr);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  dev(d)
+{
+}
+
+DisconnectKnownItem::DisconnectKnownItem(BT_devicePaired d, bool &dirty)
+	: MenuItem(ListItemType::Button, "Disconnect", "Disconnect this device.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   BT_disconnect(dev.remote_addr);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  dev(d)
+{
+}
+
+PairableItem::PairableItem(BT_device d, MenuList *submenu)
+	: MenuItem(ListItemType::Custom, d.name, d.addr, DeferToSubmenu, submenu), dev(d)
+{
+}
+
+void PairableItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+								  bool selected) const
+{
+	SDL_Color text_color = uintToColour(THEME_COLOR4_255);
+	SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
+
+	// hack - this should be correlated to max_width
+	int mw = dst.w;
+
+	if (selected) {
+		// gray pill
+		GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
+	}
+
+	// device icon
+	if (dev.kind != BLUETOOTH_NONE) {
+		auto asset = (dev.kind == BLUETOOTH_AUDIO) ? ASSET_AUDIO : ASSET_CONTROLLER;
+		SDL_Rect rect = (dev.kind == BLUETOOTH_AUDIO) ? SDL_Rect{0, 0, 12, 12} : SDL_Rect{0, 0, 12, 12};
+		int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
+		int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+		SDL_Rect tgt{ix, y};
+		GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
+	}
+
+	if (selected) {
+		// white pill
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = uintToColour(THEME_COLOR5_255);
+	}
+
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
+	SDL_FreeSurface(text);
+}
+
+PairedItem::PairedItem(BT_devicePaired d, MenuList *submenu)
+	: MenuItem(ListItemType::Custom, d.remote_name, d.remote_addr, DeferToSubmenu, submenu), dev(d)
+{
+}
 
-void PairedItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const
+void PairedItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+								bool selected) const
 {
-    SDL_Color text_color = uintToColour(THEME_COLOR4_255);
-    SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
-
-    // hack - this should be correlated to max_width
-    int mw = dst.w;
-
-    if (selected)
-    {
-        // gray pill
-        GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
-    }
-
-    // rssi icon
-    auto asset =
-        dev.rssi == 0   ? ASSET_WIFI_OFF : 
-        dev.rssi >= -55 ? ASSET_WIFI :
-        dev.rssi >= -67 ? ASSET_WIFI_MED
-                        : ASSET_WIFI_LOW;
-    SDL_Rect rect = {0, 0, 12, 12};
-    int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
-    int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-    SDL_Rect tgt{ix, y};
-    GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
-
-    // connected
-    if(dev.is_connected) {
-        SDL_Rect rect = {0, 0, 12, 12};
-        ix = ix - SCALE1(OPTION_PADDING + rect.w);
-        int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-        SDL_Rect tgt{ix, y};
-        GFX_blitAssetColor(ASSET_CHECKCIRCLE, NULL, surface, &tgt, THEME_COLOR6);
-    }
-    // bonded
-    else if(dev.is_bonded) {
-        SDL_Rect rect = {0, 0, 8, 11};
-        ix = ix - SCALE1(OPTION_PADDING + rect.w + 2);
-        int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-        SDL_Rect tgt{ix, y};
-        GFX_blitAssetColor(ASSET_LOCK, NULL, surface, &tgt, THEME_COLOR6);
-    }
-
-    if (selected)
-    {
-        // white pill
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = uintToColour(THEME_COLOR5_255);
-    }
-
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
-    SDL_FreeSurface(text);
+	SDL_Color text_color = uintToColour(THEME_COLOR4_255);
+	SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
+
+	// hack - this should be correlated to max_width
+	int mw = dst.w;
+
+	if (selected) {
+		// gray pill
+		GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
+	}
+
+	// rssi icon
+	auto asset = dev.rssi == 0	   ? ASSET_WIFI_OFF
+				 : dev.rssi >= -55 ? ASSET_WIFI
+				 : dev.rssi >= -67 ? ASSET_WIFI_MED
+								   : ASSET_WIFI_LOW;
+	SDL_Rect rect = {0, 0, 12, 12};
+	int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
+	int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+	SDL_Rect tgt{ix, y};
+	GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
+
+	// connected
+	if (dev.is_connected) {
+		SDL_Rect rect = {0, 0, 12, 12};
+		ix = ix - SCALE1(OPTION_PADDING + rect.w);
+		int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+		SDL_Rect tgt{ix, y};
+		GFX_blitAssetColor(ASSET_CHECKCIRCLE, NULL, surface, &tgt, THEME_COLOR6);
+	}
+	// bonded
+	else if (dev.is_bonded) {
+		SDL_Rect rect = {0, 0, 8, 11};
+		ix = ix - SCALE1(OPTION_PADDING + rect.w + 2);
+		int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+		SDL_Rect tgt{ix, y};
+		GFX_blitAssetColor(ASSET_LOCK, NULL, surface, &tgt, THEME_COLOR6);
+	}
+
+	if (selected) {
+		// white pill
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = uintToColour(THEME_COLOR5_255);
+	}
+
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
+	SDL_FreeSurface(text);
 }
\ No newline at end of file
diff --git a/workspace/all/settings/btmenu.hpp b/workspace/all/settings/btmenu.hpp
index 9d835ef9c..54f8934bf 100644
--- a/workspace/all/settings/btmenu.hpp
+++ b/workspace/all/settings/btmenu.hpp
@@ -5,90 +5,94 @@
 
 namespace Bluetooth
 {
-    class Menu : public MenuList
-    {
-        const int &globalQuit;
-        int &globalDirty;
-        // bt on/off
-        MenuItem *toggleItem;
-        // diagnostics on/off
-        MenuItem *diagItem;
-        // max sample rate
-        MenuItem *rateItem;
-
-        std::thread worker;
-        bool quit = false;
-        bool selectionDirty = false;
-
-    public:
-        Menu(const int &globalQuit, int &globalDirty);
-        ~Menu();
-
-        InputReactionHint handleInput(int &dirty, int &quit) override;
-
-    private:
-        std::any getBtToggleState() const;
-        void setBtToggleState(const std::any &on);
-        void resetBtToggleState();
-
-        std::any getBtDiagnosticsState() const;
-        void setBtDiagnosticsState(const std::any &on);
-        void resetBtDiagnosticsState();
-
-        std::any getSamplerateMaximum() const;
-        void setSamplerateMaximum(const std::any &on);
-        void resetSamplerateMaximum();
-
-        void updater();
-    };
-
-    class PairableItem : public MenuItem
-    {
-        BT_device dev;
-
-    public:
-        PairableItem(BT_device d, MenuList *submenu);
-
-        void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const override;
-    };
-
-    class PairedItem : public MenuItem
-    {
-        BT_devicePaired dev;
-
-    public:
-        PairedItem(BT_devicePaired d, MenuList *submenu);
-
-        void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const override;
-    };
-
-    class ConnectKnownItem : public MenuItem
-    {
-        BT_devicePaired dev;
-    public:
-        ConnectKnownItem(BT_devicePaired n, bool& dirty);
-    };
-
-    class DisconnectKnownItem : public MenuItem
-    {
-        BT_devicePaired dev;
-    public:
-        DisconnectKnownItem(BT_devicePaired n, bool& dirty);
-    };
-
-    class PairNewItem : public MenuItem
-    {
-        BT_device dev;
-
-    public:
-        PairNewItem(BT_device n, bool& dirty);
-    };
-
-    class UnpairItem : public MenuItem
-    {
-        BT_devicePaired dev;
-
-    public:
-        UnpairItem(BT_devicePaired n, bool& dirty);
-    };
-}
\ No newline at end of file
+class Menu : public MenuList
+{
+	const int &globalQuit;
+	int &globalDirty;
+	// bt on/off
+	MenuItem *toggleItem;
+	// diagnostics on/off
+	MenuItem *diagItem;
+	// max sample rate
+	MenuItem *rateItem;
+
+	std::thread worker;
+	bool quit = false;
+	bool selectionDirty = false;
+
+  public:
+	Menu(const int &globalQuit, int &globalDirty);
+	~Menu();
+
+	InputReactionHint handleInput(int &dirty, int &quit) override;
+
+  private:
+	std::any getBtToggleState() const;
+	void setBtToggleState(const std::any &on);
+	void resetBtToggleState();
+
+	std::any getBtDiagnosticsState() const;
+	void setBtDiagnosticsState(const std::any &on);
+	void resetBtDiagnosticsState();
+
+	std::any getSamplerateMaximum() const;
+	void setSamplerateMaximum(const std::any &on);
+	void resetSamplerateMaximum();
+
+	void updater();
+};
+
+class PairableItem : public MenuItem
+{
+	BT_device dev;
+
+  public:
+	PairableItem(BT_device d, MenuList *submenu);
+
+	void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+						bool selected) const override;
+};
+
+class PairedItem : public MenuItem
+{
+	BT_devicePaired dev;
+
+  public:
+	PairedItem(BT_devicePaired d, MenuList *submenu);
+
+	void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+						bool selected) const override;
+};
+
+class ConnectKnownItem : public MenuItem
+{
+	BT_devicePaired dev;
+
+  public:
+	ConnectKnownItem(BT_devicePaired n, bool &dirty);
+};
+
+class DisconnectKnownItem : public MenuItem
+{
+	BT_devicePaired dev;
+
+  public:
+	DisconnectKnownItem(BT_devicePaired n, bool &dirty);
+};
+
+class PairNewItem : public MenuItem
+{
+	BT_device dev;
+
+  public:
+	PairNewItem(BT_device n, bool &dirty);
+};
+
+class UnpairItem : public MenuItem
+{
+	BT_devicePaired dev;
+
+  public:
+	UnpairItem(BT_devicePaired n, bool &dirty);
+};
+} // namespace Bluetooth
\ No newline at end of file
diff --git a/workspace/all/settings/keyboardprompt.cpp b/workspace/all/settings/keyboardprompt.cpp
index 3d64d3768..146da2623 100644
--- a/workspace/all/settings/keyboardprompt.cpp
+++ b/workspace/all/settings/keyboardprompt.cpp
@@ -4,441 +4,377 @@ constexpr int keyboardRows = 5;
 constexpr int keyboardColumns = 14;
 // keyboard_layout_lowercase is the default keyboard layout
 KeyboardLayout keyboardLayoutLowercase = {
-    {"`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "\0"},
-    {"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\", "\0"},
-    {"a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "\0", "\0", "\0"},
-    {"z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "\0", "\0", "\0", "\0"},
-    {"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
+	{"`", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "-", "=", "\0"},
+	{"q", "w", "e", "r", "t", "y", "u", "i", "o", "p", "[", "]", "\\", "\0"},
+	{"a", "s", "d", "f", "g", "h", "j", "k", "l", ";", "'", "\0", "\0", "\0"},
+	{"z", "x", "c", "v", "b", "n", "m", ",", ".", "/", "\0", "\0", "\0", "\0"},
+	{"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
 
 // keyboard_layout_uppercase is the uppercase keyboard layout
 KeyboardLayout keyboardLayoutUppercase = {
-    {"~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "\0"},
-    {"Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{", "}", "|", "\0"},
-    {"A", "S", "D", "F", "G", "H", "J", "K", "L", ":", "\"", "\0", "\0", "\0"},
-    {"Z", "X", "C", "V", "B", "N", "M", "<", ">", "?", "\0", "\0", "\0", "\0"},
-    {"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
+	{"~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "\0"},
+	{"Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "{", "}", "|", "\0"},
+	{"A", "S", "D", "F", "G", "H", "J", "K", "L", ":", "\"", "\0", "\0", "\0"},
+	{"Z", "X", "C", "V", "B", "N", "M", "<", ">", "?", "\0", "\0", "\0", "\0"},
+	{"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
 
 // keyboard_layout_special is the special keyboard layout
 // note that some characters are not supported by the font in use by MinUI
 // so we omit those characters from the layout
 KeyboardLayout keyboardLayoutSpecial = {
-    {"~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "\0"},
-    {"{", "}", "|", "\\", "<", ">", "?", "\"", ";", ":", "[", "]", "\\", "\0"},
-    {"±", "§", "¶", "©", "®", "™", "€", "£", "¥", "¢", "¤", "\0", "\0", "\0"},
-    {"°", "•", "·", "†", "‡", "¬", "¦", "¡", "\0", "\0", "\0", "\0", "\0", "\0"},
-    {"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
+	{"~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "_", "+", "\0"},
+	{"{", "}", "|", "\\", "<", ">", "?", "\"", ";", ":", "[", "]", "\\", "\0"},
+	{"±", "§", "¶", "©", "®", "™", "€", "£", "¥", "¢", "¤", "\0", "\0", "\0"},
+	{"°", "•", "·", "†", "‡", "¬", "¦", "¡", "\0", "\0", "\0", "\0", "\0", "\0"},
+	{"shift", "space", "enter", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0", "\0"}};
 
 KeyboardPrompt::KeyboardPrompt(const std::string &title, MenuListCallback on_confirm)
-    : MenuList(MenuItemType::Custom, title, {}, nullptr, on_confirm)
+	: MenuList(MenuItemType::Custom, title, {}, nullptr, on_confirm)
 {
-    state = {
-        .redraw = true,
-        .quitting = false,
-        .exit_code = ExitCode::Uninitialized,
-        .keyboard = {
-            .display = true,
-            .row = 0,
-            .col = 0,
-            .layout = 0,
-            .title = title}};
+	state = {.redraw = true,
+			 .quitting = false,
+			 .exit_code = ExitCode::Uninitialized,
+			 .keyboard = {.display = true, .row = 0, .col = 0, .layout = 0, .title = title}};
 }
 
-KeyboardPrompt::~KeyboardPrompt() {}
+KeyboardPrompt::~KeyboardPrompt()
+{
+}
 
 void KeyboardPrompt::drawCustom(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    drawKeyboard(surface, state);
+	drawKeyboard(surface, state);
 
-    // don't forget to reset the should_redraw flag
-    state.redraw = false;
+	// don't forget to reset the should_redraw flag
+	state.redraw = false;
 }
 
 InputReactionHint KeyboardPrompt::handleInput(int &dirty, int &quit)
 {
-    if (PAD_justPressed(BTN_Y))
-    {
-        state.keyboard.final_text = state.keyboard.initial_text;
-        state.quitting = true;
-        state.exit_code = ExitCode::CancelButton;
-        state.redraw = true;
-        // why is this branch not exiting?
-    }
-
-    if (PAD_justPressed(BTN_MENU))
-    {
-        state.keyboard.final_text = state.keyboard.initial_text;
-        state.redraw = false;
-        state.quitting = true;
-        state.exit_code = ExitCode::MenuButton;
-
-        // todo: update quit and dirty flags
-        return InputReactionHint::Exit;
-    }
-
-    handleKeyboardInput(state);
-    dirty |= state.redraw;
-    quit |= state.quitting;
-
-    if (state.exit_code == ExitCode::CancelButton) {
-        return InputReactionHint::Exit;
-    }
-    else if (state.exit_code == ExitCode::Success) {
-        if(on_confirm) {
-            MenuItem tmp{ListItemType::Button, state.keyboard.final_text, ""};
-            return on_confirm(tmp);
-        }
-        return InputReactionHint::Exit;
-    }
-    else {
-        return InputReactionHint::NoOp;
-    }
+	if (PAD_justPressed(BTN_Y)) {
+		state.keyboard.final_text = state.keyboard.initial_text;
+		state.quitting = true;
+		state.exit_code = ExitCode::CancelButton;
+		state.redraw = true;
+		// why is this branch not exiting?
+	}
+
+	if (PAD_justPressed(BTN_MENU)) {
+		state.keyboard.final_text = state.keyboard.initial_text;
+		state.redraw = false;
+		state.quitting = true;
+		state.exit_code = ExitCode::MenuButton;
+
+		// todo: update quit and dirty flags
+		return InputReactionHint::Exit;
+	}
+
+	handleKeyboardInput(state);
+	dirty |= state.redraw;
+	quit |= state.quitting;
+
+	if (state.exit_code == ExitCode::CancelButton) {
+		return InputReactionHint::Exit;
+	} else if (state.exit_code == ExitCode::Success) {
+		if (on_confirm) {
+			MenuItem tmp{ListItemType::Button, state.keyboard.final_text, ""};
+			return on_confirm(tmp);
+		}
+		return InputReactionHint::Exit;
+	} else {
+		return InputReactionHint::NoOp;
+	}
 }
 
 void KeyboardPrompt::handleKeyboardInput(AppState &state)
 {
-    // redraw unless a key was not pressed
-    state.redraw = true;
-
-    // track current keyboard layout
-    const auto &currentLayout = getCurrentLayout(state);
-
-    int max_row = keyboardRows;
-    int max_col = keyboardColumns;
-
-    if (PAD_justRepeated(BTN_UP))
-    {
-        if (state.keyboard.row > 0)
-        {
-            int offset = calculateColumnOffset(currentLayout, state.keyboard.row, state.keyboard.row - 1);
-
-            if (state.keyboard.row == max_row - 1)
-                offset = adjustOffsetExitLastRow(offset, state.keyboard.col);
-            state.keyboard.col += offset;
-            state.keyboard.row--;
-        }
-        else
-        {
-            int offset = calculateColumnOffset(currentLayout, 0, max_row - 1);
-            int row_length = countRowLength(currentLayout, 0);
-            int center = (row_length - 1) / 2;
-
-            if (!((row_length & 1) == 0 && state.keyboard.col == center - 1))
-                offset = adjustOffsetEnterLastRow(offset, state.keyboard.col, center);
-            state.keyboard.col += offset;
-            state.keyboard.row = max_row - 1;
-        }
-        cursorRescue(state, currentLayout, max_row);
-    }
-    else if (PAD_justRepeated(BTN_DOWN))
-    {
-        if (state.keyboard.row < max_row - 1)
-        {
-            int offset = calculateColumnOffset(currentLayout, state.keyboard.row, state.keyboard.row + 1);
-            int row_length = countRowLength(currentLayout, state.keyboard.row);
-            int center = (row_length - 1) / 2;
-
-            if (state.keyboard.row + 1 == max_row - 1 && (state.keyboard.col > center || (row_length & 1 && state.keyboard.col < center)))
-            {
-                offset = adjustOffsetEnterLastRow(offset, state.keyboard.col, center);
-            }
-            state.keyboard.col += offset;
-            state.keyboard.row++;
-        }
-        else
-        {
-            int offset = calculateColumnOffset(currentLayout, max_row - 1, 0);
-
-            offset = adjustOffsetExitLastRow(offset, state.keyboard.col);
-            state.keyboard.col += offset;
-            state.keyboard.row = 0;
-        }
-        cursorRescue(state, currentLayout, max_row);
-    }
-    else if (PAD_justRepeated(BTN_LEFT))
-    {
-        if (state.keyboard.col > 0)
-        {
-            state.keyboard.col--;
-        }
-        else
-        {
-            int last_col = 13;
-            while (last_col >= 0 && currentLayout[state.keyboard.row][last_col].empty())
-                last_col--;
-            state.keyboard.col = last_col;
-        }
-    }
-    else if (PAD_justRepeated(BTN_RIGHT))
-    {
-        const auto &next_key = currentLayout.at(state.keyboard.row).at(state.keyboard.col + 1);
-        if (state.keyboard.col + 1 >= max_col || next_key.empty())
-            state.keyboard.col = 0;
-        else if (state.keyboard.col < max_col - 1)
-            state.keyboard.col++;
-    }
-    else if (PAD_justPressed(BTN_X))
-    {
-        state.keyboard.final_text = state.keyboard.current_text;
-        state.keyboard.display = !state.keyboard.display;
-        state.redraw = true;
-        state.quitting = true;
-        state.exit_code = ExitCode::Success;
-    }
-    else if (PAD_justPressed(BTN_B))
-    {
-        if (!state.keyboard.current_text.empty())
-            state.keyboard.current_text.pop_back();
-    }
-    else if (PAD_justPressed(BTN_A))
-    {
-        const auto &key = currentLayout.at(state.keyboard.row).at(state.keyboard.col);
-
-        if (!key.empty())
-        {
-            if (key == "shift")
-            {
-                state.keyboard.layout = (state.keyboard.layout + 1) % 3;
-            }
-            else if (key == "space")
-            {
-                state.keyboard.current_text.append(" ");
-            }
-            else if (key == "enter")
-            {
-                state.keyboard.final_text = state.keyboard.current_text;
-                state.keyboard.display = !state.keyboard.display;
-                state.quitting = true;
-                state.exit_code = ExitCode::Success;
-            }
-            else
-            {
-                state.keyboard.current_text.append(key);
-            }
-        }
-    }
-    else if (PAD_justPressed(BTN_SELECT))
-    {
-        state.keyboard.layout = (state.keyboard.layout + 1) % 3;
-        const auto& nextLayout = getCurrentLayout(state);
-        cursorRescue(state, nextLayout, max_row);
-    }
-    else
-    {
-        // do not redraw if no key was pressed
-        state.redraw = false;
-    }
+	// redraw unless a key was not pressed
+	state.redraw = true;
+
+	// track current keyboard layout
+	const auto &currentLayout = getCurrentLayout(state);
+
+	int max_row = keyboardRows;
+	int max_col = keyboardColumns;
+
+	if (PAD_justRepeated(BTN_UP)) {
+		if (state.keyboard.row > 0) {
+			int offset = calculateColumnOffset(currentLayout, state.keyboard.row, state.keyboard.row - 1);
+
+			if (state.keyboard.row == max_row - 1)
+				offset = adjustOffsetExitLastRow(offset, state.keyboard.col);
+			state.keyboard.col += offset;
+			state.keyboard.row--;
+		} else {
+			int offset = calculateColumnOffset(currentLayout, 0, max_row - 1);
+			int row_length = countRowLength(currentLayout, 0);
+			int center = (row_length - 1) / 2;
+
+			if (!((row_length & 1) == 0 && state.keyboard.col == center - 1))
+				offset = adjustOffsetEnterLastRow(offset, state.keyboard.col, center);
+			state.keyboard.col += offset;
+			state.keyboard.row = max_row - 1;
+		}
+		cursorRescue(state, currentLayout, max_row);
+	} else if (PAD_justRepeated(BTN_DOWN)) {
+		if (state.keyboard.row < max_row - 1) {
+			int offset = calculateColumnOffset(currentLayout, state.keyboard.row, state.keyboard.row + 1);
+			int row_length = countRowLength(currentLayout, state.keyboard.row);
+			int center = (row_length - 1) / 2;
+
+			if (state.keyboard.row + 1 == max_row - 1 &&
+				(state.keyboard.col > center || (row_length & 1 && state.keyboard.col < center))) {
+				offset = adjustOffsetEnterLastRow(offset, state.keyboard.col, center);
+			}
+			state.keyboard.col += offset;
+			state.keyboard.row++;
+		} else {
+			int offset = calculateColumnOffset(currentLayout, max_row - 1, 0);
+
+			offset = adjustOffsetExitLastRow(offset, state.keyboard.col);
+			state.keyboard.col += offset;
+			state.keyboard.row = 0;
+		}
+		cursorRescue(state, currentLayout, max_row);
+	} else if (PAD_justRepeated(BTN_LEFT)) {
+		if (state.keyboard.col > 0) {
+			state.keyboard.col--;
+		} else {
+			int last_col = 13;
+			while (last_col >= 0 && currentLayout[state.keyboard.row][last_col].empty())
+				last_col--;
+			state.keyboard.col = last_col;
+		}
+	} else if (PAD_justRepeated(BTN_RIGHT)) {
+		const auto &next_key = currentLayout.at(state.keyboard.row).at(state.keyboard.col + 1);
+		if (state.keyboard.col + 1 >= max_col || next_key.empty())
+			state.keyboard.col = 0;
+		else if (state.keyboard.col < max_col - 1)
+			state.keyboard.col++;
+	} else if (PAD_justPressed(BTN_X)) {
+		state.keyboard.final_text = state.keyboard.current_text;
+		state.keyboard.display = !state.keyboard.display;
+		state.redraw = true;
+		state.quitting = true;
+		state.exit_code = ExitCode::Success;
+	} else if (PAD_justPressed(BTN_B)) {
+		if (!state.keyboard.current_text.empty())
+			state.keyboard.current_text.pop_back();
+	} else if (PAD_justPressed(BTN_A)) {
+		const auto &key = currentLayout.at(state.keyboard.row).at(state.keyboard.col);
+
+		if (!key.empty()) {
+			if (key == "shift") {
+				state.keyboard.layout = (state.keyboard.layout + 1) % 3;
+			} else if (key == "space") {
+				state.keyboard.current_text.append(" ");
+			} else if (key == "enter") {
+				state.keyboard.final_text = state.keyboard.current_text;
+				state.keyboard.display = !state.keyboard.display;
+				state.quitting = true;
+				state.exit_code = ExitCode::Success;
+			} else {
+				state.keyboard.current_text.append(key);
+			}
+		}
+	} else if (PAD_justPressed(BTN_SELECT)) {
+		state.keyboard.layout = (state.keyboard.layout + 1) % 3;
+		const auto &nextLayout = getCurrentLayout(state);
+		cursorRescue(state, nextLayout, max_row);
+	} else {
+		// do not redraw if no key was pressed
+		state.redraw = false;
+	}
 }
 
 void KeyboardPrompt::cursorRescue(AppState &state, const KeyboardLayout &currentLayout, int num_rows)
 {
-    int num_cols = currentLayout[0].size();
-
-    // Ensure row doesn't exceed boundaries
-    if (state.keyboard.row < 0)
-        state.keyboard.row = 0;
-    else if (state.keyboard.row > num_rows - 1)
-        state.keyboard.row = num_rows - 1;
-
-    // Ensure column doesn't exceed maximum
-    if (state.keyboard.col > num_cols - 1)
-        state.keyboard.col = num_cols - 1;
-
-    // Move left until we find a non-empty cell
-    while (state.keyboard.col >= 0 && currentLayout[state.keyboard.row][state.keyboard.col].empty())
-        state.keyboard.col--;
-
-    // If we went too far left, move right until we find a non-empty cell
-    if (state.keyboard.col < 0)
-    {
-        state.keyboard.col = 0;
-        while (currentLayout[state.keyboard.row][state.keyboard.col].empty())
-            state.keyboard.col++;
-    }
+	int num_cols = currentLayout[0].size();
+
+	// Ensure row doesn't exceed boundaries
+	if (state.keyboard.row < 0)
+		state.keyboard.row = 0;
+	else if (state.keyboard.row > num_rows - 1)
+		state.keyboard.row = num_rows - 1;
+
+	// Ensure column doesn't exceed maximum
+	if (state.keyboard.col > num_cols - 1)
+		state.keyboard.col = num_cols - 1;
+
+	// Move left until we find a non-empty cell
+	while (state.keyboard.col >= 0 && currentLayout[state.keyboard.row][state.keyboard.col].empty())
+		state.keyboard.col--;
+
+	// If we went too far left, move right until we find a non-empty cell
+	if (state.keyboard.col < 0) {
+		state.keyboard.col = 0;
+		while (currentLayout[state.keyboard.row][state.keyboard.col].empty())
+			state.keyboard.col++;
+	}
 }
 
 int KeyboardPrompt::countRowLength(const KeyboardLayout &layout, int row)
 {
-    int length = 0;
-    for (int i = 0; i < keyboardColumns; i++)
-        if (!layout[row][i].empty())
-            length++;
-    return length;
+	int length = 0;
+	for (int i = 0; i < keyboardColumns; i++)
+		if (!layout[row][i].empty())
+			length++;
+	return length;
 }
 
 int KeyboardPrompt::calculateColumnOffset(const KeyboardLayout &layout, int from_row, int to_row)
 {
-    int from_length = countRowLength(layout, from_row);
-    int to_length = countRowLength(layout, to_row);
-    return (to_length - from_length) / 2;
+	int from_length = countRowLength(layout, from_row);
+	int to_length = countRowLength(layout, to_row);
+	return (to_length - from_length) / 2;
 }
 
 int KeyboardPrompt::adjustOffsetExitLastRow(int offset, int column)
 {
-    if (column == 0)
-        return offset - 1;
-    else if (column == 2)
-        return offset + 1;
-    return offset; // Center stays fixed
+	if (column == 0)
+		return offset - 1;
+	else if (column == 2)
+		return offset + 1;
+	return offset; // Center stays fixed
 }
 
 int KeyboardPrompt::adjustOffsetEnterLastRow(int offset, int col, int center)
 {
-    if (col > center)
-        return offset - 1;
-    else if (col < center)
-        return offset + 1;
-    else
-        return offset;
+	if (col > center)
+		return offset - 1;
+	else if (col < center)
+		return offset + 1;
+	else
+		return offset;
 }
 
 const KeyboardLayout &KeyboardPrompt::getCurrentLayout(const AppState &state)
 {
-    if (state.keyboard.layout == 0)
-        return keyboardLayoutLowercase;
-    else if (state.keyboard.layout == 1)
-        return keyboardLayoutUppercase;
-    else
-        return keyboardLayoutSpecial;
+	if (state.keyboard.layout == 0)
+		return keyboardLayoutLowercase;
+	else if (state.keyboard.layout == 1)
+		return keyboardLayoutUppercase;
+	else
+		return keyboardLayoutSpecial;
 }
 
 void KeyboardPrompt::drawKeyboard(SDL_Surface *screen, const AppState &state)
 {
-    // determine which keyboard layout to use based on current state
-    const KeyboardLayout *currentLayout = nullptr;
-    if (state.keyboard.layout == 0)
-        currentLayout = &keyboardLayoutLowercase;
-    else if (state.keyboard.layout == 1)
-        currentLayout = &keyboardLayoutUppercase;
-    else
-        currentLayout = &keyboardLayoutSpecial;
-    const auto key = currentLayout->at(state.keyboard.row).at(state.keyboard.col);
-
-    // draw the button group on the button-right
-    char *hints[] = {(char *)("Y"), (char *)("EXIT"), (char *)("X"), ((char *)"ENTER"), NULL};
-    GFX_blitButtonGroup(hints, 1, screen, 1);
-
-    // draw keyboard title
-    if (!state.keyboard.title.empty())
-    {
-        SDL_Surface *title = TTF_RenderUTF8_Blended(font.large, state.keyboard.title.c_str(), COLOR_WHITE);
-        SDL_Rect title_pos = {
-            (screen->w - title->w) / 2, // center horizontally
-            20,                         // 20px from top
-            title->w,
-            title->h};
-        SDL_BlitSurface(title, NULL, screen, &title_pos);
-        SDL_FreeSurface(title);
-    }
-
-    // draw input field with current text
-    // todo: use TTF_SizeUTF8 to compute the width of the input field
-    SDL_Surface *input_placeholder = TTF_RenderUTF8_Blended(font.medium, "p", COLOR_WHITE);
-    SDL_Surface *input = TTF_RenderUTF8_Blended(font.medium, state.keyboard.current_text.c_str(), COLOR_WHITE);
-    SDL_Rect input_pos = {
-        (screen->w) / 2,
-        input_placeholder->h * 2,
-        0,
-        input_placeholder->h};
-    if (input != NULL)
-    {
-        input_pos.x = (screen->w - input->w) / 2;
-        input_pos.w = input->w;
-        input_pos.h = input->h;
-    }
-
-    // draw input field background
-    SDL_Rect input_bg = {
-        40,
-        input_placeholder->h * 2,
-        screen->w - 80,
-        input_placeholder->h};
-    SDL_FillRect(screen, &input_bg, SDL_MapRGB(screen->format, TRIAD_DARK_GRAY));
-    SDL_BlitSurface(input, NULL, screen, &input_pos);
-    SDL_FreeSurface(input);
-
-    // draw keyboard layout
-    int start_y = input_placeholder->h * 4;
-    int default_key_width = input_placeholder->w;
-    int default_key_height = input_placeholder->h;
-    int default_key_size = std::max(default_key_width, default_key_height);
-    int row_spacing = 5;
-    int column_spacing = 5;
-
-    int num_rows = keyboardRows;
-    int num_columns = keyboardColumns;
-
-    // these special keys are not the same width as the other keys
-    // so we need to compute their width separately
-    // compute them here to avoid doing it conditionally for each row
-    int shift_width, space_width, enter_width;
-    TTF_SizeUTF8(font.medium, "shift", &shift_width, NULL);
-    TTF_SizeUTF8(font.medium, "space", &space_width, NULL);
-    TTF_SizeUTF8(font.medium, "enter", &enter_width, NULL);
-    int special_key_width = std::max(shift_width, std::max(space_width, enter_width)) + (column_spacing * 4);
-
-    for (int row = 0; row < num_rows; row++)
-    {
-        int len = 0;
-
-        // Count non-null characters in the row
-        for (int i = 0; i < num_columns; i++)
-            if (!(*currentLayout)[row][i].empty())
-                len++;
-
-        int total_width = (len * default_key_size) + ((len - 1) * column_spacing); // 5px between keys
-        if (row == 4)
-        {
-            // compute row 4 differently
-            // row 4 has three buttons:
-            // - "shift"
-            // - "space"
-            // - "enter"
-            // so we need to account for the actual width of the buttons
-            // we can use TTF_SizeUTF8 to get the width of the buttons
-            // also we need to account for the padding between the keys
-            // as well as the margin on each of the 3 keys
-            total_width = (special_key_width * 3) + (2 * column_spacing);
-        }
-        int start_x = (screen->w - total_width) / 2;
-
-        for (int col = 0; col < len; col++)
-        {
-            const auto& key = (*currentLayout)[row][col];
-            if (key.empty())
-                continue;
-
-            SDL_Color text_color = (row == state.keyboard.row && col == state.keyboard.col) ? COLOR_BLACK : COLOR_WHITE;
-            SDL_Surface *key_text = TTF_RenderUTF8_Blended(font.medium, key.c_str(), text_color);
-
-            // special keys are not the same width as the other keys
-            // so we need to compute their width separately
-            int current_key_width = default_key_size;
-            if (key == "shift" || key == "space" || key == "enter")
-            {
-                current_key_width = special_key_width;
-            }
-
-            SDL_Rect key_pos = {
-                start_x + (col * (current_key_width + column_spacing)),
-                start_y + (row * (default_key_size + row_spacing)),
-                current_key_width,
-                default_key_size};
-
-            // draw key background
-            Uint32 bg_color = (row == state.keyboard.row && col == state.keyboard.col) 
-                ? SDL_MapRGB(screen->format, TRIAD_WHITE) 
-                : SDL_MapRGB(screen->format, TRIAD_DARK_GRAY);
-            SDL_FillRect(screen, &key_pos, bg_color);
-
-            // center text in key
-            SDL_Rect text_pos = {
-                key_pos.x + (current_key_width - key_text->w) / 2,
-                key_pos.y + (default_key_size - key_text->h) / 2,
-                key_text->w,
-                key_text->h};
-
-            SDL_BlitSurface(key_text, NULL, screen, &text_pos);
-            SDL_FreeSurface(key_text);
-        }
-    }
+	// determine which keyboard layout to use based on current state
+	const KeyboardLayout *currentLayout = nullptr;
+	if (state.keyboard.layout == 0)
+		currentLayout = &keyboardLayoutLowercase;
+	else if (state.keyboard.layout == 1)
+		currentLayout = &keyboardLayoutUppercase;
+	else
+		currentLayout = &keyboardLayoutSpecial;
+	const auto key = currentLayout->at(state.keyboard.row).at(state.keyboard.col);
+
+	// draw the button group on the button-right
+	char *hints[] = {(char *)("Y"), (char *)("EXIT"), (char *)("X"), ((char *)"ENTER"), NULL};
+	GFX_blitButtonGroup(hints, 1, screen, 1);
+
+	// draw keyboard title
+	if (!state.keyboard.title.empty()) {
+		SDL_Surface *title = TTF_RenderUTF8_Blended(font.large, state.keyboard.title.c_str(), COLOR_WHITE);
+		SDL_Rect title_pos = {(screen->w - title->w) / 2, // center horizontally
+							  20,						  // 20px from top
+							  title->w, title->h};
+		SDL_BlitSurface(title, NULL, screen, &title_pos);
+		SDL_FreeSurface(title);
+	}
+
+	// draw input field with current text
+	// todo: use TTF_SizeUTF8 to compute the width of the input field
+	SDL_Surface *input_placeholder = TTF_RenderUTF8_Blended(font.medium, "p", COLOR_WHITE);
+	SDL_Surface *input = TTF_RenderUTF8_Blended(font.medium, state.keyboard.current_text.c_str(), COLOR_WHITE);
+	SDL_Rect input_pos = {(screen->w) / 2, input_placeholder->h * 2, 0, input_placeholder->h};
+	if (input != NULL) {
+		input_pos.x = (screen->w - input->w) / 2;
+		input_pos.w = input->w;
+		input_pos.h = input->h;
+	}
+
+	// draw input field background
+	SDL_Rect input_bg = {40, input_placeholder->h * 2, screen->w - 80, input_placeholder->h};
+	SDL_FillRect(screen, &input_bg, SDL_MapRGB(screen->format, TRIAD_DARK_GRAY));
+	SDL_BlitSurface(input, NULL, screen, &input_pos);
+	SDL_FreeSurface(input);
+
+	// draw keyboard layout
+	int start_y = input_placeholder->h * 4;
+	int default_key_width = input_placeholder->w;
+	int default_key_height = input_placeholder->h;
+	int default_key_size = std::max(default_key_width, default_key_height);
+	int row_spacing = 5;
+	int column_spacing = 5;
+
+	int num_rows = keyboardRows;
+	int num_columns = keyboardColumns;
+
+	// these special keys are not the same width as the other keys
+	// so we need to compute their width separately
+	// compute them here to avoid doing it conditionally for each row
+	int shift_width, space_width, enter_width;
+	TTF_SizeUTF8(font.medium, "shift", &shift_width, NULL);
+	TTF_SizeUTF8(font.medium, "space", &space_width, NULL);
+	TTF_SizeUTF8(font.medium, "enter", &enter_width, NULL);
+	int special_key_width = std::max(shift_width, std::max(space_width, enter_width)) + (column_spacing * 4);
+
+	for (int row = 0; row < num_rows; row++) {
+		int len = 0;
+
+		// Count non-null characters in the row
+		for (int i = 0; i < num_columns; i++)
+			if (!(*currentLayout)[row][i].empty())
+				len++;
+
+		int total_width = (len * default_key_size) + ((len - 1) * column_spacing); // 5px between keys
+		if (row == 4) {
+			// compute row 4 differently
+			// row 4 has three buttons:
+			// - "shift"
+			// - "space"
+			// - "enter"
+			// so we need to account for the actual width of the buttons
+			// we can use TTF_SizeUTF8 to get the width of the buttons
+			// also we need to account for the padding between the keys
+			// as well as the margin on each of the 3 keys
+			total_width = (special_key_width * 3) + (2 * column_spacing);
+		}
+		int start_x = (screen->w - total_width) / 2;
+
+		for (int col = 0; col < len; col++) {
+			const auto &key = (*currentLayout)[row][col];
+			if (key.empty())
+				continue;
+
+			SDL_Color text_color = (row == state.keyboard.row && col == state.keyboard.col) ? COLOR_BLACK : COLOR_WHITE;
+			SDL_Surface *key_text = TTF_RenderUTF8_Blended(font.medium, key.c_str(), text_color);
+
+			// special keys are not the same width as the other keys
+			// so we need to compute their width separately
+			int current_key_width = default_key_size;
+			if (key == "shift" || key == "space" || key == "enter") {
+				current_key_width = special_key_width;
+			}
+
+			SDL_Rect key_pos = {start_x + (col * (current_key_width + column_spacing)),
+								start_y + (row * (default_key_size + row_spacing)), current_key_width,
+								default_key_size};
+
+			// draw key background
+			Uint32 bg_color = (row == state.keyboard.row && col == state.keyboard.col)
+								  ? SDL_MapRGB(screen->format, TRIAD_WHITE)
+								  : SDL_MapRGB(screen->format, TRIAD_DARK_GRAY);
+			SDL_FillRect(screen, &key_pos, bg_color);
+
+			// center text in key
+			SDL_Rect text_pos = {key_pos.x + (current_key_width - key_text->w) / 2,
+								 key_pos.y + (default_key_size - key_text->h) / 2, key_text->w, key_text->h};
+
+			SDL_BlitSurface(key_text, NULL, screen, &text_pos);
+			SDL_FreeSurface(key_text);
+		}
+	}
 }
diff --git a/workspace/all/settings/keyboardprompt.hpp b/workspace/all/settings/keyboardprompt.hpp
index e1f68a7e1..9469fa881 100644
--- a/workspace/all/settings/keyboardprompt.hpp
+++ b/workspace/all/settings/keyboardprompt.hpp
@@ -20,81 +20,78 @@
 // CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-enum class ExitCode
-{
-    Uninitialized = -1,
-    Success = 0,
-    Error = 1,
-    CancelButton = 2,
-    MenuButton = 3,
-    ActionButton = 4,
-    InactionButton = 5,
-    StartButton = 6,
-    ParseError = 10,
-    SerializeError = 11,
-    Timeout = 124,
-    KeyboardInterrupt = 130,
-    Sigterm = 143,
+enum class ExitCode {
+	Uninitialized = -1,
+	Success = 0,
+	Error = 1,
+	CancelButton = 2,
+	MenuButton = 3,
+	ActionButton = 4,
+	InactionButton = 5,
+	StartButton = 6,
+	ParseError = 10,
+	SerializeError = 11,
+	Timeout = 124,
+	KeyboardInterrupt = 130,
+	Sigterm = 143,
 };
 
 // KeyboardState holds the keyboard-related state
-struct KeyboardState
-{
-    bool display;             // whether to display the keyboard
-    int row;                  // the current keyboard row
-    int col;                  // the current keyboard column
-    int layout;               // the current keyboard layout
-    std::string current_text; // the text to display in the keyboard
-    std::string initial_text; // the initial value of the text on keyboard entry
-    std::string final_text;   // the final value of the text on keyboard exit
-    std::string title;        // the title of the keyboard
+struct KeyboardState {
+	bool display;			  // whether to display the keyboard
+	int row;				  // the current keyboard row
+	int col;				  // the current keyboard column
+	int layout;				  // the current keyboard layout
+	std::string current_text; // the text to display in the keyboard
+	std::string initial_text; // the initial value of the text on keyboard entry
+	std::string final_text;	  // the final value of the text on keyboard exit
+	std::string title;		  // the title of the keyboard
 };
 
 // AppState holds the current state of the application
-struct AppState
-{
-    bool redraw;                   // whether the screen needs to be redrawn
-    bool quitting;                 // whether the app should exit
-    ExitCode exit_code;            // the exit code to return
-    struct KeyboardState keyboard; // current keyboard state
+struct AppState {
+	bool redraw;				   // whether the screen needs to be redrawn
+	bool quitting;				   // whether the app should exit
+	ExitCode exit_code;			   // the exit code to return
+	struct KeyboardState keyboard; // current keyboard state
 };
 
 using KeyboardLayout = std::vector<std::vector<std::string>>;
 
 class KeyboardPrompt : public MenuList
 {
-    AppState state{};
+	AppState state{};
 
-public:
-    KeyboardPrompt(const std::string &title, MenuListCallback on_confirm = nullptr);
-    ~KeyboardPrompt();
+  public:
+	KeyboardPrompt(const std::string &title, MenuListCallback on_confirm = nullptr);
+	~KeyboardPrompt();
 
-    void drawCustom(SDL_Surface *surface, const SDL_Rect &dst) override;
+	void drawCustom(SDL_Surface *surface, const SDL_Rect &dst) override;
 
-    InputReactionHint handleInput(int &dirty, int &quit) override;
+	InputReactionHint handleInput(int &dirty, int &quit) override;
 
-private:
-    // handle_keyboard_input interprets keyboard input events and mutates app state
-    void handleKeyboardInput(AppState &state);
+  private:
+	// handle_keyboard_input interprets keyboard input events and mutates app state
+	void handleKeyboardInput(AppState &state);
 
-    // cursor_rescue ensures the cursor lands on a valid key and doesn't get lost in empty space
-    void cursorRescue(AppState &state, const KeyboardLayout& current_layout, int num_rows);
+	// cursor_rescue ensures the cursor lands on a valid key and doesn't get lost in empty space
+	void cursorRescue(AppState &state, const KeyboardLayout &current_layout, int num_rows);
 
-    // count_row_length returns the number of non-empty characters in a keyboard row
-    int countRowLength(const KeyboardLayout& current_layout, int row);
+	// count_row_length returns the number of non-empty characters in a keyboard row
+	int countRowLength(const KeyboardLayout &current_layout, int row);
 
-    // calculate_column_offset returns the offset between two rows
-    int calculateColumnOffset(const KeyboardLayout& current_layout, int from_row, int to_row);
+	// calculate_column_offset returns the offset between two rows
+	int calculateColumnOffset(const KeyboardLayout &current_layout, int from_row, int to_row);
 
-    // adjust_offset_exit_last_row adjusts offset when exiting the last row
-    int adjustOffsetExitLastRow(int offset, int column);
+	// adjust_offset_exit_last_row adjusts offset when exiting the last row
+	int adjustOffsetExitLastRow(int offset, int column);
 
-    // adjust_offset_enter_last_row adjusts offset when entering the last row
-    int adjustOffsetEnterLastRow(int offset, int col, int center);
+	// adjust_offset_enter_last_row adjusts offset when entering the last row
+	int adjustOffsetEnterLastRow(int offset, int col, int center);
 
-    // get_current_layout returns the appropriate keyboard layout array based on the current state
-    const KeyboardLayout& getCurrentLayout(const AppState &state);
+	// get_current_layout returns the appropriate keyboard layout array based on the current state
+	const KeyboardLayout &getCurrentLayout(const AppState &state);
 
-    // draw_keyboard interprets the app state and draws it as a keyboard to the screen
-    void drawKeyboard(SDL_Surface *screen, const AppState &state);
+	// draw_keyboard interprets the app state and draws it as a keyboard to the screen
+	void drawKeyboard(SDL_Surface *screen, const AppState &state);
 };
\ No newline at end of file
diff --git a/workspace/all/settings/menu.cpp b/workspace/all/settings/menu.cpp
index 1ff349887..166de2490 100644
--- a/workspace/all/settings/menu.cpp
+++ b/workspace/all/settings/menu.cpp
@@ -1,7 +1,6 @@
 #include "menu.hpp"
 
-extern "C"
-{
+extern "C" {
 #include "defines.h"
 #include "api.h"
 #include "utils.h"
@@ -10,814 +9,711 @@ extern "C"
 #include <mutex>
 #include <shared_mutex>
 typedef std::shared_mutex Lock;
-typedef std::unique_lock< Lock >  WriteLock;
-typedef std::shared_lock< Lock >  ReadLock;
+typedef std::unique_lock<Lock> WriteLock;
+typedef std::shared_lock<Lock> ReadLock;
 
 ///////////////////////////////////////////////////////////
 
 MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc,
-                   const std::vector<std::any> &values, const std::vector<std::string> &labels,
-                   ValueGetCallback on_get, ValueSetCallback on_set, ValueResetCallback on_reset, 
-                   MenuListCallback on_confirm, MenuList *submenu)
-    : AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu), 
-    values(values), labels(labels)
+				   const std::vector<std::any> &values, const std::vector<std::string> &labels, ValueGetCallback on_get,
+				   ValueSetCallback on_set, ValueResetCallback on_reset, MenuListCallback on_confirm, MenuList *submenu)
+	: AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu), values(values), labels(labels)
 {
-    initSelection();
+	initSelection();
 }
 
-MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc, const std::vector<std::any> &values,
-                   ValueGetCallback on_get, ValueSetCallback on_set, ValueResetCallback on_reset,
-                   MenuListCallback on_confirm, MenuList *submenu)
-    : AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu), 
-    values(values) /*labels({}),*/
+MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc,
+				   const std::vector<std::any> &values, ValueGetCallback on_get, ValueSetCallback on_set,
+				   ValueResetCallback on_reset, MenuListCallback on_confirm, MenuList *submenu)
+	: AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu), values(values) /*labels({}),*/
 {
-    generateDefaultLabels();
-    initSelection();
+	generateDefaultLabels();
+	initSelection();
 }
 
-MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc, 
-                   int min, int max, const std::string suffix,
-                   ValueGetCallback on_get, ValueSetCallback on_set, ValueResetCallback on_reset,
-                   MenuListCallback on_confirm, MenuList *submenu)
-    : AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu)
+MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc, int min, int max,
+				   const std::string suffix, ValueGetCallback on_get, ValueSetCallback on_set,
+				   ValueResetCallback on_reset, MenuListCallback on_confirm, MenuList *submenu)
+	: AbstractMenuItem(type, name, desc, on_get, on_set, on_reset, on_confirm, submenu)
 {
-    const int step = 1; // until we need it
-    const int num = (max - min) / step + 1;
-    for (int i = 0; i < num; i++)
-        values.push_back(min + i * step);
-
-    generateDefaultLabels(suffix);
-    initSelection();
-    assert(valueIdx >= 0);
+	const int step = 1; // until we need it
+	const int num = (max - min) / step + 1;
+	for (int i = 0; i < num; i++)
+		values.push_back(min + i * step);
+
+	generateDefaultLabels(suffix);
+	initSelection();
+	assert(valueIdx >= 0);
 }
 
-MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc,
-    MenuListCallback on_confirm, MenuList *submenu)
-    : MenuItem(type, name, desc, 0,0, "", nullptr, nullptr, nullptr, on_confirm, submenu)
-{}
+MenuItem::MenuItem(ListItemType type, const std::string &name, const std::string &desc, MenuListCallback on_confirm,
+				   MenuList *submenu)
+	: MenuItem(type, name, desc, 0, 0, "", nullptr, nullptr, nullptr, on_confirm, submenu)
+{
+}
 
-void MenuItem::generateDefaultLabels(const std::string& suffix)
+void MenuItem::generateDefaultLabels(const std::string &suffix)
 {
-    labels.clear();
-    for (auto v : values)
-    {
-        if (v.type() == typeid(std::string))
-            labels.push_back(std::any_cast<std::string>(v) + suffix);
-        else if (v.type() == typeid(float))
-            labels.push_back(std::to_string(std::any_cast<float>(v)) + suffix);
-        else if (v.type() == typeid(int))
-            labels.push_back(std::to_string(std::any_cast<int>(v)) + suffix);
-        else if (v.type() == typeid(uint32_t))
-            labels.push_back(std::to_string(std::any_cast<uint32_t>(v)) + suffix);
-        else if (v.type() == typeid(bool))
-            labels.push_back((std::any_cast<bool>(v) ? "On" : "Off") + suffix);
-        else
-            assert(false); // needs more string conversion
-    }
+	labels.clear();
+	for (auto v : values) {
+		if (v.type() == typeid(std::string))
+			labels.push_back(std::any_cast<std::string>(v) + suffix);
+		else if (v.type() == typeid(float))
+			labels.push_back(std::to_string(std::any_cast<float>(v)) + suffix);
+		else if (v.type() == typeid(int))
+			labels.push_back(std::to_string(std::any_cast<int>(v)) + suffix);
+		else if (v.type() == typeid(uint32_t))
+			labels.push_back(std::to_string(std::any_cast<uint32_t>(v)) + suffix);
+		else if (v.type() == typeid(bool))
+			labels.push_back((std::any_cast<bool>(v) ? "On" : "Off") + suffix);
+		else
+			assert(false); // needs more string conversion
+	}
 }
 
 void MenuItem::initSelection()
 {
-    int oldValueIdx = valueIdx;
-    valueIdx = -1;
-    if (!values.empty())
-    {
-        valueIdx = 0;
-        if (on_get)
-        {
-            // we know we can convert both std::any values to the same type
-            const auto initialVal = on_get();
-            try
-            {
-                for (int i = 0; i < values.size(); i++)
-                {
-                    const auto &v = values[i];
-                    if (v.type() != initialVal.type())
-                        LOG_error("type mismatch: %s vs. %s", v.type().name(), initialVal.type().name());
-
-                    assert(v.type() == initialVal.type());
-
-                    if (v.type() == typeid(float))
-                    {
-                        if (std::any_cast<float>(initialVal) == std::any_cast<float>(v))
-                        {
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(int))
-                    {
-                        if (std::any_cast<int>(initialVal) == std::any_cast<int>(v))
-                        {
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(unsigned int))
-                    {
-                        if (std::any_cast<unsigned int>(initialVal) == std::any_cast<unsigned int>(v))
-                        {
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(uint32_t))
-                    {
-                        if (std::any_cast<uint32_t>(initialVal) == std::any_cast<uint32_t>(v))
-                        {
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(bool))
-                    {
-                        if (std::any_cast<bool>(initialVal) == std::any_cast<bool>(v))
-                        {
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(std::string))
-                    {
-                        if (std::any_cast<std::string>(initialVal) == std::any_cast<std::string>(v))
-                        {
-                            //LOG_info("Found equal strings %s and %s\n", initialVal, v);
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else if (v.type() == typeid(std::basic_string<char>))
-                    {
-                        if (std::any_cast<std::basic_string<char>>(initialVal) == std::any_cast<std::basic_string<char>>(v))
-                        {
-                            //LOG_info("Found equal basic strings %s and %s\n", initialVal, v);
-                            valueIdx = i;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        LOG_warn("Cant initialize selection for %s from unknown type %s\n", this->getLabel(), v.type().name());
-                        // assert(false);
-                    }
-                }
-            }
-            catch (...)
-            {
-                // bad any cast
-                LOG_warn("Bad any cast for %s\n", this->getLabel());
-            }
-            // this sadly doesnt work with std::any
-            // auto it = std::find(values.cbegin(), values.cend(), on_get());
-            // if (it == std::end(values))
-            //    valueIdx = -1;
-            // else
-            //    valueIdx = std::distance(values.cbegin(), it);
-        }
-        assert(valueIdx >= 0);
-    }
+	int oldValueIdx = valueIdx;
+	valueIdx = -1;
+	if (!values.empty()) {
+		valueIdx = 0;
+		if (on_get) {
+			// we know we can convert both std::any values to the same type
+			const auto initialVal = on_get();
+			try {
+				for (int i = 0; i < values.size(); i++) {
+					const auto &v = values[i];
+					if (v.type() != initialVal.type())
+						LOG_error("type mismatch: %s vs. %s", v.type().name(), initialVal.type().name());
+
+					assert(v.type() == initialVal.type());
+
+					if (v.type() == typeid(float)) {
+						if (std::any_cast<float>(initialVal) == std::any_cast<float>(v)) {
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(int)) {
+						if (std::any_cast<int>(initialVal) == std::any_cast<int>(v)) {
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(unsigned int)) {
+						if (std::any_cast<unsigned int>(initialVal) == std::any_cast<unsigned int>(v)) {
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(uint32_t)) {
+						if (std::any_cast<uint32_t>(initialVal) == std::any_cast<uint32_t>(v)) {
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(bool)) {
+						if (std::any_cast<bool>(initialVal) == std::any_cast<bool>(v)) {
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(std::string)) {
+						if (std::any_cast<std::string>(initialVal) == std::any_cast<std::string>(v)) {
+							// LOG_info("Found equal strings %s and %s\n", initialVal, v);
+							valueIdx = i;
+							break;
+						}
+					} else if (v.type() == typeid(std::basic_string<char>)) {
+						if (std::any_cast<std::basic_string<char>>(initialVal) ==
+							std::any_cast<std::basic_string<char>>(v)) {
+							// LOG_info("Found equal basic strings %s and %s\n", initialVal, v);
+							valueIdx = i;
+							break;
+						}
+					} else {
+						LOG_warn("Cant initialize selection for %s from unknown type %s\n", this->getLabel(),
+								 v.type().name());
+						// assert(false);
+					}
+				}
+			} catch (...) {
+				// bad any cast
+				LOG_warn("Bad any cast for %s\n", this->getLabel());
+			}
+			// this sadly doesnt work with std::any
+			// auto it = std::find(values.cbegin(), values.cend(), on_get());
+			// if (it == std::end(values))
+			//    valueIdx = -1;
+			// else
+			//    valueIdx = std::distance(values.cbegin(), it);
+		}
+		assert(valueIdx >= 0);
+	}
 }
 
 InputReactionHint MenuItem::handleInput(int &dirty)
 {
-    InputReactionHint hint = Unhandled;
-
-    if (deferred)
-    {
-        assert(submenu);
-        int subMenuJustClosed = 0;
-        hint = submenu->handleInput(dirty, subMenuJustClosed);
-        if (subMenuJustClosed) {
-            defer(false);
-            dirty = 1;
-        }
-        return hint;
-    }
-
-    // handle our custom behavior and return true if the input was handled
-    if (PAD_justRepeated(BTN_LEFT))
-    {
-        hint = NoOp;
-        if (prevValue())
-        {
-            if (on_set)
-                on_set(getValue());
-            dirty = 1;
-        }
-    }
-    else if (PAD_justRepeated(BTN_RIGHT))
-    {
-        hint = NoOp;
-        if (nextValue())
-        {
-            if (on_set)
-                on_set(getValue());
-            dirty = 1;
-        }
-    }
-    if (PAD_justRepeated(BTN_L1))
-    {
-        hint = NoOp;
-        if (prev(10))
-        {
-            if (on_set)
-                on_set(getValue());
-            dirty = 1;
-        }
-    }
-    else if (PAD_justRepeated(BTN_R1))
-    {
-        hint = NoOp;
-        if (next(10))
-        {
-            if (on_set)
-                on_set(getValue());
-            dirty = 1;
-        }
-    }
-    else if (PAD_justPressed(BTN_A))
-    {
-        hint = NoOp; // not really, should check on_confirm
-        if (on_confirm)
-            hint = on_confirm(*this);
-        dirty = 1;
-    }
-
-    return hint;
+	InputReactionHint hint = Unhandled;
+
+	if (deferred) {
+		assert(submenu);
+		int subMenuJustClosed = 0;
+		hint = submenu->handleInput(dirty, subMenuJustClosed);
+		if (subMenuJustClosed) {
+			defer(false);
+			dirty = 1;
+		}
+		return hint;
+	}
+
+	// handle our custom behavior and return true if the input was handled
+	if (PAD_justRepeated(BTN_LEFT)) {
+		hint = NoOp;
+		if (prevValue()) {
+			if (on_set)
+				on_set(getValue());
+			dirty = 1;
+		}
+	} else if (PAD_justRepeated(BTN_RIGHT)) {
+		hint = NoOp;
+		if (nextValue()) {
+			if (on_set)
+				on_set(getValue());
+			dirty = 1;
+		}
+	}
+	if (PAD_justRepeated(BTN_L1)) {
+		hint = NoOp;
+		if (prev(10)) {
+			if (on_set)
+				on_set(getValue());
+			dirty = 1;
+		}
+	} else if (PAD_justRepeated(BTN_R1)) {
+		hint = NoOp;
+		if (next(10)) {
+			if (on_set)
+				on_set(getValue());
+			dirty = 1;
+		}
+	} else if (PAD_justPressed(BTN_A)) {
+		hint = NoOp; // not really, should check on_confirm
+		if (on_confirm)
+			hint = on_confirm(*this);
+		dirty = 1;
+	}
+
+	return hint;
 }
 
 bool MenuItem::next(int n)
 {
-    if (valueIdx < 0)
-        return false;
-    valueIdx = (valueIdx + n) % values.size();
-    return true;
+	if (valueIdx < 0)
+		return false;
+	valueIdx = (valueIdx + n) % values.size();
+	return true;
 }
 
 bool MenuItem::prev(int n)
 {
-    if (valueIdx < 0)
-        return false;
-    valueIdx = (valueIdx + values.size() - n) % values.size();
-    return true;
+	if (valueIdx < 0)
+		return false;
+	valueIdx = (valueIdx + values.size() - n) % values.size();
+	return true;
 }
 
 ///////////////////////////////////////////////////////////
 
-MenuList::MenuList(MenuItemType type, const std::string &descp, std::vector<AbstractMenuItem*> items, MenuListCallback on_change, MenuListCallback on_confirm)
-    : type(type), desc(descp), items(items), on_change(on_change), on_confirm(on_confirm)
+MenuList::MenuList(MenuItemType type, const std::string &descp, std::vector<AbstractMenuItem *> items,
+				   MenuListCallback on_change, MenuListCallback on_confirm)
+	: type(type), desc(descp), items(items), on_change(on_change), on_confirm(on_confirm)
 {
-    // best effort layout based on the platform defines, user should really call performLayout manually
-    performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-    layout_called = false;
+	// best effort layout based on the platform defines, user should really call performLayout manually
+	performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+	layout_called = false;
 }
 
 MenuList::~MenuList()
 {
-    WriteLock w(itemLock);
-    for (auto item : items)
-        delete item;
-    items.clear();
+	WriteLock w(itemLock);
+	for (auto item : items)
+		delete item;
+	items.clear();
 }
 
 void MenuList::performLayout(const SDL_Rect &dst)
 {
-    ReadLock r(itemLock);
-    // TODO: consecutive calls to this should only update max_visible rows
-    // and try to persist the current selection state
-    // TODO: If we ever need to add menu entries dynamically, this potentially
-    // needs to be called again after.
-    scope.start = 0;
-    scope.selected = 0;
-    scope.count = items.size();
-    if (type == MenuItemType::Main)
-    {
-        scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE)) / SCALE1(PILL_SIZE);
-    }
-    else
-    {
-        // we are leaving some space to show the description label here, account for roughly two lines or one pill
-        // also account for the scroll icon, in case we need it.
-        // scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE * 2)) / SCALE1(BUTTON_SIZE);
-        scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE)) / SCALE1(BUTTON_SIZE);
-    }
-    scope.end = std::min(scope.count, scope.max_visible_options);
-    scope.visible_rows = scope.end;
-
-    for (auto itm : items)
-        if (itm->getSubMenu())
-            itm->getSubMenu()->performLayout(dst);
-
-    layout_called = true;
+	ReadLock r(itemLock);
+	// TODO: consecutive calls to this should only update max_visible rows
+	// and try to persist the current selection state
+	// TODO: If we ever need to add menu entries dynamically, this potentially
+	// needs to be called again after.
+	scope.start = 0;
+	scope.selected = 0;
+	scope.count = items.size();
+	if (type == MenuItemType::Main) {
+		scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE)) / SCALE1(PILL_SIZE);
+	} else {
+		// we are leaving some space to show the description label here, account for roughly two lines or one pill
+		// also account for the scroll icon, in case we need it.
+		// scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE * 2)) / SCALE1(BUTTON_SIZE);
+		scope.max_visible_options = (dst.h - SCALE1(PILL_SIZE)) / SCALE1(BUTTON_SIZE);
+	}
+	scope.end = std::min(scope.count, scope.max_visible_options);
+	scope.visible_rows = scope.end;
+
+	for (auto itm : items)
+		if (itm->getSubMenu())
+			itm->getSubMenu()->performLayout(dst);
+
+	layout_called = true;
 }
 
 bool MenuList::selectNext()
 {
-    scope.selected++;
-    if (scope.selected >= scope.count)
-    {
-        scope.selected = 0;
-        scope.start = 0;
-        scope.end = scope.visible_rows;
-    }
-    else if (scope.selected >= scope.end)
-    {
-        scope.start++;
-        scope.end++;
-    }
-
-    return true;
+	scope.selected++;
+	if (scope.selected >= scope.count) {
+		scope.selected = 0;
+		scope.start = 0;
+		scope.end = scope.visible_rows;
+	} else if (scope.selected >= scope.end) {
+		scope.start++;
+		scope.end++;
+	}
+
+	return true;
 }
 
 bool MenuList::selectPrev()
 {
-    scope.selected--;
-    if (scope.selected < 0)
-    {
-        scope.selected = scope.count - 1;
-        scope.start = std::max(0, scope.count - scope.max_visible_options);
-        scope.end = scope.count;
-    }
-    else if (scope.selected < scope.start)
-    {
-        scope.start--;
-        scope.end--;
-    }
-
-    return true;
+	scope.selected--;
+	if (scope.selected < 0) {
+		scope.selected = scope.count - 1;
+		scope.start = std::max(0, scope.count - scope.max_visible_options);
+		scope.end = scope.count;
+	} else if (scope.selected < scope.start) {
+		scope.start--;
+		scope.end--;
+	}
+
+	return true;
 }
 
 std::string MenuList::getSelectedItemName() const
 {
-    if(items.empty())
-        return "";
+	if (items.empty())
+		return "";
 
-    int selected_row = scope.selected - scope.start;
-    return items.at(selected_row)->getName();
+	int selected_row = scope.selected - scope.start;
+	return items.at(selected_row)->getName();
 }
 
 bool MenuList::selectByName(const std::string &name)
 {
-    if(name.empty())
-        return false;
-
-    int toSelect = -1;
-    for (int i = 0; i < items.size() && toSelect < 0; i++)
-        if(items.at(i)->getName() == name)
-            toSelect = i;
-    //LOG_info("Found element %s (%d) at pos %d\n", name.c_str(), scope.selected - scope.start, toSelect);
-    if (toSelect >= 0)
-    {
-        performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-        while(toSelect > 0) {
-            selectNext();
-            toSelect--;
-        }
-        return true;
-    }
-    return false;
+	if (name.empty())
+		return false;
+
+	int toSelect = -1;
+	for (int i = 0; i < items.size() && toSelect < 0; i++)
+		if (items.at(i)->getName() == name)
+			toSelect = i;
+	// LOG_info("Found element %s (%d) at pos %d\n", name.c_str(), scope.selected - scope.start, toSelect);
+	if (toSelect >= 0) {
+		performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+		while (toSelect > 0) {
+			selectNext();
+			toSelect--;
+		}
+		return true;
+	}
+	return false;
 }
 
 // returns true if the input was handled
 InputReactionHint MenuList::handleInput(int &dirty, int &quit)
 {
-    ReadLock r(itemLock);
-    InputReactionHint handled = items.at(scope.selected)->handleInput(dirty);
-    if(handled == ResetAllItems) {
-        resetAllItems();
-        dirty = 1;
-        return NoOp;
-    }
-    else if (handled == Exit) {
-        quit = 1;
-        return NoOp;
-    }
-    else if (handled != Unhandled)
-        return handled;
-
-    if (PAD_justRepeated(BTN_UP))
-    {
-        if (scope.selected == 0 && !PAD_justPressed(BTN_UP))
-            return NoOp; // stop at top
-        if (selectPrev())
-            dirty = 1;
-        return NoOp;
-    }
-    else if (PAD_justRepeated(BTN_DOWN))
-    {
-        if (scope.selected == scope.count - 1 && !PAD_justPressed(BTN_DOWN))
-            return NoOp; // stop at bottom
-        if (selectNext())
-            dirty = 1;
-        return NoOp;
-    }
-    else if (on_change)
-    {
-        // do we even need this?
-    }
-    else if (on_confirm && PAD_justPressed(BTN_A))
-    {
-        // do we even need this?
-    }
-    else if (PAD_justPressed(BTN_B))
-    {
-        quit = 1;
-        return NoOp;
-    }
-
-    return Unhandled;
+	ReadLock r(itemLock);
+	InputReactionHint handled = items.at(scope.selected)->handleInput(dirty);
+	if (handled == ResetAllItems) {
+		resetAllItems();
+		dirty = 1;
+		return NoOp;
+	} else if (handled == Exit) {
+		quit = 1;
+		return NoOp;
+	} else if (handled != Unhandled)
+		return handled;
+
+	if (PAD_justRepeated(BTN_UP)) {
+		if (scope.selected == 0 && !PAD_justPressed(BTN_UP))
+			return NoOp; // stop at top
+		if (selectPrev())
+			dirty = 1;
+		return NoOp;
+	} else if (PAD_justRepeated(BTN_DOWN)) {
+		if (scope.selected == scope.count - 1 && !PAD_justPressed(BTN_DOWN))
+			return NoOp; // stop at bottom
+		if (selectNext())
+			dirty = 1;
+		return NoOp;
+	} else if (on_change) {
+		// do we even need this?
+	} else if (on_confirm && PAD_justPressed(BTN_A)) {
+		// do we even need this?
+	} else if (PAD_justPressed(BTN_B)) {
+		quit = 1;
+		return NoOp;
+	}
+
+	return Unhandled;
 }
 
 SDL_Rect MenuList::itemSizeHint(const AbstractMenuItem &item)
 {
-    if (type == MenuItemType::Fixed)
-    {
-        return {0, 0, 0, SCALE1(PILL_SIZE)};
-    }
-    else if (type == MenuItemType::List)
-    {
-        // calculate the size of the list
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        return {0, 0, w, SCALE1(PILL_SIZE)};
-    }
-    else if (type == MenuItemType::Input || type == MenuItemType::Var)
-    {
-        int w = 0;
-        int lw = 0;
-        int rw = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &lw, NULL);
-        // get the width of the widest row
-        int mrw = 0;
-        // every value list in an input table is the same
-        // so only calculate rw for the first item...
-        if (!mrw || type != MenuItemType::Input)
-        {
-            for (int j = 0; item.getValues().size() > j && !item.getLabels()[j].empty(); j++)
-            {
-                TTF_SizeUTF8(font.tiny, item.getLabels()[j].c_str(), &rw, NULL);
-                if (lw + rw > w)
-                    w = lw + rw;
-                if (rw > mrw)
-                    mrw = rw;
-            }
-        }
-        else
-        {
-            w = lw + mrw;
-        }
-        w += SCALE1(OPTION_PADDING * 4);
-        return {0, 0, w, SCALE1(PILL_SIZE)};
-    }
-    else if (type == MenuItemType::Main)
-    {
-        int w = 0;
-        TTF_SizeUTF8(font.large, item.getName().c_str(), &w, NULL);
-        w += SCALE1(BUTTON_PADDING * 2);
-        return {0, 0, w, SCALE1(PILL_SIZE)};
-    }
-    else
-    {
-        assert(false); // new enum value?
-    }
+	if (type == MenuItemType::Fixed) {
+		return {0, 0, 0, SCALE1(PILL_SIZE)};
+	} else if (type == MenuItemType::List) {
+		// calculate the size of the list
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		return {0, 0, w, SCALE1(PILL_SIZE)};
+	} else if (type == MenuItemType::Input || type == MenuItemType::Var) {
+		int w = 0;
+		int lw = 0;
+		int rw = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &lw, NULL);
+		// get the width of the widest row
+		int mrw = 0;
+		// every value list in an input table is the same
+		// so only calculate rw for the first item...
+		if (!mrw || type != MenuItemType::Input) {
+			for (int j = 0; item.getValues().size() > j && !item.getLabels()[j].empty(); j++) {
+				TTF_SizeUTF8(font.tiny, item.getLabels()[j].c_str(), &rw, NULL);
+				if (lw + rw > w)
+					w = lw + rw;
+				if (rw > mrw)
+					mrw = rw;
+			}
+		} else {
+			w = lw + mrw;
+		}
+		w += SCALE1(OPTION_PADDING * 4);
+		return {0, 0, w, SCALE1(PILL_SIZE)};
+	} else if (type == MenuItemType::Main) {
+		int w = 0;
+		TTF_SizeUTF8(font.large, item.getName().c_str(), &w, NULL);
+		w += SCALE1(BUTTON_PADDING * 2);
+		return {0, 0, w, SCALE1(PILL_SIZE)};
+	} else {
+		assert(false); // new enum value?
+	}
 }
 
 void MenuList::draw(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    assert(layout_called);
-    ReadLock r(itemLock);
-
-    auto cur = !items.empty() ? items.at(scope.selected) : nullptr;
-    if (cur && cur->isDeferred())
-    {
-        assert(cur->getSubMenu());
-        cur->getSubMenu()->draw(surface, dst);
-    }
-    else
-    {
-        // iterate all items and draw them vertically
-        switch (type)
-        {
-        case MenuItemType::List:
-            drawList(surface, dst);
-            break;
-        case MenuItemType::Fixed:
-            drawFixed(surface, dst);
-            break;
-        case MenuItemType::Var:
-        case MenuItemType::Input:
-            drawInput(surface, dst);
-            break;
-        case MenuItemType::Main:
-            drawMain(surface, dst);
-            break;
-        case MenuItemType::Custom:
-            drawCustom(surface, dst);
-            return; // no further drawing over custom
-        default:
-            assert(false && "Unknown list type");
-        }
-
-        // Handle overflow (anything but Main and Custom)
-        if (type != MenuItemType::Main && items.size() > scope.max_visible_options)
-        {
-            const int SCROLL_WIDTH = 24;
-            const int SCROLL_HEIGHT = 4;
-            SDL_Rect rect = dst;
-            rect = dx(rect, (rect.w - SCALE1(SCROLL_WIDTH)) / 2);
-            rect = dy(rect, SCALE1((-SCROLL_HEIGHT) / 2));
-
-            if (scope.start > 0)
-                // assumes there is some padding above we can yoink
-                GFX_blitAssetCPP(ASSET_SCROLL_UP, {}, surface, {rect.x, rect.y - SCALE1(PADDING)});
-            if (scope.end < scope.count)
-                // this is with 2 * pill_size bottom margin
-                // GFX_blitAssetCPP(ASSET_SCROLL_DOWN, {}, surface, {rect.x, rect.h - SCALE1(PADDING + PILL_SIZE + BUTTON_SIZE) + rect.y});
-                GFX_blitAssetCPP(ASSET_SCROLL_DOWN, {}, surface, {rect.x, rect.h - SCALE1(PADDING + PILL_SIZE) + rect.y});
-        }
-
-        if (cur && cur->getDesc().length() > 0)
-        {
-            int w, h;
-            const auto description = cur->getDesc();
-            GFX_sizeText(font.tiny, description.c_str(), SCALE1(FONT_SMALL), &w, &h);
-            GFX_blitTextCPP(font.tiny, description.c_str(), SCALE1(FONT_SMALL), uintToColour(THEME_COLOR4_255), surface, {(dst.x + dst.w - w) / 2, dst.y + dst.h - h, w, h});
-        }
-    }
+	assert(layout_called);
+	ReadLock r(itemLock);
+
+	auto cur = !items.empty() ? items.at(scope.selected) : nullptr;
+	if (cur && cur->isDeferred()) {
+		assert(cur->getSubMenu());
+		cur->getSubMenu()->draw(surface, dst);
+	} else {
+		// iterate all items and draw them vertically
+		switch (type) {
+		case MenuItemType::List:
+			drawList(surface, dst);
+			break;
+		case MenuItemType::Fixed:
+			drawFixed(surface, dst);
+			break;
+		case MenuItemType::Var:
+		case MenuItemType::Input:
+			drawInput(surface, dst);
+			break;
+		case MenuItemType::Main:
+			drawMain(surface, dst);
+			break;
+		case MenuItemType::Custom:
+			drawCustom(surface, dst);
+			return; // no further drawing over custom
+		default:
+			assert(false && "Unknown list type");
+		}
+
+		// Handle overflow (anything but Main and Custom)
+		if (type != MenuItemType::Main && items.size() > scope.max_visible_options) {
+			const int SCROLL_WIDTH = 24;
+			const int SCROLL_HEIGHT = 4;
+			SDL_Rect rect = dst;
+			rect = dx(rect, (rect.w - SCALE1(SCROLL_WIDTH)) / 2);
+			rect = dy(rect, SCALE1((-SCROLL_HEIGHT) / 2));
+
+			if (scope.start > 0)
+				// assumes there is some padding above we can yoink
+				GFX_blitAssetCPP(ASSET_SCROLL_UP, {}, surface, {rect.x, rect.y - SCALE1(PADDING)});
+			if (scope.end < scope.count)
+				// this is with 2 * pill_size bottom margin
+				// GFX_blitAssetCPP(ASSET_SCROLL_DOWN, {}, surface, {rect.x, rect.h - SCALE1(PADDING + PILL_SIZE +
+				// BUTTON_SIZE) + rect.y});
+				GFX_blitAssetCPP(ASSET_SCROLL_DOWN, {}, surface,
+								 {rect.x, rect.h - SCALE1(PADDING + PILL_SIZE) + rect.y});
+		}
+
+		if (cur && cur->getDesc().length() > 0) {
+			int w, h;
+			const auto description = cur->getDesc();
+			GFX_sizeText(font.tiny, description.c_str(), SCALE1(FONT_SMALL), &w, &h);
+			GFX_blitTextCPP(font.tiny, description.c_str(), SCALE1(FONT_SMALL), uintToColour(THEME_COLOR4_255), surface,
+							{(dst.x + dst.w - w) / 2, dst.y + dst.h - h, w, h});
+		}
+	}
 }
 
 void MenuList::drawList(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    // we ignore type here, it all paints the same.
-    if (max_width == 0)
-    {
-        int mw = 0;
-        for (auto item : items)
-        {
-            auto hintRect = itemSizeHint(*item);
-            if (hintRect.w > mw)
-                mw = hintRect.w;
-        }
-        // cache the result
-        max_width = std::min(mw, dst.w);
-    }
-
-    SDL_Rect rect = dst;
-    rect = dx(rect, (rect.w - max_width) / 2);
-
-    int selected_row = scope.selected - scope.start;
-    for (int i = scope.start, j = 0; i < scope.end; i++, j++)
-    {
-        auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
-        pos.h = SCALE1(BUTTON_SIZE);
-        drawListItem(surface, pos, *items[i], j == selected_row);
-    }
+	// we ignore type here, it all paints the same.
+	if (max_width == 0) {
+		int mw = 0;
+		for (auto item : items) {
+			auto hintRect = itemSizeHint(*item);
+			if (hintRect.w > mw)
+				mw = hintRect.w;
+		}
+		// cache the result
+		max_width = std::min(mw, dst.w);
+	}
+
+	SDL_Rect rect = dst;
+	rect = dx(rect, (rect.w - max_width) / 2);
+
+	int selected_row = scope.selected - scope.start;
+	for (int i = scope.start, j = 0; i < scope.end; i++, j++) {
+		auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
+		pos.h = SCALE1(BUTTON_SIZE);
+		drawListItem(surface, pos, *items[i], j == selected_row);
+	}
 }
 
 void MenuList::drawListItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected)
 {
-    SDL_Color text_color = uintToColour(THEME_COLOR4_255);
-    SDL_Surface *text;
-
-    // int ox = (dst.w - w) / 2; // if we're centering these (but I don't think we should after seeing it)
-    if (selected)
-    {
-        // move out of conditional if centering
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = uintToColour(THEME_COLOR5_255);
-    }
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y  + ((dst.h - text->h) / 2)});
-    SDL_FreeSurface(text);
+	SDL_Color text_color = uintToColour(THEME_COLOR4_255);
+	SDL_Surface *text;
+
+	// int ox = (dst.w - w) / 2; // if we're centering these (but I don't think we should after seeing it)
+	if (selected) {
+		// move out of conditional if centering
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = uintToColour(THEME_COLOR5_255);
+	}
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
+	SDL_FreeSurface(text);
 }
 
 void MenuList::drawFixed(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    // NOTE: no need to calculate max width
-    int mw = dst.w;
-    // int lw,rw;
-    // lw = rw = mw / 2;
-    max_width = mw; // not sure about this one
-
-    SDL_Rect rect = dst;
-
-    int selected_row = scope.selected - scope.start;
-    for (int i = scope.start, j = 0; i < scope.end; i++, j++)
-    {
-        auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
-        pos.h = SCALE1(BUTTON_SIZE);
-        drawFixedItem(surface, pos, *items[i], j == selected_row);
-    }
+	// NOTE: no need to calculate max width
+	int mw = dst.w;
+	// int lw,rw;
+	// lw = rw = mw / 2;
+	max_width = mw; // not sure about this one
+
+	SDL_Rect rect = dst;
+
+	int selected_row = scope.selected - scope.start;
+	for (int i = scope.start, j = 0; i < scope.end; i++, j++) {
+		auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
+		pos.h = SCALE1(BUTTON_SIZE);
+		drawFixedItem(surface, pos, *items[i], j == selected_row);
+	}
 }
 
 // TODO: expose API functions that do the same
 namespace
 {
-    static inline void rgb_unpack(uint32_t col, int *r, int *g, int *b)
-    {
-        *r = (col >> 16) & 0xff;
-        *g = (col >> 8) & 0xff;
-        *b = col & 0xff;
-    }
-
-    static inline uint32_t mapUint(SDL_Surface *surface, uint32_t col)
-    {
-        int r, g, b;
-        rgb_unpack(col, &r, &g, &b);
-        return SDL_MapRGB(surface->format, r, g, b);
-    }
+static inline void rgb_unpack(uint32_t col, int *r, int *g, int *b)
+{
+	*r = (col >> 16) & 0xff;
+	*g = (col >> 8) & 0xff;
+	*b = col & 0xff;
+}
+
+static inline uint32_t mapUint(SDL_Surface *surface, uint32_t col)
+{
+	int r, g, b;
+	rgb_unpack(col, &r, &g, &b);
+	return SDL_MapRGB(surface->format, r, g, b);
 }
+} // namespace
 
 void MenuList::drawFixedItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected)
 {
-    SDL_Color text_color = uintToColour(THEME_COLOR4_255);
-    SDL_Color text_color_value = uintToColour(THEME_COLOR4_255);
-    SDL_Surface *text;
-
-    // hack - this should be correlated to max_width
-    int mw = dst.w;
-
-    if (selected)
-    {
-        // gray pill
-        GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
-    }
-
-    if (item.getValue().has_value())
-    {
-        text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), text_color_value);
-
-        if (item.getType() == ListItemType::Color)
-        {
-            uint32_t color = mapUint(surface, std::any_cast<uint32_t>(item.getValue()));
-            SDL_Rect rect = {
-                dst.x + dst.w - SCALE1(OPTION_PADDING + FONT_TINY),
-                dst.y + SCALE1(BUTTON_SIZE - FONT_TINY) / 2,
-                SCALE1(FONT_TINY), SCALE1(FONT_TINY)};
-            SDL_FillRect(surface, &rect, RGB_WHITE);
-            rect = dy(dx(rect, 1), 1);
-            rect.h -= 1;
-            rect.w -= 1;
-            SDL_FillRect(surface, &rect, color);
+	SDL_Color text_color = uintToColour(THEME_COLOR4_255);
+	SDL_Color text_color_value = uintToColour(THEME_COLOR4_255);
+	SDL_Surface *text;
+
+	// hack - this should be correlated to max_width
+	int mw = dst.w;
+
+	if (selected) {
+		// gray pill
+		GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
+	}
+
+	if (item.getValue().has_value()) {
+		text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), text_color_value);
+
+		if (item.getType() == ListItemType::Color) {
+			uint32_t color = mapUint(surface, std::any_cast<uint32_t>(item.getValue()));
+			SDL_Rect rect = {dst.x + dst.w - SCALE1(OPTION_PADDING + FONT_TINY),
+							 dst.y + SCALE1(BUTTON_SIZE - FONT_TINY) / 2, SCALE1(FONT_TINY), SCALE1(FONT_TINY)};
+			SDL_FillRect(surface, &rect, RGB_WHITE);
+			rect = dy(dx(rect, 1), 1);
+			rect.h -= 1;
+			rect.w -= 1;
+			SDL_FillRect(surface, &rect, color);
 #define COLOR_PADDING 4
-            SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + mw - text->w - SCALE1(OPTION_PADDING + COLOR_PADDING + FONT_TINY), dst.y + ((dst.h - text->h) / 2)});
-        }
-        else if(item.getType() == ListItemType::Button) {
-            // dont draw anything for now, could be a button hint later
-        }
-        else if(item.getType() == ListItemType::Custom) {
-            item.drawCustomItem(surface, dst, item, selected);
-        }
-        else // Generic and fallback
-            SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + mw - text->w - SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
-        SDL_FreeSurface(text);
-    }
-
-    // TODO: blit a black pill on unselected rows (to cover longer item->values?) or truncate longer item->values?
-    if (selected)
-    {
-        // white pill
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = uintToColour(THEME_COLOR5_255);
-    }
-
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
-    SDL_FreeSurface(text);
+			SDL_BlitSurfaceCPP(text, {}, surface,
+							   {dst.x + mw - text->w - SCALE1(OPTION_PADDING + COLOR_PADDING + FONT_TINY),
+								dst.y + ((dst.h - text->h) / 2)});
+		} else if (item.getType() == ListItemType::Button) {
+			// dont draw anything for now, could be a button hint later
+		} else if (item.getType() == ListItemType::Custom) {
+			item.drawCustomItem(surface, dst, item, selected);
+		} else // Generic and fallback
+			SDL_BlitSurfaceCPP(text, {}, surface,
+							   {dst.x + mw - text->w - SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
+		SDL_FreeSurface(text);
+	}
+
+	// TODO: blit a black pill on unselected rows (to cover longer item->values?) or truncate longer item->values?
+	if (selected) {
+		// white pill
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = uintToColour(THEME_COLOR5_255);
+	}
+
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
+	SDL_FreeSurface(text);
 }
 
 void MenuList::drawInput(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    // TODO: handle type if we need it
-    if (max_width == 0)
-    {
-        // get the width of the widest row
-        int mw = 0;
-        for (auto item : items)
-        {
-            auto hintRect = itemSizeHint(*item);
-            if (hintRect.w > mw)
-                mw = hintRect.w;
-        }
-        // cache the result
-        max_width = std::min(mw, dst.w);
-    }
-
-    SDL_Rect rect = dst;
-    rect = dx(rect, (rect.w - max_width) / 2);
-
-    int selected_row = scope.selected - scope.start;
-    for (int i = scope.start, j = 0; i < scope.end; i++, j++)
-    {
-        auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
-        pos.h = SCALE1(BUTTON_SIZE);
-        pos.w = max_width;
-        drawInputItem(surface, pos, *items[i], j == selected_row);
-    }
+	// TODO: handle type if we need it
+	if (max_width == 0) {
+		// get the width of the widest row
+		int mw = 0;
+		for (auto item : items) {
+			auto hintRect = itemSizeHint(*item);
+			if (hintRect.w > mw)
+				mw = hintRect.w;
+		}
+		// cache the result
+		max_width = std::min(mw, dst.w);
+	}
+
+	SDL_Rect rect = dst;
+	rect = dx(rect, (rect.w - max_width) / 2);
+
+	int selected_row = scope.selected - scope.start;
+	for (int i = scope.start, j = 0; i < scope.end; i++, j++) {
+		auto pos = dy(rect, SCALE1(j * BUTTON_SIZE));
+		pos.h = SCALE1(BUTTON_SIZE);
+		pos.w = max_width;
+		drawInputItem(surface, pos, *items[i], j == selected_row);
+	}
 }
 
 void MenuList::drawInputItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected)
 {
-    SDL_Color text_color = COLOR_WHITE;
-    SDL_Surface *text;
-
-    // hack
-    int mw = dst.w;
-
-    if (selected)
-    {
-        // gray pill
-        GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
-
-        // white pill
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = COLOR_BLACK;
-    }
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
-    SDL_FreeSurface(text);
-
-    if (/*await_input &&*/ selected)
-    {
-        // buh
-    }
-    else if (item.getValue().has_value())
-    {
-        text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
-        SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + mw - text->w - SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
-        SDL_FreeSurface(text);
-    }
+	SDL_Color text_color = COLOR_WHITE;
+	SDL_Surface *text;
+
+	// hack
+	int mw = dst.w;
+
+	if (selected) {
+		// gray pill
+		GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
+
+		// white pill
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = COLOR_BLACK;
+	}
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
+	SDL_FreeSurface(text);
+
+	if (/*await_input &&*/ selected) {
+		// buh
+	} else if (item.getValue().has_value()) {
+		text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
+		SDL_BlitSurfaceCPP(text, {}, surface,
+						   {dst.x + mw - text->w - SCALE1(OPTION_PADDING), dst.y + ((dst.h - text->h) / 2)});
+		SDL_FreeSurface(text);
+	}
 }
 
 void MenuList::drawMain(SDL_Surface *surface, const SDL_Rect &dst)
 {
-    // we ignore type here, it all paints the same.
-    // no size calc to do here, each line is as wide as needed.
-
-    if (scope.count > 0)
-    {
-        int selected_row = scope.selected - scope.start;
-        for (int i = scope.start, j = 0; i < scope.end; i++, j++)
-        {
-            auto pos = dy(dst, SCALE1(j * PILL_SIZE));
-            pos.h = SCALE1(PILL_SIZE);
-            // auto hintRect = itemSizeHint(items[i]);
-            // pos.w = std::min(pos.w, hintRect.w);
-            // pos.h = std::min(pos.h, hintRect.h);
-
-            drawMainItem(surface, pos, *items[i], j == selected_row);
-        }
-    }
-    else
-    {
-        GFX_blitMessageCPP(font.large, "Empty folder", surface, dst);
-    }
+	// we ignore type here, it all paints the same.
+	// no size calc to do here, each line is as wide as needed.
+
+	if (scope.count > 0) {
+		int selected_row = scope.selected - scope.start;
+		for (int i = scope.start, j = 0; i < scope.end; i++, j++) {
+			auto pos = dy(dst, SCALE1(j * PILL_SIZE));
+			pos.h = SCALE1(PILL_SIZE);
+			// auto hintRect = itemSizeHint(items[i]);
+			// pos.w = std::min(pos.w, hintRect.w);
+			// pos.h = std::min(pos.h, hintRect.h);
+
+			drawMainItem(surface, pos, *items[i], j == selected_row);
+		}
+	} else {
+		GFX_blitMessageCPP(font.large, "Empty folder", surface, dst);
+	}
 }
 
 void MenuList::drawMainItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected)
 {
-    SDL_Color text_color = COLOR_WHITE;
-    SDL_Surface *text;
-
-    // TODO: unique item handling (draws grey text)
-    const bool unique = false;
-
-    char truncated[256];
-    int text_width = GFX_truncateText(font.large, item.getName().c_str(), truncated, dst.w, SCALE1(BUTTON_PADDING * 2));
-    int max_width = std::min(dst.w, text_width);
-
-    if (selected)
-    {
-        GFX_blitPillDarkCPP(ASSET_WHITE_PILL, surface, {dst.x, dst.y, max_width, dst.h});
-        text_color = COLOR_BLACK;
-    }
-    else if (unique)
-    {
-        // TODO: port this over when needed. Its complete spaghetti code...
-    }
-    text = TTF_RenderUTF8_Blended(font.large, truncated, text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(BUTTON_PADDING), dst.y + ((dst.h - text->h) / 2)});
-    SDL_FreeSurface(text);
+	SDL_Color text_color = COLOR_WHITE;
+	SDL_Surface *text;
+
+	// TODO: unique item handling (draws grey text)
+	const bool unique = false;
+
+	char truncated[256];
+	int text_width = GFX_truncateText(font.large, item.getName().c_str(), truncated, dst.w, SCALE1(BUTTON_PADDING * 2));
+	int max_width = std::min(dst.w, text_width);
+
+	if (selected) {
+		GFX_blitPillDarkCPP(ASSET_WHITE_PILL, surface, {dst.x, dst.y, max_width, dst.h});
+		text_color = COLOR_BLACK;
+	} else if (unique) {
+		// TODO: port this over when needed. Its complete spaghetti code...
+	}
+	text = TTF_RenderUTF8_Blended(font.large, truncated, text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(BUTTON_PADDING), dst.y + ((dst.h - text->h) / 2)});
+	SDL_FreeSurface(text);
 }
 
 void MenuList::resetAllItems()
 {
-    ReadLock r(itemLock);
-    for(auto item : items) {
-        if(item->on_reset) {
-            item->on_reset();
-            item->initSelection();
-        }
-    }
+	ReadLock r(itemLock);
+	for (auto item : items) {
+		if (item->on_reset) {
+			item->on_reset();
+			item->initSelection();
+		}
+	}
 }
\ No newline at end of file
diff --git a/workspace/all/settings/menu.hpp b/workspace/all/settings/menu.hpp
index ed4c2fbd9..905a5d840 100644
--- a/workspace/all/settings/menu.hpp
+++ b/workspace/all/settings/menu.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-extern "C"
-{
+extern "C" {
 #include "sdl.h"
 #include "defines.h"
 #include "api.h"
@@ -23,299 +22,351 @@ extern "C"
 // MinUI is passing a lot of temp value ptrs, which is not very c++
 inline bool rectIsNull(const SDL_Rect &rect)
 {
-    return rect.x + rect.y + rect.h + rect.w == 0;
+	return rect.x + rect.y + rect.h + rect.w == 0;
 }
 
 inline SDL_Rect *rectOrNull(const SDL_Rect &rect)
 {
-    if (rectIsNull(rect))
-        return nullptr;
-    return const_cast<SDL_Rect *>(&rect);
+	if (rectIsNull(rect))
+		return nullptr;
+	return const_cast<SDL_Rect *>(&rect);
 }
 
 inline void GFX_blitAssetCPP(int asset, const SDL_Rect &src_rect, SDL_Surface *dst, const SDL_Rect &dst_rect)
 {
-    GFX_blitAsset(asset, rectOrNull(src_rect), dst, rectOrNull(dst_rect));
+	GFX_blitAsset(asset, rectOrNull(src_rect), dst, rectOrNull(dst_rect));
 }
 
-inline void GFX_blitTextCPP(TTF_Font *font, const char *str, int leading, SDL_Color color, SDL_Surface *dst, const SDL_Rect &src_rect)
+inline void GFX_blitTextCPP(TTF_Font *font, const char *str, int leading, SDL_Color color, SDL_Surface *dst,
+							const SDL_Rect &src_rect)
 {
-    GFX_blitText(font, str, leading, color, dst, rectOrNull(src_rect));
+	GFX_blitText(font, str, leading, color, dst, rectOrNull(src_rect));
 }
 
 inline void GFX_blitPillDarkCPP(int asset, SDL_Surface *dst, const SDL_Rect &dst_rect)
 {
-    GFX_blitPillDark(asset, dst, rectOrNull(dst_rect));
+	GFX_blitPillDark(asset, dst, rectOrNull(dst_rect));
 }
 
 inline void GFX_blitPillLightCPP(int asset, SDL_Surface *dst, const SDL_Rect &dst_rect)
 {
-    GFX_blitPillLight(asset, dst, rectOrNull(dst_rect));
+	GFX_blitPillLight(asset, dst, rectOrNull(dst_rect));
 }
 
 inline void GFX_blitMessageCPP(TTF_Font *font, const std::string &msg, SDL_Surface *dst, const SDL_Rect &dst_rect)
 {
-    GFX_blitMessage(font, const_cast<char *>(msg.c_str()), dst, rectOrNull(dst_rect));
+	GFX_blitMessage(font, const_cast<char *>(msg.c_str()), dst, rectOrNull(dst_rect));
 }
 
 inline int SDL_BlitSurfaceCPP(SDL_Surface *src, const SDL_Rect &srcrect, SDL_Surface *dst, const SDL_Rect &dstrect)
 {
-    return SDL_BlitSurface(src, rectOrNull(srcrect), dst, rectOrNull(dstrect));
+	return SDL_BlitSurface(src, rectOrNull(srcrect), dst, rectOrNull(dstrect));
 }
 
 inline SDL_Rect dx(const SDL_Rect &rect, int dx)
 {
-    return {rect.x + dx, rect.y, rect.w - dx, rect.h};
+	return {rect.x + dx, rect.y, rect.w - dx, rect.h};
 }
 
 inline SDL_Rect dy(const SDL_Rect &rect, int dy)
 {
-    return {rect.x, rect.y + dy, rect.w, rect.h - dy};
+	return {rect.x, rect.y + dy, rect.w, rect.h - dy};
 }
 
-enum class MenuItemType
-{
-    // eg. save and main menu
-    // small font, centered list of "buttons"
-    List,
-    // eg. frontend
-    // small font, centered list of options with a value
-    Var,
-    // eg. emulator settings
-    // small font, full width list of options with a value, scrollable
-    Fixed,
-    // e.g. button mapping
-    // renders like Var but handles input differently
-    Input,
-    // "big" MinUI menu
-    Main,
-    // refer/defer to sublass
-    Custom,
+enum class MenuItemType {
+	// eg. save and main menu
+	// small font, centered list of "buttons"
+	List,
+	// eg. frontend
+	// small font, centered list of options with a value
+	Var,
+	// eg. emulator settings
+	// small font, full width list of options with a value, scrollable
+	Fixed,
+	// e.g. button mapping
+	// renders like Var but handles input differently
+	Input,
+	// "big" MinUI menu
+	Main,
+	// refer/defer to sublass
+	Custom,
 };
 
 // This should probably just be polymorphism, but this is fine for now.
-enum class ListItemType
-{
-    // generic list item, could be anything and any type
-    Generic,
-    // hex color, typically as uint32_t
-    Color,
-    // no option values, only title and BTN_CONFIRM
-    Button,
-    // used by custom items, defer to MenuItem::drawCustomItem
-    Custom,
+enum class ListItemType {
+	// generic list item, could be anything and any type
+	Generic,
+	// hex color, typically as uint32_t
+	Color,
+	// no option values, only title and BTN_CONFIRM
+	Button,
+	// used by custom items, defer to MenuItem::drawCustomItem
+	Custom,
 };
 
-enum InputReactionHint
-{
-    // Bubble up handling to caller. 
-    // \note All other hints imply the event has been handled.
-    Unhandled,
-    // No specific hint available
-    NoOp,
-    // Caller should quit
-    Exit,
-    // Caller should step to the next list item
-    NextItem,
-    // Caller should reset items to default
-    ResetAllItems
+enum InputReactionHint {
+	// Bubble up handling to caller.
+	// \note All other hints imply the event has been handled.
+	Unhandled,
+	// No specific hint available
+	NoOp,
+	// Caller should quit
+	Exit,
+	// Caller should step to the next list item
+	NextItem,
+	// Caller should reset items to default
+	ResetAllItems
 };
 
 class AbstractMenuItem;
 class MenuList;
 // typedef InputReactionHint (*MenuListCallback)(MenuList* list, int i);
-//using ValueGetCallback = std::any (*)(void);
-//using ValueSetCallback = void (*)(const std::any &);
-//using ValueResetCallback = void (*)(void);
+// using ValueGetCallback = std::any (*)(void);
+// using ValueSetCallback = void (*)(const std::any &);
+// using ValueResetCallback = void (*)(void);
 using MenuListCallback = std::function<InputReactionHint(AbstractMenuItem &item)>;
 using ValueGetCallback = std::function<std::any(void)>;
-using ValueSetCallback = std::function<void(const std::any& value)>;
+using ValueSetCallback = std::function<void(const std::any &value)>;
 using ValueResetCallback = std::function<void(void)>;
 
 class AbstractMenuItem
 {
-protected:
-    friend class MenuList;
-
-    ListItemType type;
-    std::string name, desc;
-
-    MenuListCallback on_confirm; // handling drill-down and other custom item stuff
-    ValueGetCallback on_get;
-    ValueSetCallback on_set;
-    ValueResetCallback on_reset;
-    // MenuListCallback on_change;
-
-    MenuList *submenu{nullptr};
-    bool deferred{false};
-
-    virtual void initSelection() {}
-    virtual bool nextValue() { return next(1); };
-    virtual bool prevValue() { return prev(1); };
-    virtual bool next(int n) { return false; /* unchanged */ };
-    virtual bool prev(int n) { return false; /* unchanged */ };
-
-public:
-    AbstractMenuItem(ListItemType type, const std::string &name, const std::string &desc,
-                    ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr,
-                     ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr,
-                     MenuList *submenu = nullptr)
-        : type(type), name(name), desc(desc), on_get(on_get), on_set(on_set), 
-        on_reset(on_reset), on_confirm(on_confirm), submenu(submenu) {}
-    ~AbstractMenuItem() {
-         // delete submenu;
-    }
-
-    virtual const std::any getValue() const = 0;
-    virtual const std::string getLabel() const = 0;
-
-    virtual InputReactionHint handleInput(int &dirty) { return Unhandled; };
-
-    const std::string &getName() const { return name; }
-    const std::string &getDesc() const { return desc; }
-    void setDesc(const std::string &d) { desc = d; }
-    const ListItemType getType() const { return type; }
-
-    virtual void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const {}
-
-    virtual const std::vector<std::any> getValues() const { return {getValue()}; };
-    virtual const std::vector<std::string> getLabels() const { return {getLabel()}; };
-
-    bool isDeferred() const { return deferred; }
-    void defer(bool on) { deferred = on; }
-    MenuList *getSubMenu() { return submenu; }
+  protected:
+	friend class MenuList;
+
+	ListItemType type;
+	std::string name, desc;
+
+	MenuListCallback on_confirm; // handling drill-down and other custom item stuff
+	ValueGetCallback on_get;
+	ValueSetCallback on_set;
+	ValueResetCallback on_reset;
+	// MenuListCallback on_change;
+
+	MenuList *submenu{nullptr};
+	bool deferred{false};
+
+	virtual void initSelection()
+	{
+	}
+	virtual bool nextValue()
+	{
+		return next(1);
+	};
+	virtual bool prevValue()
+	{
+		return prev(1);
+	};
+	virtual bool next(int n)
+	{
+		return false; /* unchanged */
+	};
+	virtual bool prev(int n)
+	{
+		return false; /* unchanged */
+	};
+
+  public:
+	AbstractMenuItem(ListItemType type, const std::string &name, const std::string &desc,
+					 ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr,
+					 ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr,
+					 MenuList *submenu = nullptr)
+		: type(type), name(name), desc(desc), on_get(on_get), on_set(on_set), on_reset(on_reset),
+		  on_confirm(on_confirm), submenu(submenu)
+	{
+	}
+	~AbstractMenuItem()
+	{
+		// delete submenu;
+	}
+
+	virtual const std::any getValue() const = 0;
+	virtual const std::string getLabel() const = 0;
+
+	virtual InputReactionHint handleInput(int &dirty)
+	{
+		return Unhandled;
+	};
+
+	const std::string &getName() const
+	{
+		return name;
+	}
+	const std::string &getDesc() const
+	{
+		return desc;
+	}
+	void setDesc(const std::string &d)
+	{
+		desc = d;
+	}
+	const ListItemType getType() const
+	{
+		return type;
+	}
+
+	virtual void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+								bool selected) const
+	{
+	}
+
+	virtual const std::vector<std::any> getValues() const
+	{
+		return {getValue()};
+	};
+	virtual const std::vector<std::string> getLabels() const
+	{
+		return {getLabel()};
+	};
+
+	bool isDeferred() const
+	{
+		return deferred;
+	}
+	void defer(bool on)
+	{
+		deferred = on;
+	}
+	MenuList *getSubMenu()
+	{
+		return submenu;
+	}
 };
 
 // A simple menu item visualizing a fixed label and value that is read-only.
 class StaticMenuItem : public AbstractMenuItem
 {
-public:
-    StaticMenuItem(ListItemType type, const std::string &name, const std::string &desc,
-        ValueGetCallback on_get)
-        : AbstractMenuItem(type, name, desc, on_get) {}
-
-    const std::any getValue() const override {
-        assert(on_get);
-        if(on_get)
-            return on_get();
-        return {};
-    }
-    const std::string getLabel() const override {
-        auto v = getValue();
-        assert(v.has_value());
-        return std::any_cast<const std::string>(v);
-    }
+  public:
+	StaticMenuItem(ListItemType type, const std::string &name, const std::string &desc, ValueGetCallback on_get)
+		: AbstractMenuItem(type, name, desc, on_get)
+	{
+	}
+
+	const std::any getValue() const override
+	{
+		assert(on_get);
+		if (on_get)
+			return on_get();
+		return {};
+	}
+	const std::string getLabel() const override
+	{
+		auto v = getValue();
+		assert(v.has_value());
+		return std::any_cast<const std::string>(v);
+	}
 };
 
 // A generic menu item visualizing a list if values and the currently selected value.
 class MenuItem : public AbstractMenuItem
 {
-    std::vector<std::any> values;
-    std::vector<std::string> labels;
-    int valueIdx;
-
-    void generateDefaultLabels(const std::string& suffix = "");
-    virtual void initSelection() override;
-    bool next(int n) override;
-    bool prev(int n) override;
-
-public:
-    MenuItem(ListItemType type, const std::string &name, const std::string &desc,
-             const std::vector<std::any> &values, const std::vector<std::string> &labels,
-             ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr, 
-             ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr, 
-             MenuList *submenu = nullptr);
-
-    MenuItem(ListItemType type, const std::string &name, const std::string &desc, const std::vector<std::any> &values,
-             ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr, 
-             ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr, 
-             MenuList *submenu = nullptr);
-
-    MenuItem(ListItemType type, const std::string &name, const std::string &desc, int min, int max, const std::string suffix,
-             ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr, 
-             ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr, 
-             MenuList *submenu = nullptr);
-
-    MenuItem(ListItemType type, const std::string &name, const std::string &desc,
-            MenuListCallback on_confirm = nullptr, MenuList *submenu = nullptr);
-
-    virtual InputReactionHint handleInput(int &dirty) override;
-
-    const std::any getValue() const override
-    {
-        assert(valueIdx >= 0);
-        return values[valueIdx];
-    }
-    const std::string getLabel() const override
-    {
-        assert(valueIdx >= 0);
-        return labels[valueIdx];
-    }
-    const std::vector<std::any> getValues() const override{ return values; }
-    const std::vector<std::string> getLabels() const override { return labels; }
+	std::vector<std::any> values;
+	std::vector<std::string> labels;
+	int valueIdx;
+
+	void generateDefaultLabels(const std::string &suffix = "");
+	virtual void initSelection() override;
+	bool next(int n) override;
+	bool prev(int n) override;
+
+  public:
+	MenuItem(ListItemType type, const std::string &name, const std::string &desc, const std::vector<std::any> &values,
+			 const std::vector<std::string> &labels, ValueGetCallback on_get = nullptr,
+			 ValueSetCallback on_set = nullptr, ValueResetCallback on_reset = nullptr,
+			 MenuListCallback on_confirm = nullptr, MenuList *submenu = nullptr);
+
+	MenuItem(ListItemType type, const std::string &name, const std::string &desc, const std::vector<std::any> &values,
+			 ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr,
+			 ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr, MenuList *submenu = nullptr);
+
+	MenuItem(ListItemType type, const std::string &name, const std::string &desc, int min, int max,
+			 const std::string suffix, ValueGetCallback on_get = nullptr, ValueSetCallback on_set = nullptr,
+			 ValueResetCallback on_reset = nullptr, MenuListCallback on_confirm = nullptr, MenuList *submenu = nullptr);
+
+	MenuItem(ListItemType type, const std::string &name, const std::string &desc, MenuListCallback on_confirm = nullptr,
+			 MenuList *submenu = nullptr);
+
+	virtual InputReactionHint handleInput(int &dirty) override;
+
+	const std::any getValue() const override
+	{
+		assert(valueIdx >= 0);
+		return values[valueIdx];
+	}
+	const std::string getLabel() const override
+	{
+		assert(valueIdx >= 0);
+		return labels[valueIdx];
+	}
+	const std::vector<std::any> getValues() const override
+	{
+		return values;
+	}
+	const std::vector<std::string> getLabels() const override
+	{
+		return labels;
+	}
 };
 
 class MenuList
 {
-protected:
-    MenuItemType type;
-    std::string desc;
-    std::vector<AbstractMenuItem*> items;
-    int max_width{0}; // cached on first draw
-    bool layout_called{false};
-
-    struct Scope
-    {
-        int start;
-        int end;
-        int count;
-        int visible_rows;
-        int max_visible_options;
-        int selected;
-    } scope;
-
-    MenuListCallback on_change;
-    MenuListCallback on_confirm;
-
-    std::shared_mutex itemLock;
-
-public:
-    MenuList(MenuItemType type, const std::string &desc, std::vector<AbstractMenuItem*> items, MenuListCallback on_change = nullptr, MenuListCallback on_confirm = nullptr);
-    ~MenuList();
-    MenuList(MenuList &) = delete;
-
-    void performLayout(const SDL_Rect &dst);
-    bool selectNext();
-    bool selectPrev();
-    std::string getSelectedItemName() const;
-    bool selectByName(const std::string &name);
-    void resetAllItems();
-
-    // returns true if the input was handled
-    virtual InputReactionHint handleInput(int &dirty, int &quit);
-
-    SDL_Rect itemSizeHint(const AbstractMenuItem &item);
-
-    void draw(SDL_Surface *surface, const SDL_Rect &dst);
-    void drawList(SDL_Surface *surface, const SDL_Rect &dst);
-    void drawListItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
-    void drawFixed(SDL_Surface *surface, const SDL_Rect &dst);
-    void drawFixedItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
-    void drawInput(SDL_Surface *surface, const SDL_Rect &dst);
-    void drawInputItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
-    void drawMain(SDL_Surface *surface, const SDL_Rect &dst);
-    void drawMainItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
-    virtual void drawCustom(SDL_Surface *surface, const SDL_Rect &dst) {};
+  protected:
+	MenuItemType type;
+	std::string desc;
+	std::vector<AbstractMenuItem *> items;
+	int max_width{0}; // cached on first draw
+	bool layout_called{false};
+
+	struct Scope {
+		int start;
+		int end;
+		int count;
+		int visible_rows;
+		int max_visible_options;
+		int selected;
+	} scope;
+
+	MenuListCallback on_change;
+	MenuListCallback on_confirm;
+
+	std::shared_mutex itemLock;
+
+  public:
+	MenuList(MenuItemType type, const std::string &desc, std::vector<AbstractMenuItem *> items,
+			 MenuListCallback on_change = nullptr, MenuListCallback on_confirm = nullptr);
+	~MenuList();
+	MenuList(MenuList &) = delete;
+
+	void performLayout(const SDL_Rect &dst);
+	bool selectNext();
+	bool selectPrev();
+	std::string getSelectedItemName() const;
+	bool selectByName(const std::string &name);
+	void resetAllItems();
+
+	// returns true if the input was handled
+	virtual InputReactionHint handleInput(int &dirty, int &quit);
+
+	SDL_Rect itemSizeHint(const AbstractMenuItem &item);
+
+	void draw(SDL_Surface *surface, const SDL_Rect &dst);
+	void drawList(SDL_Surface *surface, const SDL_Rect &dst);
+	void drawListItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
+	void drawFixed(SDL_Surface *surface, const SDL_Rect &dst);
+	void drawFixedItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
+	void drawInput(SDL_Surface *surface, const SDL_Rect &dst);
+	void drawInputItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
+	void drawMain(SDL_Surface *surface, const SDL_Rect &dst);
+	void drawMainItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected);
+	virtual void drawCustom(SDL_Surface *surface, const SDL_Rect &dst) {};
 };
 
-const MenuListCallback DeferToSubmenu = [](AbstractMenuItem &itm) -> InputReactionHint
-{
-    if (itm.getSubMenu())
-        itm.defer(true);
-    return InputReactionHint::NoOp;
+const MenuListCallback DeferToSubmenu = [](AbstractMenuItem &itm) -> InputReactionHint {
+	if (itm.getSubMenu())
+		itm.defer(true);
+	return InputReactionHint::NoOp;
 };
 
-const MenuListCallback ResetCurrentMenu = [](AbstractMenuItem &itm) -> InputReactionHint
-{
-    return InputReactionHint::ResetAllItems;
+const MenuListCallback ResetCurrentMenu = [](AbstractMenuItem &itm) -> InputReactionHint {
+	return InputReactionHint::ResetAllItems;
 };
\ No newline at end of file
diff --git a/workspace/all/settings/settings.cpp b/workspace/all/settings/settings.cpp
index 2c66ce283..1677d9043 100644
--- a/workspace/all/settings/settings.cpp
+++ b/workspace/all/settings/settings.cpp
@@ -1,5 +1,4 @@
-extern "C"
-{
+extern "C" {
 #include "msettings.h"
 
 #include "defines.h"
@@ -19,583 +18,806 @@ static bool appSuspend = false;
 
 static void sigHandler(int sig)
 {
-    switch (sig)
-    {
-    case SIGINT:
-    case SIGTERM:
-        appQuit = true;
-        break;
-    case SIGSTOP:
-        appSuspend = true;
-        break;
-    case SIGCONT:
-        appSuspend = false;
-        break;
-    default:
-        break;
-    }
+	switch (sig) {
+	case SIGINT:
+	case SIGTERM:
+		appQuit = true;
+		break;
+	case SIGSTOP:
+		appSuspend = true;
+		break;
+	case SIGCONT:
+		appSuspend = false;
+		break;
+	default:
+		break;
+	}
 }
 
-struct Context
-{
-    MenuList *menu;
-    SDL_Surface *screen;
-    int dirty;
-    int show_setting;
+struct Context {
+	MenuList *menu;
+	SDL_Surface *screen;
+	int dirty;
+	int show_setting;
 };
 
 // This is all the MinUiSettings stuff, for now just copied over from the old settings app
 
 static const std::vector<std::any> colors = {
-    0x000022U, 0x000044U, 0x000066U, 0x000088U, 0x0000AAU, 0x0000CCU, 0x1e2329U, 0x3366FFU, 0x4D7AFFU, 0x6699FFU, 0x80B3FFU, 0x99CCFFU, 0xB3D9FFU,
-    0x002222U, 0x004444U, 0x006666U, 0x008888U, 0x00AAAAU, 0x00CCCCU, 0x33FFFFU, 0x4DFFFFU, 0x66FFFFU, 0x80FFFFU, 0x99FFFFU, 0xB3FFFFU,
-    0x002200U, 0x004400U, 0x006600U, 0x008800U, 0x00AA00U, 0x00CC00U, 0x33FF33U, 0x4DFF4DU, 0x66FF66U, 0x80FF80U, 0x99FF99U, 0xB3FFB3U,
-    0x220022U, 0x440044U, 0x660066U, 0x880088U, 0x9B2257U, 0xAA00AAU, 0xCC00CCU, 0xFF33FFU, 0xFF4DFFU, 0xFF66FFU, 0xFF80FFU, 0xFF99FFU, 0xFFB3FFU,
-    0x110022U, 0x220044U, 0x330066U, 0x440088U, 0x5500AAU, 0x6600CCU, 0x8833FFU, 0x994DFFU, 0xAA66FFU, 0xBB80FFU, 0xCC99FFU, 0xDDB3FFU,
-    0x220000U, 0x440000U, 0x660000U, 0x880000U, 0xAA0000U, 0xCC0000U, 0xFF3333U, 0xFF4D4DU, 0xFF6666U, 0xFF8080U, 0xFF9999U, 0xFFB3B3U,
-    0x222200U, 0x444400U, 0x666600U, 0x888800U, 0xAAAA00U, 0xCCCC00U, 0xFFFF33U, 0xFFFF4DU, 0xFFFF66U, 0xFFFF80U, 0xFFFF99U, 0xFFFFB3U,
-    0x221100U, 0x442200U, 0x663300U, 0x884400U, 0xAA5500U, 0xCC6600U, 0xFF8833U, 0xFF994DU, 0xFFAA66U, 0xFFBB80U, 0xFFCC99U, 0xFFDDB3U,
-    0x000000U, 0x141414U, 0x282828U, 0x3C3C3CU, 0x505050U, 0x646464U, 0x8C8C8CU, 0xA0A0A0U, 0xB4B4B4U, 0xC8C8C8U, 0xDCDCDCU, 0xFFFFFFU};
+	0x000022U, 0x000044U, 0x000066U, 0x000088U, 0x0000AAU, 0x0000CCU, 0x1e2329U, 0x3366FFU, 0x4D7AFFU, 0x6699FFU,
+	0x80B3FFU, 0x99CCFFU, 0xB3D9FFU, 0x002222U, 0x004444U, 0x006666U, 0x008888U, 0x00AAAAU, 0x00CCCCU, 0x33FFFFU,
+	0x4DFFFFU, 0x66FFFFU, 0x80FFFFU, 0x99FFFFU, 0xB3FFFFU, 0x002200U, 0x004400U, 0x006600U, 0x008800U, 0x00AA00U,
+	0x00CC00U, 0x33FF33U, 0x4DFF4DU, 0x66FF66U, 0x80FF80U, 0x99FF99U, 0xB3FFB3U, 0x220022U, 0x440044U, 0x660066U,
+	0x880088U, 0x9B2257U, 0xAA00AAU, 0xCC00CCU, 0xFF33FFU, 0xFF4DFFU, 0xFF66FFU, 0xFF80FFU, 0xFF99FFU, 0xFFB3FFU,
+	0x110022U, 0x220044U, 0x330066U, 0x440088U, 0x5500AAU, 0x6600CCU, 0x8833FFU, 0x994DFFU, 0xAA66FFU, 0xBB80FFU,
+	0xCC99FFU, 0xDDB3FFU, 0x220000U, 0x440000U, 0x660000U, 0x880000U, 0xAA0000U, 0xCC0000U, 0xFF3333U, 0xFF4D4DU,
+	0xFF6666U, 0xFF8080U, 0xFF9999U, 0xFFB3B3U, 0x222200U, 0x444400U, 0x666600U, 0x888800U, 0xAAAA00U, 0xCCCC00U,
+	0xFFFF33U, 0xFFFF4DU, 0xFFFF66U, 0xFFFF80U, 0xFFFF99U, 0xFFFFB3U, 0x221100U, 0x442200U, 0x663300U, 0x884400U,
+	0xAA5500U, 0xCC6600U, 0xFF8833U, 0xFF994DU, 0xFFAA66U, 0xFFBB80U, 0xFFCC99U, 0xFFDDB3U, 0x000000U, 0x141414U,
+	0x282828U, 0x3C3C3CU, 0x505050U, 0x646464U, 0x8C8C8CU, 0xA0A0A0U, 0xB4B4B4U, 0xC8C8C8U, 0xDCDCDCU, 0xFFFFFFU};
 // all colors above but as strings
 static const std::vector<std::string> color_strings = {
-    "0x000022", "0x000044", "0x000066", "0x000088", "0x0000AA", "0x0000CC", "0x1E2329", "0x3366FF", "0x4D7AFF", "0x6699FF", "0x80B3FF", "0x99CCFF", "0xB3D9FF",
-    "0x002222", "0x004444", "0x006666", "0x008888", "0x00AAAA", "0x00CCCC", "0x33FFFF", "0x4DFFFF", "0x66FFFF", "0x80FFFF", "0x99FFFF", "0xB3FFFF",
-    "0x002200", "0x004400", "0x006600", "0x008800", "0x00AA00", "0x00CC00", "0x33FF33", "0x4DFF4D", "0x66FF66", "0x80FF80", "0x99FF99", "0xB3FFB3",
-    "0x220022", "0x440044", "0x660066", "0x880088", "0x9B2257", "0xAA00AA", "0xCC00CC", "0xFF33FF", "0xFF4DFF", "0xFF66FF", "0xFF80FF", "0xFF99FF", "0xFFB3FF",
-    "0x110022", "0x220044", "0x330066", "0x440088", "0x5500AA", "0x6600CC", "0x8833FF", "0x994DFF", "0xAA66FF", "0xBB80FF", "0xCC99FF", "0xDDB3FF",
-    "0x220000", "0x440000", "0x660000", "0x880000", "0xAA0000", "0xCC0000", "0xFF3333", "0xFF4D4D", "0xFF6666", "0xFF8080", "0xFF9999", "0xFFB3B3",
-    "0x222200", "0x444400", "0x666600", "0x888800", "0xAAAA00", "0xCCCC00", "0xFFFF33", "0xFFFF4D", "0xFFFF66", "0xFFFF80", "0xFFFF99", "0xFFFFB3",
-    "0x221100", "0x442200", "0x663300", "0x884400", "0xAA5500", "0xCC6600", "0xFF8833", "0xFF994D", "0xFFAA66", "0xFFBB80", "0xFFCC99", "0xFFDDB3",
-    "0x000000", "0x141414", "0x282828", "0x3C3C3C", "0x505050", "0x646464", "0x8C8C8C", "0xA0A0A0", "0xB4B4B4", "0xC8C8C8", "0xDCDCDC", "0xFFFFFF"};
+	"0x000022", "0x000044", "0x000066", "0x000088", "0x0000AA", "0x0000CC", "0x1E2329", "0x3366FF", "0x4D7AFF",
+	"0x6699FF", "0x80B3FF", "0x99CCFF", "0xB3D9FF", "0x002222", "0x004444", "0x006666", "0x008888", "0x00AAAA",
+	"0x00CCCC", "0x33FFFF", "0x4DFFFF", "0x66FFFF", "0x80FFFF", "0x99FFFF", "0xB3FFFF", "0x002200", "0x004400",
+	"0x006600", "0x008800", "0x00AA00", "0x00CC00", "0x33FF33", "0x4DFF4D", "0x66FF66", "0x80FF80", "0x99FF99",
+	"0xB3FFB3", "0x220022", "0x440044", "0x660066", "0x880088", "0x9B2257", "0xAA00AA", "0xCC00CC", "0xFF33FF",
+	"0xFF4DFF", "0xFF66FF", "0xFF80FF", "0xFF99FF", "0xFFB3FF", "0x110022", "0x220044", "0x330066", "0x440088",
+	"0x5500AA", "0x6600CC", "0x8833FF", "0x994DFF", "0xAA66FF", "0xBB80FF", "0xCC99FF", "0xDDB3FF", "0x220000",
+	"0x440000", "0x660000", "0x880000", "0xAA0000", "0xCC0000", "0xFF3333", "0xFF4D4D", "0xFF6666", "0xFF8080",
+	"0xFF9999", "0xFFB3B3", "0x222200", "0x444400", "0x666600", "0x888800", "0xAAAA00", "0xCCCC00", "0xFFFF33",
+	"0xFFFF4D", "0xFFFF66", "0xFFFF80", "0xFFFF99", "0xFFFFB3", "0x221100", "0x442200", "0x663300", "0x884400",
+	"0xAA5500", "0xCC6600", "0xFF8833", "0xFF994D", "0xFFAA66", "0xFFBB80", "0xFFCC99", "0xFFDDB3", "0x000000",
+	"0x141414", "0x282828", "0x3C3C3C", "0x505050", "0x646464", "0x8C8C8C", "0xA0A0A0", "0xB4B4B4", "0xC8C8C8",
+	"0xDCDCDC", "0xFFFFFF"};
 
 static const std::vector<std::string> font_names = {"OG", "Next"};
 
 static const std::vector<std::any> timeout_secs = {0U, 5U, 10U, 15U, 30U, 45U, 60U, 90U, 120U, 240U, 360U, 600U};
-static const std::vector<std::string> timeout_labels = {"Never", "5s", "10s", "15s", "30s", "45s", "60s", "90s", "2m", "4m", "6m", "10m"};
+static const std::vector<std::string> timeout_labels = {"Never", "5s",	"10s", "15s", "30s", "45s",
+														"60s",	 "90s", "2m",  "4m",  "6m",	 "10m"};
 
 static const std::vector<std::string> on_off = {"Off", "On"};
 
 static const std::vector<std::string> scaling_strings = {"Fullscreen", "Fit", "Fill"};
 static const std::vector<std::any> scaling = {(int)GFX_SCALE_FULLSCREEN, (int)GFX_SCALE_FIT, (int)GFX_SCALE_FILL};
 
-namespace {
-    std::string execCommand(const char* cmd) {
-        std::array<char, 128> buffer;
-        std::string result;
-
-        // Redirect stderr to stdout using 2>&1
-        std::string fullCmd = std::string(cmd) + " 2>&1";
-        std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(fullCmd.c_str(), "r"), pclose);
-        if (!pipe) throw std::runtime_error("popen() failed!");
-
-        while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
-            result += buffer.data();
-        }
-
-        return result;
-    }
-
-    std::string extractBusyBoxVersion(const std::string& output) {
-        std::regex versionRegex(R"(BusyBox\s+v[\d.]+.*)");
-        std::smatch match;
-        if (std::regex_search(output, match, versionRegex)) {
-            return match.str(0);
-        }
-        return "";
-    }
+namespace
+{
+std::string execCommand(const char *cmd)
+{
+	std::array<char, 128> buffer;
+	std::string result;
+
+	// Redirect stderr to stdout using 2>&1
+	std::string fullCmd = std::string(cmd) + " 2>&1";
+	std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(fullCmd.c_str(), "r"), pclose);
+	if (!pipe)
+		throw std::runtime_error("popen() failed!");
+
+	while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
+		result += buffer.data();
+	}
+
+	return result;
+}
+
+std::string extractBusyBoxVersion(const std::string &output)
+{
+	std::regex versionRegex(R"(BusyBox\s+v[\d.]+.*)");
+	std::smatch match;
+	if (std::regex_search(output, match, versionRegex)) {
+		return match.str(0);
+	}
+	return "";
 }
+} // namespace
 int main(int argc, char *argv[])
 {
-    try
-    {
-        char* device = getenv("DEVICE");
-        bool is_brick = exactMatch("brick", device);
-
-        char version[128];
-        PLAT_getOsVersionInfo(version, 128);
-        LOG_info("This is TrimUI stock OS version %s\n", version);
-        InitSettings();
-
-        PWR_setCPUSpeed(CPU_SPEED_MENU);
-
-        Context ctx = {0};
-        ctx.dirty = 1;
-        ctx.show_setting = 0;
-        ctx.screen = GFX_init(MODE_MAIN);
-        PAD_init();
-        PWR_init();
-        TIME_init();
-        WIFI_init();
-        // This will briefly tear down existing connections
-        BT_init();
-
-        signal(SIGINT, sigHandler);
-        signal(SIGTERM, sigHandler);
-
-        char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH];
-        int tz_count = 0;
-        TIME_getTimezones(timezones, &tz_count);
-
-        int was_online = PLAT_isOnline();
-        int had_bt = PLAT_btIsConnected();
-        
-        std::vector<std::any> tz_values;
-        std::vector<std::string> tz_labels;
-        for (int i = 0; i < tz_count; ++i) {
-            //LOG_info("Timezone: %s\n", timezones[i]);
-            tz_values.push_back(std::string(timezones[i]));
-            // Todo: beautify, remove underscores and so on
-            tz_labels.push_back(std::string(timezones[i]));
-        }
-
-        auto appearanceMenu = new MenuList(MenuItemType::Fixed, "Appearance",
-            {new MenuItem{ListItemType::Generic, "Font", "The font to render all UI text.", {0, 1}, font_names, 
-                []() -> std::any{ return CFG_getFontId(); },
-                [](const std::any &value){ CFG_setFontId(std::any_cast<int>(value)); },
-                []() { CFG_setFontId(CFG_DEFAULT_FONT_ID);}},
-                new MenuItem{ListItemType::Color, "Main Color", "The color used to render main UI elements.", colors, color_strings, 
-                []() -> std::any{ return CFG_getColor(1); }, 
-                [](const std::any &value){ CFG_setColor(1, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(1, CFG_DEFAULT_COLOR1);}},
-                new MenuItem{ListItemType::Color, "Primary Accent Color", "The color used to highlight important things in the user interface.", colors, color_strings, 
-                []() -> std::any{ return CFG_getColor(2); }, 
-                [](const std::any &value){ CFG_setColor(2, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(2, CFG_DEFAULT_COLOR2);}},
-                new MenuItem{ListItemType::Color, "Secondary Accent Color", "A secondary highlight color.", colors, color_strings, 
-                []() -> std::any{ return CFG_getColor(3); }, 
-                [](const std::any &value){ CFG_setColor(3, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(3, CFG_DEFAULT_COLOR3);}},
-                new MenuItem{ListItemType::Color, "Hint info Color", "Color for button hints and info", colors, color_strings, 
-                []() -> std::any{ return CFG_getColor(6); }, 
-                [](const std::any &value){ CFG_setColor(6, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(6, CFG_DEFAULT_COLOR6);}},
-                new MenuItem{ListItemType::Color, "List Text", "List text color", colors, color_strings, 
-                []() -> std::any{ return CFG_getColor(4); }, 
-                [](const std::any &value){ CFG_setColor(4, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(4, CFG_DEFAULT_COLOR4);}},
-                new MenuItem{ListItemType::Color, "List Text Selected", "List selected text color", colors, color_strings, 
-                []() -> std::any { return CFG_getColor(5); }, 
-                [](const std::any &value) { CFG_setColor(5, std::any_cast<uint32_t>(value)); },
-                []() { CFG_setColor(5, CFG_DEFAULT_COLOR5);}},
-                //new MenuItem{ListItemType::Color, "Background color", "Main UI background color", colors, color_strings, 
-                //[]() -> std::any { return CFG_getColor(7); }, 
-                //[](const std::any &value) { CFG_setColor(7, std::any_cast<uint32_t>(value)); },
-                //[]() { CFG_setColor(7, CFG_DEFAULT_COLOR7);}},
-                new MenuItem{ListItemType::Generic, "Show battery percentage", "Show battery level as percent in the status pill", {false, true}, on_off, 
-                []() -> std::any { return CFG_getShowBatteryPercent(); },
-                [](const std::any &value) { CFG_setShowBatteryPercent(std::any_cast<bool>(value)); },
-                []() { CFG_setShowBatteryPercent(CFG_DEFAULT_SHOWBATTERYPERCENT);}},
-                new MenuItem{ListItemType::Generic, "Show menu animations", "Enable or disable menu animations", {false, true}, on_off, 
-                []() -> std::any{ return CFG_getMenuAnimations(); },
-                [](const std::any &value) { CFG_setMenuAnimations(std::any_cast<bool>(value)); },
-                []() { CFG_setMenuAnimations(CFG_DEFAULT_SHOWMENUANIMATIONS);}},
-                new MenuItem{ListItemType::Generic, "Show menu transitions", "Enable or disable animated transitions", {false, true}, on_off, 
-                []() -> std::any{ return CFG_getMenuTransitions(); },
-                [](const std::any &value) { CFG_setMenuTransitions(std::any_cast<bool>(value)); },
-                []() { CFG_setMenuTransitions(CFG_DEFAULT_SHOWMENUTRANSITIONS);}},
-                new MenuItem{ListItemType::Generic, "Game art corner radius", "Set the radius for the rounded corners of game art", 0, 24, "px",
-                []() -> std::any{ return CFG_getThumbnailRadius(); }, 
-                [](const std::any &value) { CFG_setThumbnailRadius(std::any_cast<int>(value)); },
-                []() { CFG_setThumbnailRadius(CFG_DEFAULT_THUMBRADIUS);}},
-                new MenuItem{ListItemType::Generic, "Game art width", "Set the percentage of screen width used for game art.\nUI elements might overrule this to avoid clipping.", 
-                5, 100, "%",
-                []() -> std::any{ return (int)(CFG_getGameArtWidth() * 100); }, 
-                [](const std::any &value) { CFG_setGameArtWidth((double)std::any_cast<int>(value) / 100.0); },
-                []() { CFG_setGameArtWidth(CFG_DEFAULT_GAMEARTWIDTH);}},
-                new MenuItem{ListItemType::Generic, "Show folder names at root", "Show folder names at root directory", {false, true}, on_off,
-                []() -> std::any { return CFG_getShowFolderNamesAtRoot(); },
-                [](const std::any &value) { CFG_setShowFolderNamesAtRoot(std::any_cast<bool>(value)); },
-                []() { CFG_setShowFolderNamesAtRoot(CFG_DEFAULT_SHOWFOLDERNAMESATROOT);}},
-                new MenuItem{ListItemType::Generic, "Show Recents", "Show \"Recently Played\" menu entry in game list.", {false, true}, on_off, 
-                []() -> std::any { return CFG_getShowRecents(); },
-                [](const std::any &value) { CFG_setShowRecents(std::any_cast<bool>(value)); },
-                []() { CFG_setShowRecents(CFG_DEFAULT_SHOWRECENTS);}},
-                new MenuItem{ListItemType::Generic, "Show Tools", "Show \"Tools\" menu entry in game list.", {false, true}, on_off, 
-                []() -> std::any { return CFG_getShowTools(); },
-                [](const std::any &value) { CFG_setShowTools(std::any_cast<bool>(value)); },
-                []() { CFG_setShowTools(CFG_DEFAULT_SHOWTOOLS);}},
-                new MenuItem{ListItemType::Generic, "Show game art", "Show game artwork in the main menu", {false, true}, on_off, []() -> std::any
-                { return CFG_getShowGameArt(); },
-                [](const std::any &value)
-                { CFG_setShowGameArt(std::any_cast<bool>(value)); },
-                []() { CFG_setShowGameArt(CFG_DEFAULT_SHOWGAMEART);}},
-                new MenuItem{ListItemType::Generic, "Use folder background for ROMs", "If enabled, used the emulator background image. Otherwise uses the default.", {false, true}, on_off, []() -> std::any
-                { return CFG_getRomsUseFolderBackground(); },
-                [](const std::any &value)
-                { CFG_setRomsUseFolderBackground(std::any_cast<bool>(value)); },
-                []() { CFG_setRomsUseFolderBackground(CFG_DEFAULT_ROMSUSEFOLDERBACKGROUND);}},
-                new MenuItem{ListItemType::Generic, "Show Quickswitcher UI", "Show/hide Quickswitcher UI elements.\nWhen hidden, will only draw background images.", {false, true}, on_off, 
-                []() -> std::any{ return CFG_getShowQuickswitcherUI(); },
-                [](const std::any &value){ CFG_setShowQuickswitcherUI(std::any_cast<bool>(value)); },
-                []() { CFG_setShowQuickswitcherUI(CFG_DEFAULT_SHOWQUICKWITCHERUI);}},
-                // not needed anymore
-                // new MenuItem{ListItemType::Generic, "Game switcher scaling", "The scaling algorithm used to display the savegame image.", scaling, scaling_strings, []() -> std::any
-                // { return CFG_getGameSwitcherScaling(); },
-                // [](const std::any &value)
-                // { CFG_setGameSwitcherScaling(std::any_cast<int>(value)); },
-                // []() { CFG_setGameSwitcherScaling(CFG_DEFAULT_GAMESWITCHERSCALING);}},
-
-                new MenuItem{ListItemType::Button, "Reset to defaults", "Resets all options in this menu to their default values.", ResetCurrentMenu},
-        });
-
-        auto displayMenu = new MenuList(MenuItemType::Fixed, "Display",
-        {
-            new MenuItem{ListItemType::Generic, "Brightness", "Display brightness (0 to 10)", 0, 10, "",[]() -> std::any
-            { return GetBrightness(); }, [](const std::any &value)
-            { SetBrightness(std::any_cast<int>(value)); },
-            []() { SetBrightness(SETTINGS_DEFAULT_BRIGHTNESS);}},
-            new MenuItem{ListItemType::Generic, "Color temperature", "Color temperature (0 to 40)", 0, 40, "",[]() -> std::any
-            { return GetColortemp(); }, [](const std::any &value)
-            { SetColortemp(std::any_cast<int>(value)); },
-            []() { SetColortemp(SETTINGS_DEFAULT_COLORTEMP);}},
-            new MenuItem{ListItemType::Generic, "Contrast", "Contrast enhancement (-4 to 5)", -4, 5, "",[]() -> std::any
-            { return GetContrast(); }, [](const std::any &value)
-            { SetContrast(std::any_cast<int>(value)); },
-            []() { SetContrast(SETTINGS_DEFAULT_CONTRAST);}},
-            new MenuItem{ListItemType::Generic, "Saturation", "Saturation enhancement (-5 to 5)", -5, 5, "",[]() -> std::any
-            { return GetSaturation(); }, [](const std::any &value)
-            { SetSaturation(std::any_cast<int>(value)); },
-            []() { SetSaturation(SETTINGS_DEFAULT_SATURATION);}},
-            new MenuItem{ListItemType::Generic, "Exposure", "Exposure enhancement (-4 to 5)", -4, 5, "",[]() -> std::any
-            { return GetExposure(); }, [](const std::any &value)
-            { SetExposure(std::any_cast<int>(value)); },
-            []() { SetExposure(SETTINGS_DEFAULT_EXPOSURE);}},
-
-            new MenuItem{ListItemType::Button, "Reset to defaults", "Resets all options in this menu to their default values.", ResetCurrentMenu},
-        });
-
-        auto systemMenu = new MenuList(MenuItemType::Fixed, "System",
-        {
-            new MenuItem{ListItemType::Generic, "Volume", "Speaker volume", 
-            {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}, 
-            {"Muted", "5%","10%","15%","20%","25%","30%","35%","40%","45%","50%","55%","60%","65%","70%","75%","80%","85%","90%","95%","100%"}, 
-            []() -> std::any{ return GetVolume(); }, [](const std::any &value)
-            { SetVolume(std::any_cast<int>(value)); },
-            []() { SetVolume(SETTINGS_DEFAULT_VOLUME);}},
-            new MenuItem{ListItemType::Generic, "Screen timeout", "Time before screen turns off (0-600s)", timeout_secs, timeout_labels, []() -> std::any
-            { return CFG_getScreenTimeoutSecs(); }, [](const std::any &value)
-            { CFG_setScreenTimeoutSecs(std::any_cast<uint32_t>(value)); },
-            []() { CFG_setScreenTimeoutSecs(CFG_DEFAULT_SCREENTIMEOUTSECS);}},
-            new MenuItem{ListItemType::Generic, "Suspend timeout", "Time before device goes to sleep (0-600s)", timeout_secs, timeout_labels, []() -> std::any
-            { return CFG_getSuspendTimeoutSecs(); }, [](const std::any &value)
-            { CFG_setSuspendTimeoutSecs(std::any_cast<uint32_t>(value)); },
-            []() { CFG_setSuspendTimeoutSecs(CFG_DEFAULT_SUSPENDTIMEOUTSECS);}},
-            new MenuItem{ListItemType::Generic, "Haptic feedback", "Enable or disable haptic feedback on certain actions in the OS", {false, true}, on_off, []() -> std::any
-            { return CFG_getHaptics(); }, [](const std::any &value)
-            { CFG_setHaptics(std::any_cast<bool>(value)); },
-            []() { CFG_setHaptics(CFG_DEFAULT_HAPTICS);}},
-            new MenuItem{ListItemType::Generic, "Default view", "The initial view to show on boot", 
-            {(int)SCREEN_GAMELIST, (int)SCREEN_GAMESWITCHER, (int)SCREEN_QUICKMENU}, 
-            {"Content List","Game Switcher","Quick Menu"}, 
-            []() -> std::any { return CFG_getDefaultView(); }, 
-            [](const std::any &value){ CFG_setDefaultView(std::any_cast<int>(value)); },
-            []() { CFG_setDefaultView(CFG_DEFAULT_VIEW);}},
-            new MenuItem{ListItemType::Generic, "Show 24h time format", "Show clock in the 24hrs time format", {false, true}, on_off, []() -> std::any
-            { return CFG_getClock24H(); },
-            [](const std::any &value)
-            { CFG_setClock24H(std::any_cast<bool>(value)); },
-            []() { CFG_setClock24H(CFG_DEFAULT_CLOCK24H);}},
-            new MenuItem{ListItemType::Generic, "Show clock", "Show clock in the status pill", {false, true}, on_off, []() -> std::any
-            { return CFG_getShowClock(); },
-            [](const std::any &value)
-            { CFG_setShowClock(std::any_cast<bool>(value)); },
-            []() { CFG_setShowClock(CFG_DEFAULT_SHOWCLOCK);}},
-            new MenuItem{ListItemType::Generic, "Set time and date automatically", "Automatically adjust system time\nwith NTP (requires internet access)", {false, true}, on_off, []() -> std::any
-            { return TIME_getNetworkTimeSync(); }, [](const std::any &value)
-            { TIME_setNetworkTimeSync(std::any_cast<bool>(value)); },
-            []() { TIME_setNetworkTimeSync(false);}}, // default from stock
-            new MenuItem{ListItemType::Generic, "Time zone", "Your time zone", tz_values, tz_labels, []() -> std::any
-            { return std::string(TIME_getCurrentTimezone()); }, [](const std::any &value)
-            { TIME_setCurrentTimezone(std::any_cast<std::string>(value).c_str()); },
-            []() { TIME_setCurrentTimezone("Asia/Shanghai");}}, // default from Stock
-            new MenuItem{ListItemType::Generic, "Save format", "The save format to use.\nMinUI: Game.gba.sav, Retroarch: Game.srm, Generic: Game.sav", 
-            {(int)SAVE_FORMAT_SAV, (int)SAVE_FORMAT_SRM, (int)SAVE_FORMAT_SRM_UNCOMPRESSED, (int)SAVE_FORMAT_GEN}, 
-            {"MinUI (default)", "Retroarch (compressed)", "Retroarch (uncompressed)", "Generic"}, []() -> std::any
-            { return CFG_getSaveFormat(); }, [](const std::any &value)
-            { CFG_setSaveFormat(std::any_cast<int>(value)); },
-            []() { CFG_setSaveFormat(CFG_DEFAULT_SAVEFORMAT);}},
-            new MenuItem{ListItemType::Generic, "Save state format", "The save state format to use. MinUI: Game.st0, \nRetroarch-ish: Game.state.0, Retroarch: Game.state0", 
-            {(int)STATE_FORMAT_SAV, (int)STATE_FORMAT_SRM_EXTRADOT, (int)STATE_FORMAT_SRM_UNCOMRESSED_EXTRADOT, (int)STATE_FORMAT_SRM, (int)STATE_FORMAT_SRM_UNCOMRESSED}, 
-            {"MinUI (default)", "Retroarch-ish (compressed)", "Retroarch-ish (uncompressed)", "Retroarch (compressed)", "Retroarch (uncompressed)"}, []() -> std::any
-            { return CFG_getStateFormat(); }, [](const std::any &value)
-            { CFG_setStateFormat(std::any_cast<int>(value)); },
-            []() { CFG_setStateFormat(CFG_DEFAULT_STATEFORMAT);}},
-            new MenuItem{ListItemType::Generic, "Use extracted file name", "Use the extracted file name instead of the archive name.\nOnly applies to cores that do not handle archives natively", {false, true}, on_off, 
-            []() -> std::any{ return CFG_getUseExtractedFileName(); },
-            [](const std::any &value){ CFG_setUseExtractedFileName(std::any_cast<bool>(value)); },
-            []() { CFG_setUseExtractedFileName(CFG_DEFAULT_EXTRACTEDFILENAME);}},
-
-            new MenuItem{ListItemType::Button, "Reset to defaults", "Resets all options in this menu to their default values.", ResetCurrentMenu},
-        });
-
-        std::vector<AbstractMenuItem*> muteItems = 
-        {
-            new MenuItem{ListItemType::Generic, "Volume when toggled", "Speaker volume (0-20)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}, 
-            {"Unchanged", "Muted", "5%","10%","15%","20%","25%","30%","35%","40%","45%","50%","55%","60%","65%","70%","75%","80%","85%","90%","95%","100%"}, 
-            []() -> std::any { return GetMutedVolume(); },
-            [](const std::any &value) { SetMutedVolume(std::any_cast<int>(value)); },
-            []() { SetMutedVolume(0); }},
-            new MenuItem{ListItemType::Generic, "FN switch disables LED", "Switch will also disable LEDs", {false, true}, on_off, 
-            []() -> std::any { return CFG_getMuteLEDs(); },
-            [](const std::any &value) { CFG_setMuteLEDs(std::any_cast<bool>(value)); },
-            []() { CFG_setMuteLEDs(CFG_DEFAULT_MUTELEDS); }},
-            new MenuItem{ListItemType::Generic, "Brightness when toggled", "Display brightness (0 to 10)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, 0,1,2,3,4,5,6,7,8,9,10}, 
-            {"Unchanged","0","1","2","3","4","5","6","7","8","9","10"},
-            []() -> std::any { return GetMutedBrightness(); }, [](const std::any &value)
-            { SetMutedBrightness(std::any_cast<int>(value)); },
-            []() { SetMutedBrightness(SETTINGS_DEFAULT_MUTE_NO_CHANGE);}},
-            new MenuItem{ListItemType::Generic, "Color temperature when toggled", "Color temperature (0 to 40)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40}, 
-            {"Unchanged","0","1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","32","33","34","35","36","37","38","39","40"},
-            []() -> std::any{ return GetMutedColortemp(); }, [](const std::any &value)
-            { SetMutedColortemp(std::any_cast<int>(value)); },
-            []() { SetMutedColortemp(SETTINGS_DEFAULT_MUTE_NO_CHANGE);}},
-            new MenuItem{ListItemType::Generic, "Contrast when toggled", "Contrast enhancement (-4 to 5)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -4,-3,-2,-1,0,1,2,3,4,5}, 
-            {"Unchanged","-4","-3","-2","-1","0","1","2","3","4","5"}, 
-            []() -> std::any  { return GetMutedContrast(); }, [](const std::any &value)
-            { SetMutedContrast(std::any_cast<int>(value)); },
-            []() { SetMutedContrast(SETTINGS_DEFAULT_MUTE_NO_CHANGE);}},
-            new MenuItem{ListItemType::Generic, "Saturation when toggled", "Saturation enhancement (-5 to 5)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -5,-4,-3,-2,-1,0,1,2,3,4,5}, 
-            {"Unchanged","-5","-4","-3","-2","-1","0","1","2","3","4","5"}, 
-            []() -> std::any{ return GetMutedSaturation(); }, [](const std::any &value)
-            { SetMutedSaturation(std::any_cast<int>(value)); },
-            []() { SetMutedSaturation(SETTINGS_DEFAULT_MUTE_NO_CHANGE);}},
-            new MenuItem{ListItemType::Generic, "Exposure when toggled", "Exposure enhancement (-4 to 5)", 
-            {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -4,-3,-2,-1,0,1,2,3,4,5}, 
-            {"Unchanged","-4","-3","-2","-1","0","1","2","3","4","5"}, 
-            []() -> std::any  { return GetMutedExposure(); }, [](const std::any &value)
-            { SetMutedExposure(std::any_cast<int>(value)); },
-            []() { SetMutedExposure(SETTINGS_DEFAULT_MUTE_NO_CHANGE);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire A", "Enable turbo fire A", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboA(); },
-            [](const std::any &value) { SetMuteTurboA(std::any_cast<int>(value));},
-            []() { SetMuteTurboA(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire B", "Enable turbo fire B", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboB(); },
-            [](const std::any &value) { SetMuteTurboB(std::any_cast<int>(value));},
-            []() { SetMuteTurboB(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire X", "Enable turbo fire X", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboX(); },
-            [](const std::any &value) { SetMuteTurboX(std::any_cast<int>(value));},
-            []() { SetMuteTurboX(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire Y", "Enable turbo fire Y", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboY(); },
-            [](const std::any &value) { SetMuteTurboY(std::any_cast<int>(value));},
-            []() { SetMuteTurboY(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire L1", "Enable turbo fire L1", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboL1(); },
-            [](const std::any &value) { SetMuteTurboL1(std::any_cast<int>(value));},
-            []() { SetMuteTurboL1(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire L2", "Enable turbo fire L2", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboL2(); },
-            [](const std::any &value) { SetMuteTurboL2(std::any_cast<int>(value));},
-            []() { SetMuteTurboL2(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire R1", "Enable turbo fire R1", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboR1(); },
-            [](const std::any &value) { SetMuteTurboR1(std::any_cast<int>(value));},
-            []() { SetMuteTurboR1(0);}},
-            new MenuItem{ListItemType::Generic, "Turbo fire R2", "Enable turbo fire R2", {0, 1}, on_off, []() -> std::any
-            { return GetMuteTurboR2(); },
-            [](const std::any &value) { SetMuteTurboR2(std::any_cast<int>(value));},
-            []() { SetMuteTurboR2(0);}},
-        };
-        if(is_brick) {
-            muteItems.push_back(
-                new MenuItem{ListItemType::Generic, "Dpad mode when toggled", "Dpad: default. Joystick: Dpad exclusively acts as analog stick.\nBoth: Dpad and Joystick inputs at the same time.", {0, 1, 2}, {"Dpad", "Joystick", "Both"}, []() -> std::any
-                {
-                    if(!GetMuteDisablesDpad() && !GetMuteEmulatesJoystick()) return 0;
-                    if(GetMuteDisablesDpad() && GetMuteEmulatesJoystick()) return 1;
-                    return 2; 
-                },
-                [](const std::any &value)
-                { 
-                    int v = std::any_cast<int>(value);
-                    SetMuteDisablesDpad((v == 1)); 
-                    SetMuteEmulatesJoystick((v > 0));
-                },
-                []()
-                { 
-                    SetMuteDisablesDpad(0); 
-                    SetMuteEmulatesJoystick(0);
-                }});
-        }
-        muteItems.push_back(new MenuItem{ListItemType::Button, "Reset to defaults", "Resets all options in this menu to their default values.", ResetCurrentMenu});
-
-        auto muteMenu = new MenuList(MenuItemType::Fixed, "FN Switch", muteItems);
-
-        // TODO: check WIFI_supported(), hide menu otherwise
-        auto networkMenu = new Wifi::Menu(appQuit, ctx.dirty);
-
-        // TODO: check BT_supported(), hide menu otherwise
-        auto btMenu = new Bluetooth::Menu(appQuit, ctx.dirty);
-
-        auto aboutMenu = new MenuList(MenuItemType::Fixed, "About",
-        {
-            new StaticMenuItem{ListItemType::Generic, "NextUI version", "", 
-            []() -> std::any { 
-                std::ifstream t(ROOT_SYSTEM_PATH "/version.txt");
-                std::stringstream buffer;
-                buffer << t.rdbuf();
-                return buffer.str();
-            }},
-            new StaticMenuItem{ListItemType::Generic, "Platform", "", 
-            []() -> std::any { 
-                return std::string(PLAT_getModel()); }
-            },
-            new StaticMenuItem{ListItemType::Generic, "Stock OS version", "", 
-            []() -> std::any { 
-                char osver[128];
-                PLAT_getOsVersionInfo(osver, 128);
-                return std::string(osver); }
-            },
-            new StaticMenuItem{ListItemType::Generic, "Busybox version", "", 
-            []() -> std::any { 
-                std::string output = execCommand("cat --help");
-                std::string version = extractBusyBoxVersion(output);
-
-                if (!version.empty())
-                    return version;
-                return std::string("BusyBox version not found."); }
-            },
-        });
-
-        ctx.menu = new MenuList(MenuItemType::List, "Main",
-        {
-            new MenuItem{ListItemType::Generic, "Appearance", "UI customization", {}, {}, nullptr, nullptr, DeferToSubmenu, appearanceMenu},
-            new MenuItem{ListItemType::Generic, "Display", "", {}, {}, nullptr, nullptr, DeferToSubmenu, displayMenu},
-            new MenuItem{ListItemType::Generic, "System", "", {}, {}, nullptr, nullptr, DeferToSubmenu, systemMenu},
-            new MenuItem{ListItemType::Generic, "FN switch", "FN switch settings", {}, {}, nullptr, nullptr, DeferToSubmenu, muteMenu},
-            new MenuItem{ListItemType::Generic, "Network", "", {}, {}, nullptr, nullptr, DeferToSubmenu, networkMenu},
-            new MenuItem{ListItemType::Generic, "Bluetooth", "", {}, {}, nullptr, nullptr, DeferToSubmenu, btMenu},
-            new MenuItem{ListItemType::Generic, "About", "", {}, {}, nullptr, nullptr, DeferToSubmenu, aboutMenu},
-        });
-
-        const bool showTitle = false;
-        const bool showIndicator = true;
-        const bool showHints = false;
-
-        SDL_Surface* bgbmp = IMG_Load(SDCARD_PATH "/bg.png");
-        SDL_Surface* convertedbg = SDL_ConvertSurfaceFormat(bgbmp, SDL_PIXELFORMAT_RGB565, 0);
-        if (convertedbg) {
-            SDL_FreeSurface(bgbmp); 
-            SDL_Surface* scaled = SDL_CreateRGBSurfaceWithFormat(0, ctx.screen->w, ctx.screen->h, 32, SDL_PIXELFORMAT_RGB565);
-            GFX_blitScaleToFill(convertedbg, scaled);
-            bgbmp = scaled;
-        }
-
-        // main content (list)
-        // PADDING all around
-        SDL_Rect listRect = {SCALE1(PADDING), SCALE1(PADDING), ctx.screen->w - SCALE1(PADDING * 2), ctx.screen->h - SCALE1(PADDING * 2)};
-        // PILL_SIZE above (if showing title)
-        if (showTitle || showIndicator)
-            listRect = dy(listRect, SCALE1(PILL_SIZE));
-        // BUTTON_SIZE below (if showing hints)
-        if (showHints)
-            listRect.h -= SCALE1(BUTTON_SIZE);
-        ctx.menu->performLayout(listRect);
-
-        while (!appQuit)
-        {
-            GFX_startFrame();
-            uint32_t now = SDL_GetTicks();
-            PAD_poll();
-
-            ctx.menu->handleInput(ctx.dirty, appQuit);
-
-            PWR_update(&ctx.dirty, &ctx.show_setting, nullptr, nullptr);
-
-            int is_online = PLAT_isOnline();
-            if (was_online!=is_online) 
-                ctx.dirty = 1;
-            was_online = is_online;
-
-            int has_bt = PLAT_btIsConnected();
-            if (had_bt != has_bt)
-                ctx.dirty = 1;
-            had_bt = has_bt;
-
-            if (ctx.dirty)
-            {
-                GFX_clear(ctx.screen);
-                if(bgbmp) {
-                    SDL_Rect image_rect = {0, 0, ctx.screen->w, ctx.screen->h};
-                    SDL_BlitSurface(bgbmp, NULL, ctx.screen, &image_rect);
-                }
-
-                int ow = 0;
-
-                // indicator area top right
-                if (showIndicator)
-                {
-                    ow = GFX_blitHardwareGroup(ctx.screen, ctx.show_setting);
-                }
-                int max_width = ctx.screen->w - SCALE1(PADDING * 2) - ow;
-
-                // title pill
-                if (showTitle)
-                {
-                    char display_name[256];
-                    int text_width = GFX_truncateText(font.large, "Some title", display_name, max_width, SCALE1(BUTTON_PADDING * 2));
-                    max_width = MIN(max_width, text_width);
-
-                    SDL_Surface *text;
-                    text = TTF_RenderUTF8_Blended(font.large, display_name, COLOR_WHITE);
-                    SDL_Rect target = {SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)};
-                    GFX_blitPillLight(ASSET_WHITE_PILL, ctx.screen, &target);
-                    SDL_BlitSurfaceCPP(text, {0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, ctx.screen, {SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
-                    SDL_FreeSurface(text);
-                }
-
-                // bottom area, button hints
-                if (showHints)
-                {
-                    if (ctx.show_setting && !GetHDMI())
-                        GFX_blitHardwareHints(ctx.screen, ctx.show_setting);
-                    else
-                    {
-                        char *hints[] = {(char *)("MENU"), (char *)("SLEEP"), NULL};
-                        GFX_blitButtonGroup(hints, 0, ctx.screen, 0);
-                    }
-                    char *hints[] = {(char *)("B"), (char *)("BACK"), (char *)("A"), (char *)("OKAY"), NULL};
-                    GFX_blitButtonGroup(hints, 1, ctx.screen, 1);
-                }
-
-                ctx.menu->draw(ctx.screen, listRect);
-
-                // present
-                GFX_flip(ctx.screen);
-                ctx.dirty = false;
-
-                // hdmimon();
-            }
-        }
-
-        delete ctx.menu;
-        delete appearanceMenu;
-        delete systemMenu;
-        ctx.menu = NULL;
-
-        QuitSettings();
-        PWR_quit();
-        PAD_quit();
-        BT_quit();
-        GFX_quit();
-
-        return EXIT_SUCCESS;
-    }
-    catch (const std::exception &e)
-    {
-        LOG_error("%s", e.what());
-        QuitSettings();
-        PWR_quit();
-        PAD_quit();
-        BT_quit();
-        GFX_quit();
-
-        return EXIT_FAILURE;
-    }
+	try {
+		char *device = getenv("DEVICE");
+		bool is_brick = exactMatch("brick", device);
+
+		char version[128];
+		PLAT_getOsVersionInfo(version, 128);
+		LOG_info("This is TrimUI stock OS version %s\n", version);
+		InitSettings();
+
+		PWR_setCPUSpeed(CPU_SPEED_MENU);
+
+		Context ctx = {0};
+		ctx.dirty = 1;
+		ctx.show_setting = 0;
+		ctx.screen = GFX_init(MODE_MAIN);
+		PAD_init();
+		PWR_init();
+		TIME_init();
+		WIFI_init();
+		// This will briefly tear down existing connections
+		BT_init();
+
+		signal(SIGINT, sigHandler);
+		signal(SIGTERM, sigHandler);
+
+		char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH];
+		int tz_count = 0;
+		TIME_getTimezones(timezones, &tz_count);
+
+		int was_online = PLAT_isOnline();
+		int had_bt = PLAT_btIsConnected();
+
+		std::vector<std::any> tz_values;
+		std::vector<std::string> tz_labels;
+		for (int i = 0; i < tz_count; ++i) {
+			// LOG_info("Timezone: %s\n", timezones[i]);
+			tz_values.push_back(std::string(timezones[i]));
+			// Todo: beautify, remove underscores and so on
+			tz_labels.push_back(std::string(timezones[i]));
+		}
+
+		auto appearanceMenu = new MenuList(
+			MenuItemType::Fixed, "Appearance",
+			{
+				new MenuItem{ListItemType::Generic,
+							 "Font",
+							 "The font to render all UI text.",
+							 {0, 1},
+							 font_names,
+							 []() -> std::any { return CFG_getFontId(); },
+							 [](const std::any &value) { CFG_setFontId(std::any_cast<int>(value)); },
+							 []() { CFG_setFontId(CFG_DEFAULT_FONT_ID); }},
+				new MenuItem{ListItemType::Color, "Main Color", "The color used to render main UI elements.", colors,
+							 color_strings, []() -> std::any { return CFG_getColor(1); },
+							 [](const std::any &value) { CFG_setColor(1, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(1, CFG_DEFAULT_COLOR1); }},
+				new MenuItem{ListItemType::Color, "Primary Accent Color",
+							 "The color used to highlight important things in the user interface.", colors,
+							 color_strings, []() -> std::any { return CFG_getColor(2); },
+							 [](const std::any &value) { CFG_setColor(2, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(2, CFG_DEFAULT_COLOR2); }},
+				new MenuItem{ListItemType::Color, "Secondary Accent Color", "A secondary highlight color.", colors,
+							 color_strings, []() -> std::any { return CFG_getColor(3); },
+							 [](const std::any &value) { CFG_setColor(3, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(3, CFG_DEFAULT_COLOR3); }},
+				new MenuItem{ListItemType::Color, "Hint info Color", "Color for button hints and info", colors,
+							 color_strings, []() -> std::any { return CFG_getColor(6); },
+							 [](const std::any &value) { CFG_setColor(6, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(6, CFG_DEFAULT_COLOR6); }},
+				new MenuItem{ListItemType::Color, "List Text", "List text color", colors, color_strings,
+							 []() -> std::any { return CFG_getColor(4); },
+							 [](const std::any &value) { CFG_setColor(4, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(4, CFG_DEFAULT_COLOR4); }},
+				new MenuItem{ListItemType::Color, "List Text Selected", "List selected text color", colors,
+							 color_strings, []() -> std::any { return CFG_getColor(5); },
+							 [](const std::any &value) { CFG_setColor(5, std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setColor(5, CFG_DEFAULT_COLOR5); }},
+				// new MenuItem{ListItemType::Color, "Background color", "Main UI background color", colors,
+				// color_strings,
+				//[]() -> std::any { return CFG_getColor(7); },
+				//[](const std::any &value) { CFG_setColor(7, std::any_cast<uint32_t>(value)); },
+				//[]() { CFG_setColor(7, CFG_DEFAULT_COLOR7);}},
+				new MenuItem{ListItemType::Generic,
+							 "Show battery percentage",
+							 "Show battery level as percent in the status pill",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowBatteryPercent(); },
+							 [](const std::any &value) { CFG_setShowBatteryPercent(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowBatteryPercent(CFG_DEFAULT_SHOWBATTERYPERCENT); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show menu animations",
+							 "Enable or disable menu animations",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getMenuAnimations(); },
+							 [](const std::any &value) { CFG_setMenuAnimations(std::any_cast<bool>(value)); },
+							 []() { CFG_setMenuAnimations(CFG_DEFAULT_SHOWMENUANIMATIONS); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show menu transitions",
+							 "Enable or disable animated transitions",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getMenuTransitions(); },
+							 [](const std::any &value) { CFG_setMenuTransitions(std::any_cast<bool>(value)); },
+							 []() { CFG_setMenuTransitions(CFG_DEFAULT_SHOWMENUTRANSITIONS); }},
+				new MenuItem{ListItemType::Generic, "Game art corner radius",
+							 "Set the radius for the rounded corners of game art", 0, 24, "px",
+							 []() -> std::any { return CFG_getThumbnailRadius(); },
+							 [](const std::any &value) { CFG_setThumbnailRadius(std::any_cast<int>(value)); },
+							 []() { CFG_setThumbnailRadius(CFG_DEFAULT_THUMBRADIUS); }},
+				new MenuItem{
+					ListItemType::Generic, "Game art width",
+					"Set the percentage of screen width used for game art.\nUI elements might overrule this to avoid "
+					"clipping.",
+					5, 100, "%", []() -> std::any { return (int)(CFG_getGameArtWidth() * 100); },
+					[](const std::any &value) { CFG_setGameArtWidth((double)std::any_cast<int>(value) / 100.0); },
+					[]() { CFG_setGameArtWidth(CFG_DEFAULT_GAMEARTWIDTH); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show folder names at root",
+							 "Show folder names at root directory",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowFolderNamesAtRoot(); },
+							 [](const std::any &value) { CFG_setShowFolderNamesAtRoot(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowFolderNamesAtRoot(CFG_DEFAULT_SHOWFOLDERNAMESATROOT); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show Recents",
+							 "Show \"Recently Played\" menu entry in game list.",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowRecents(); },
+							 [](const std::any &value) { CFG_setShowRecents(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowRecents(CFG_DEFAULT_SHOWRECENTS); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show Tools",
+							 "Show \"Tools\" menu entry in game list.",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowTools(); },
+							 [](const std::any &value) { CFG_setShowTools(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowTools(CFG_DEFAULT_SHOWTOOLS); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show game art",
+							 "Show game artwork in the main menu",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowGameArt(); },
+							 [](const std::any &value) { CFG_setShowGameArt(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowGameArt(CFG_DEFAULT_SHOWGAMEART); }},
+				new MenuItem{ListItemType::Generic,
+							 "Use folder background for ROMs",
+							 "If enabled, used the emulator background image. Otherwise uses the default.",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getRomsUseFolderBackground(); },
+							 [](const std::any &value) { CFG_setRomsUseFolderBackground(std::any_cast<bool>(value)); },
+							 []() { CFG_setRomsUseFolderBackground(CFG_DEFAULT_ROMSUSEFOLDERBACKGROUND); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show Quickswitcher UI",
+							 "Show/hide Quickswitcher UI elements.\nWhen hidden, will only draw background images.",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowQuickswitcherUI(); },
+							 [](const std::any &value) { CFG_setShowQuickswitcherUI(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowQuickswitcherUI(CFG_DEFAULT_SHOWQUICKWITCHERUI); }},
+				// not needed anymore
+				// new MenuItem{ListItemType::Generic, "Game switcher scaling", "The scaling algorithm used to display
+				// the savegame image.", scaling, scaling_strings, []() -> std::any { return
+				// CFG_getGameSwitcherScaling(); },
+				// [](const std::any &value)
+				// { CFG_setGameSwitcherScaling(std::any_cast<int>(value)); },
+				// []() { CFG_setGameSwitcherScaling(CFG_DEFAULT_GAMESWITCHERSCALING);}},
+
+				new MenuItem{ListItemType::Button, "Reset to defaults",
+							 "Resets all options in this menu to their default values.", ResetCurrentMenu},
+			});
+
+		auto displayMenu =
+			new MenuList(MenuItemType::Fixed, "Display",
+						 {
+							 new MenuItem{ListItemType::Generic, "Brightness", "Display brightness (0 to 10)", 0, 10,
+										  "", []() -> std::any { return GetBrightness(); },
+										  [](const std::any &value) { SetBrightness(std::any_cast<int>(value)); },
+										  []() { SetBrightness(SETTINGS_DEFAULT_BRIGHTNESS); }},
+							 new MenuItem{ListItemType::Generic, "Color temperature", "Color temperature (0 to 40)", 0,
+										  40, "", []() -> std::any { return GetColortemp(); },
+										  [](const std::any &value) { SetColortemp(std::any_cast<int>(value)); },
+										  []() { SetColortemp(SETTINGS_DEFAULT_COLORTEMP); }},
+							 new MenuItem{ListItemType::Generic, "Contrast", "Contrast enhancement (-4 to 5)", -4, 5,
+										  "", []() -> std::any { return GetContrast(); },
+										  [](const std::any &value) { SetContrast(std::any_cast<int>(value)); },
+										  []() { SetContrast(SETTINGS_DEFAULT_CONTRAST); }},
+							 new MenuItem{ListItemType::Generic, "Saturation", "Saturation enhancement (-5 to 5)", -5,
+										  5, "", []() -> std::any { return GetSaturation(); },
+										  [](const std::any &value) { SetSaturation(std::any_cast<int>(value)); },
+										  []() { SetSaturation(SETTINGS_DEFAULT_SATURATION); }},
+							 new MenuItem{ListItemType::Generic, "Exposure", "Exposure enhancement (-4 to 5)", -4, 5,
+										  "", []() -> std::any { return GetExposure(); },
+										  [](const std::any &value) { SetExposure(std::any_cast<int>(value)); },
+										  []() { SetExposure(SETTINGS_DEFAULT_EXPOSURE); }},
+
+							 new MenuItem{ListItemType::Button, "Reset to defaults",
+										  "Resets all options in this menu to their default values.", ResetCurrentMenu},
+						 });
+
+		auto systemMenu = new MenuList(
+			MenuItemType::Fixed, "System",
+			{
+				new MenuItem{ListItemType::Generic,
+							 "Volume",
+							 "Speaker volume",
+							 {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20},
+							 {"Muted", "5%",  "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%",
+							  "55%",   "60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%"},
+							 []() -> std::any { return GetVolume(); },
+							 [](const std::any &value) { SetVolume(std::any_cast<int>(value)); },
+							 []() { SetVolume(SETTINGS_DEFAULT_VOLUME); }},
+				new MenuItem{ListItemType::Generic, "Screen timeout", "Time before screen turns off (0-600s)",
+							 timeout_secs, timeout_labels, []() -> std::any { return CFG_getScreenTimeoutSecs(); },
+							 [](const std::any &value) { CFG_setScreenTimeoutSecs(std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setScreenTimeoutSecs(CFG_DEFAULT_SCREENTIMEOUTSECS); }},
+				new MenuItem{ListItemType::Generic, "Suspend timeout", "Time before device goes to sleep (0-600s)",
+							 timeout_secs, timeout_labels, []() -> std::any { return CFG_getSuspendTimeoutSecs(); },
+							 [](const std::any &value) { CFG_setSuspendTimeoutSecs(std::any_cast<uint32_t>(value)); },
+							 []() { CFG_setSuspendTimeoutSecs(CFG_DEFAULT_SUSPENDTIMEOUTSECS); }},
+				new MenuItem{ListItemType::Generic,
+							 "Haptic feedback",
+							 "Enable or disable haptic feedback on certain actions in the OS",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getHaptics(); },
+							 [](const std::any &value) { CFG_setHaptics(std::any_cast<bool>(value)); },
+							 []() { CFG_setHaptics(CFG_DEFAULT_HAPTICS); }},
+				new MenuItem{ListItemType::Generic,
+							 "Default view",
+							 "The initial view to show on boot",
+							 {(int)SCREEN_GAMELIST, (int)SCREEN_GAMESWITCHER, (int)SCREEN_QUICKMENU},
+							 {"Content List", "Game Switcher", "Quick Menu"},
+							 []() -> std::any { return CFG_getDefaultView(); },
+							 [](const std::any &value) { CFG_setDefaultView(std::any_cast<int>(value)); },
+							 []() { CFG_setDefaultView(CFG_DEFAULT_VIEW); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show 24h time format",
+							 "Show clock in the 24hrs time format",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getClock24H(); },
+							 [](const std::any &value) { CFG_setClock24H(std::any_cast<bool>(value)); },
+							 []() { CFG_setClock24H(CFG_DEFAULT_CLOCK24H); }},
+				new MenuItem{ListItemType::Generic,
+							 "Show clock",
+							 "Show clock in the status pill",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getShowClock(); },
+							 [](const std::any &value) { CFG_setShowClock(std::any_cast<bool>(value)); },
+							 []() { CFG_setShowClock(CFG_DEFAULT_SHOWCLOCK); }},
+				new MenuItem{ListItemType::Generic,
+							 "Set time and date automatically",
+							 "Automatically adjust system time\nwith NTP (requires internet access)",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return TIME_getNetworkTimeSync(); },
+							 [](const std::any &value) { TIME_setNetworkTimeSync(std::any_cast<bool>(value)); },
+							 []() { TIME_setNetworkTimeSync(false); }}, // default from stock
+				new MenuItem{
+					ListItemType::Generic, "Time zone", "Your time zone", tz_values, tz_labels,
+					[]() -> std::any { return std::string(TIME_getCurrentTimezone()); },
+					[](const std::any &value) { TIME_setCurrentTimezone(std::any_cast<std::string>(value).c_str()); },
+					[]() { TIME_setCurrentTimezone("Asia/Shanghai"); }}, // default from Stock
+				new MenuItem{ListItemType::Generic,
+							 "Save format",
+							 "The save format to use.\nMinUI: Game.gba.sav, Retroarch: Game.srm, Generic: Game.sav",
+							 {(int)SAVE_FORMAT_SAV, (int)SAVE_FORMAT_SRM, (int)SAVE_FORMAT_SRM_UNCOMPRESSED,
+							  (int)SAVE_FORMAT_GEN},
+							 {"MinUI (default)", "Retroarch (compressed)", "Retroarch (uncompressed)", "Generic"},
+							 []() -> std::any { return CFG_getSaveFormat(); },
+							 [](const std::any &value) { CFG_setSaveFormat(std::any_cast<int>(value)); },
+							 []() { CFG_setSaveFormat(CFG_DEFAULT_SAVEFORMAT); }},
+				new MenuItem{ListItemType::Generic,
+							 "Save state format",
+							 "The save state format to use. MinUI: Game.st0, \nRetroarch-ish: Game.state.0, Retroarch: "
+							 "Game.state0",
+							 {(int)STATE_FORMAT_SAV, (int)STATE_FORMAT_SRM_EXTRADOT,
+							  (int)STATE_FORMAT_SRM_UNCOMRESSED_EXTRADOT, (int)STATE_FORMAT_SRM,
+							  (int)STATE_FORMAT_SRM_UNCOMRESSED},
+							 {"MinUI (default)", "Retroarch-ish (compressed)", "Retroarch-ish (uncompressed)",
+							  "Retroarch (compressed)", "Retroarch (uncompressed)"},
+							 []() -> std::any { return CFG_getStateFormat(); },
+							 [](const std::any &value) { CFG_setStateFormat(std::any_cast<int>(value)); },
+							 []() { CFG_setStateFormat(CFG_DEFAULT_STATEFORMAT); }},
+				new MenuItem{ListItemType::Generic,
+							 "Use extracted file name",
+							 "Use the extracted file name instead of the archive name.\nOnly applies to cores that do "
+							 "not handle archives natively",
+							 {false, true},
+							 on_off,
+							 []() -> std::any { return CFG_getUseExtractedFileName(); },
+							 [](const std::any &value) { CFG_setUseExtractedFileName(std::any_cast<bool>(value)); },
+							 []() { CFG_setUseExtractedFileName(CFG_DEFAULT_EXTRACTEDFILENAME); }},
+
+				new MenuItem{ListItemType::Button, "Reset to defaults",
+							 "Resets all options in this menu to their default values.", ResetCurrentMenu},
+			});
+
+		std::vector<AbstractMenuItem *> muteItems = {
+			new MenuItem{ListItemType::Generic,
+						 "Volume when toggled",
+						 "Speaker volume (0-20)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE,
+						  0,
+						  1,
+						  2,
+						  3,
+						  4,
+						  5,
+						  6,
+						  7,
+						  8,
+						  9,
+						  10,
+						  11,
+						  12,
+						  13,
+						  14,
+						  15,
+						  16,
+						  17,
+						  18,
+						  19,
+						  20},
+						 {"Unchanged", "Muted", "5%",  "10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%",
+						  "50%",	   "55%",	"60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%"},
+						 []() -> std::any { return GetMutedVolume(); },
+						 [](const std::any &value) { SetMutedVolume(std::any_cast<int>(value)); },
+						 []() { SetMutedVolume(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "FN switch disables LED",
+						 "Switch will also disable LEDs",
+						 {false, true},
+						 on_off,
+						 []() -> std::any { return CFG_getMuteLEDs(); },
+						 [](const std::any &value) { CFG_setMuteLEDs(std::any_cast<bool>(value)); },
+						 []() { CFG_setMuteLEDs(CFG_DEFAULT_MUTELEDS); }},
+			new MenuItem{ListItemType::Generic,
+						 "Brightness when toggled",
+						 "Display brightness (0 to 10)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+						 {"Unchanged", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"},
+						 []() -> std::any { return GetMutedBrightness(); },
+						 [](const std::any &value) { SetMutedBrightness(std::any_cast<int>(value)); },
+						 []() { SetMutedBrightness(SETTINGS_DEFAULT_MUTE_NO_CHANGE); }},
+			new MenuItem{ListItemType::Generic,
+						 "Color temperature when toggled",
+						 "Color temperature (0 to 40)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE,
+						  0,
+						  1,
+						  2,
+						  3,
+						  4,
+						  5,
+						  6,
+						  7,
+						  8,
+						  9,
+						  10,
+						  11,
+						  12,
+						  13,
+						  14,
+						  15,
+						  16,
+						  17,
+						  18,
+						  19,
+						  20,
+						  21,
+						  22,
+						  23,
+						  24,
+						  25,
+						  26,
+						  27,
+						  28,
+						  29,
+						  30,
+						  31,
+						  32,
+						  33,
+						  34,
+						  35,
+						  36,
+						  37,
+						  38,
+						  39,
+						  40},
+						 {"Unchanged", "0",	 "1",  "2",	 "3",  "4",	 "5",  "6",	 "7",  "8",	 "9",  "10", "11", "12",
+						  "13",		   "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26",
+						  "27",		   "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40"},
+						 []() -> std::any { return GetMutedColortemp(); },
+						 [](const std::any &value) { SetMutedColortemp(std::any_cast<int>(value)); },
+						 []() { SetMutedColortemp(SETTINGS_DEFAULT_MUTE_NO_CHANGE); }},
+			new MenuItem{ListItemType::Generic,
+						 "Contrast when toggled",
+						 "Contrast enhancement (-4 to 5)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5},
+						 {"Unchanged", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"},
+						 []() -> std::any { return GetMutedContrast(); },
+						 [](const std::any &value) { SetMutedContrast(std::any_cast<int>(value)); },
+						 []() { SetMutedContrast(SETTINGS_DEFAULT_MUTE_NO_CHANGE); }},
+			new MenuItem{ListItemType::Generic,
+						 "Saturation when toggled",
+						 "Saturation enhancement (-5 to 5)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5},
+						 {"Unchanged", "-5", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"},
+						 []() -> std::any { return GetMutedSaturation(); },
+						 [](const std::any &value) { SetMutedSaturation(std::any_cast<int>(value)); },
+						 []() { SetMutedSaturation(SETTINGS_DEFAULT_MUTE_NO_CHANGE); }},
+			new MenuItem{ListItemType::Generic,
+						 "Exposure when toggled",
+						 "Exposure enhancement (-4 to 5)",
+						 {(int)SETTINGS_DEFAULT_MUTE_NO_CHANGE, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5},
+						 {"Unchanged", "-4", "-3", "-2", "-1", "0", "1", "2", "3", "4", "5"},
+						 []() -> std::any { return GetMutedExposure(); },
+						 [](const std::any &value) { SetMutedExposure(std::any_cast<int>(value)); },
+						 []() { SetMutedExposure(SETTINGS_DEFAULT_MUTE_NO_CHANGE); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire A",
+						 "Enable turbo fire A",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboA(); },
+						 [](const std::any &value) { SetMuteTurboA(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboA(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire B",
+						 "Enable turbo fire B",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboB(); },
+						 [](const std::any &value) { SetMuteTurboB(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboB(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire X",
+						 "Enable turbo fire X",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboX(); },
+						 [](const std::any &value) { SetMuteTurboX(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboX(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire Y",
+						 "Enable turbo fire Y",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboY(); },
+						 [](const std::any &value) { SetMuteTurboY(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboY(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire L1",
+						 "Enable turbo fire L1",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboL1(); },
+						 [](const std::any &value) { SetMuteTurboL1(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboL1(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire L2",
+						 "Enable turbo fire L2",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboL2(); },
+						 [](const std::any &value) { SetMuteTurboL2(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboL2(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire R1",
+						 "Enable turbo fire R1",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboR1(); },
+						 [](const std::any &value) { SetMuteTurboR1(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboR1(0); }},
+			new MenuItem{ListItemType::Generic,
+						 "Turbo fire R2",
+						 "Enable turbo fire R2",
+						 {0, 1},
+						 on_off,
+						 []() -> std::any { return GetMuteTurboR2(); },
+						 [](const std::any &value) { SetMuteTurboR2(std::any_cast<int>(value)); },
+						 []() { SetMuteTurboR2(0); }},
+		};
+		if (is_brick) {
+			muteItems.push_back(new MenuItem{ListItemType::Generic,
+											 "Dpad mode when toggled",
+											 "Dpad: default. Joystick: Dpad exclusively acts as analog stick.\nBoth: "
+											 "Dpad and Joystick inputs at the same time.",
+											 {0, 1, 2},
+											 {"Dpad", "Joystick", "Both"},
+											 []() -> std::any {
+												 if (!GetMuteDisablesDpad() && !GetMuteEmulatesJoystick())
+													 return 0;
+												 if (GetMuteDisablesDpad() && GetMuteEmulatesJoystick())
+													 return 1;
+												 return 2;
+											 },
+											 [](const std::any &value) {
+												 int v = std::any_cast<int>(value);
+												 SetMuteDisablesDpad((v == 1));
+												 SetMuteEmulatesJoystick((v > 0));
+											 },
+											 []() {
+												 SetMuteDisablesDpad(0);
+												 SetMuteEmulatesJoystick(0);
+											 }});
+		}
+		muteItems.push_back(new MenuItem{ListItemType::Button, "Reset to defaults",
+										 "Resets all options in this menu to their default values.", ResetCurrentMenu});
+
+		auto muteMenu = new MenuList(MenuItemType::Fixed, "FN Switch", muteItems);
+
+		// TODO: check WIFI_supported(), hide menu otherwise
+		auto networkMenu = new Wifi::Menu(appQuit, ctx.dirty);
+
+		// TODO: check BT_supported(), hide menu otherwise
+		auto btMenu = new Bluetooth::Menu(appQuit, ctx.dirty);
+
+		auto aboutMenu = new MenuList(MenuItemType::Fixed, "About",
+									  {
+										  new StaticMenuItem{ListItemType::Generic, "NextUI version", "",
+															 []() -> std::any {
+																 std::ifstream t(ROOT_SYSTEM_PATH "/version.txt");
+																 std::stringstream buffer;
+																 buffer << t.rdbuf();
+																 return buffer.str();
+															 }},
+										  new StaticMenuItem{ListItemType::Generic, "Platform", "",
+															 []() -> std::any { return std::string(PLAT_getModel()); }},
+										  new StaticMenuItem{ListItemType::Generic, "Stock OS version", "",
+															 []() -> std::any {
+																 char osver[128];
+																 PLAT_getOsVersionInfo(osver, 128);
+																 return std::string(osver);
+															 }},
+										  new StaticMenuItem{ListItemType::Generic, "Busybox version", "",
+															 []() -> std::any {
+																 std::string output = execCommand("cat --help");
+																 std::string version = extractBusyBoxVersion(output);
+
+																 if (!version.empty())
+																	 return version;
+																 return std::string("BusyBox version not found.");
+															 }},
+									  });
+
+		ctx.menu = new MenuList(
+			MenuItemType::List, "Main",
+			{
+				new MenuItem{ListItemType::Generic,
+							 "Appearance",
+							 "UI customization",
+							 {},
+							 {},
+							 nullptr,
+							 nullptr,
+							 DeferToSubmenu,
+							 appearanceMenu},
+				new MenuItem{
+					ListItemType::Generic, "Display", "", {}, {}, nullptr, nullptr, DeferToSubmenu, displayMenu},
+				new MenuItem{ListItemType::Generic, "System", "", {}, {}, nullptr, nullptr, DeferToSubmenu, systemMenu},
+				new MenuItem{ListItemType::Generic,
+							 "FN switch",
+							 "FN switch settings",
+							 {},
+							 {},
+							 nullptr,
+							 nullptr,
+							 DeferToSubmenu,
+							 muteMenu},
+				new MenuItem{
+					ListItemType::Generic, "Network", "", {}, {}, nullptr, nullptr, DeferToSubmenu, networkMenu},
+				new MenuItem{ListItemType::Generic, "Bluetooth", "", {}, {}, nullptr, nullptr, DeferToSubmenu, btMenu},
+				new MenuItem{ListItemType::Generic, "About", "", {}, {}, nullptr, nullptr, DeferToSubmenu, aboutMenu},
+			});
+
+		const bool showTitle = false;
+		const bool showIndicator = true;
+		const bool showHints = false;
+
+		SDL_Surface *bgbmp = IMG_Load(SDCARD_PATH "/bg.png");
+		SDL_Surface *convertedbg = SDL_ConvertSurfaceFormat(bgbmp, SDL_PIXELFORMAT_RGB565, 0);
+		if (convertedbg) {
+			SDL_FreeSurface(bgbmp);
+			SDL_Surface *scaled =
+				SDL_CreateRGBSurfaceWithFormat(0, ctx.screen->w, ctx.screen->h, 32, SDL_PIXELFORMAT_RGB565);
+			GFX_blitScaleToFill(convertedbg, scaled);
+			bgbmp = scaled;
+		}
+
+		// main content (list)
+		// PADDING all around
+		SDL_Rect listRect = {SCALE1(PADDING), SCALE1(PADDING), ctx.screen->w - SCALE1(PADDING * 2),
+							 ctx.screen->h - SCALE1(PADDING * 2)};
+		// PILL_SIZE above (if showing title)
+		if (showTitle || showIndicator)
+			listRect = dy(listRect, SCALE1(PILL_SIZE));
+		// BUTTON_SIZE below (if showing hints)
+		if (showHints)
+			listRect.h -= SCALE1(BUTTON_SIZE);
+		ctx.menu->performLayout(listRect);
+
+		while (!appQuit) {
+			GFX_startFrame();
+			uint32_t now = SDL_GetTicks();
+			PAD_poll();
+
+			ctx.menu->handleInput(ctx.dirty, appQuit);
+
+			PWR_update(&ctx.dirty, &ctx.show_setting, nullptr, nullptr);
+
+			int is_online = PLAT_isOnline();
+			if (was_online != is_online)
+				ctx.dirty = 1;
+			was_online = is_online;
+
+			int has_bt = PLAT_btIsConnected();
+			if (had_bt != has_bt)
+				ctx.dirty = 1;
+			had_bt = has_bt;
+
+			if (ctx.dirty) {
+				GFX_clear(ctx.screen);
+				if (bgbmp) {
+					SDL_Rect image_rect = {0, 0, ctx.screen->w, ctx.screen->h};
+					SDL_BlitSurface(bgbmp, NULL, ctx.screen, &image_rect);
+				}
+
+				int ow = 0;
+
+				// indicator area top right
+				if (showIndicator) {
+					ow = GFX_blitHardwareGroup(ctx.screen, ctx.show_setting);
+				}
+				int max_width = ctx.screen->w - SCALE1(PADDING * 2) - ow;
+
+				// title pill
+				if (showTitle) {
+					char display_name[256];
+					int text_width =
+						GFX_truncateText(font.large, "Some title", display_name, max_width, SCALE1(BUTTON_PADDING * 2));
+					max_width = MIN(max_width, text_width);
+
+					SDL_Surface *text;
+					text = TTF_RenderUTF8_Blended(font.large, display_name, COLOR_WHITE);
+					SDL_Rect target = {SCALE1(PADDING), SCALE1(PADDING), max_width, SCALE1(PILL_SIZE)};
+					GFX_blitPillLight(ASSET_WHITE_PILL, ctx.screen, &target);
+					SDL_BlitSurfaceCPP(text, {0, 0, max_width - SCALE1(BUTTON_PADDING * 2), text->h}, ctx.screen,
+									   {SCALE1(PADDING + BUTTON_PADDING), SCALE1(PADDING + 4)});
+					SDL_FreeSurface(text);
+				}
+
+				// bottom area, button hints
+				if (showHints) {
+					if (ctx.show_setting && !GetHDMI())
+						GFX_blitHardwareHints(ctx.screen, ctx.show_setting);
+					else {
+						char *hints[] = {(char *)("MENU"), (char *)("SLEEP"), NULL};
+						GFX_blitButtonGroup(hints, 0, ctx.screen, 0);
+					}
+					char *hints[] = {(char *)("B"), (char *)("BACK"), (char *)("A"), (char *)("OKAY"), NULL};
+					GFX_blitButtonGroup(hints, 1, ctx.screen, 1);
+				}
+
+				ctx.menu->draw(ctx.screen, listRect);
+
+				// present
+				GFX_flip(ctx.screen);
+				ctx.dirty = false;
+
+				// hdmimon();
+			}
+		}
+
+		delete ctx.menu;
+		delete appearanceMenu;
+		delete systemMenu;
+		ctx.menu = NULL;
+
+		QuitSettings();
+		PWR_quit();
+		PAD_quit();
+		BT_quit();
+		GFX_quit();
+
+		return EXIT_SUCCESS;
+	} catch (const std::exception &e) {
+		LOG_error("%s", e.what());
+		QuitSettings();
+		PWR_quit();
+		PAD_quit();
+		BT_quit();
+		GFX_quit();
+
+		return EXIT_FAILURE;
+	}
 }
diff --git a/workspace/all/settings/wifimenu.cpp b/workspace/all/settings/wifimenu.cpp
index 54ed5d784..ee6686c69 100644
--- a/workspace/all/settings/wifimenu.cpp
+++ b/workspace/all/settings/wifimenu.cpp
@@ -13,280 +13,280 @@ typedef std::shared_lock<Lock> ReadLock;
 using namespace Wifi;
 using namespace std::placeholders;
 
-Menu::Menu(const int &globalQuit, int &globalDirty) : MenuList(MenuItemType::Fixed, "Network", {}), globalQuit(globalQuit), globalDirty(globalDirty)
+Menu::Menu(const int &globalQuit, int &globalDirty)
+	: MenuList(MenuItemType::Fixed, "Network", {}), globalQuit(globalQuit), globalDirty(globalDirty)
 {
-    toggleItem = new MenuItem(ListItemType::Generic, "WiFi", "Enable/disable WiFi", {false, true}, {"Off", "On"},
-                              std::bind(&Menu::getWifToggleState, this),
-                              std::bind(&Menu::setWifiToggleState, this, std::placeholders::_1),
-                              std::bind(&Menu::resetWifiToggleState, this));
-    diagItem = new MenuItem(ListItemType::Generic, "WiFi diagnostics", "Enable/disable WiFi logging", {false, true}, {"Off", "On"},
-                              std::bind(&Menu::getWifDiagnosticsState, this),
-                              std::bind(&Menu::setWifiDiagnosticsState, this, std::placeholders::_1),
-                              std::bind(&Menu::resetWifiDiagnosticsState, this));
-    items.push_back(toggleItem);
-    items.push_back(diagItem);
-
-    // best effort layout based on the platform defines, user should really call performLayout manually
-    MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-    layout_called = false;
-
-    worker = std::thread{&Menu::updater, this};
+	toggleItem = new MenuItem(ListItemType::Generic, "WiFi", "Enable/disable WiFi", {false, true}, {"Off", "On"},
+							  std::bind(&Menu::getWifToggleState, this),
+							  std::bind(&Menu::setWifiToggleState, this, std::placeholders::_1),
+							  std::bind(&Menu::resetWifiToggleState, this));
+	diagItem = new MenuItem(ListItemType::Generic, "WiFi diagnostics", "Enable/disable WiFi logging", {false, true},
+							{"Off", "On"}, std::bind(&Menu::getWifDiagnosticsState, this),
+							std::bind(&Menu::setWifiDiagnosticsState, this, std::placeholders::_1),
+							std::bind(&Menu::resetWifiDiagnosticsState, this));
+	items.push_back(toggleItem);
+	items.push_back(diagItem);
+
+	// best effort layout based on the platform defines, user should really call performLayout manually
+	MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+	layout_called = false;
+
+	worker = std::thread{&Menu::updater, this};
 }
 
 Menu::~Menu()
 {
-    quit = true;
-    if (worker.joinable())
-        worker.join();
+	quit = true;
+	if (worker.joinable())
+		worker.join();
 }
 
 InputReactionHint Menu::handleInput(int &dirty, int &quit)
 {
-    auto ret = MenuList::handleInput(dirty, quit);
-    if (selectionDirty)
-    {
-        dirty = true;
-        selectionDirty = false; // handled
-        //LOG_info("collected workerDirty\n");
-    }
-    return ret;
+	auto ret = MenuList::handleInput(dirty, quit);
+	if (selectionDirty) {
+		dirty = true;
+		selectionDirty = false; // handled
+								// LOG_info("collected workerDirty\n");
+	}
+	return ret;
 }
 
 std::any Menu::getWifToggleState() const
 {
-    return WIFI_enabled();
+	return WIFI_enabled();
 }
 
 void Menu::setWifiToggleState(const std::any &on)
 {
-    WIFI_enable(std::any_cast<bool>(on));
+	WIFI_enable(std::any_cast<bool>(on));
 }
 
 void Menu::resetWifiToggleState()
 {
-    //
+	//
 }
 
 std::any Menu::getWifDiagnosticsState() const
 {
-    return WIFI_diagnosticsEnabled();
+	return WIFI_diagnosticsEnabled();
 }
 
 void Menu::setWifiDiagnosticsState(const std::any &on)
 {
-    WIFI_diagnosticsEnable(std::any_cast<bool>(on));
+	WIFI_diagnosticsEnable(std::any_cast<bool>(on));
 }
 
 void Menu::resetWifiDiagnosticsState()
 {
-    //
+	//
 }
 
-template <typename Map>
-bool key_compare(Map const &lhs, Map const &rhs)
+template <typename Map> bool key_compare(Map const &lhs, Map const &rhs)
 {
-    return lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin(),
-                                                  [](auto a, auto b)
-                                                  { return a.first == b.first; });
+	return lhs.size() == rhs.size() &&
+		   std::equal(lhs.begin(), lhs.end(), rhs.begin(), [](auto a, auto b) { return a.first == b.first; });
 }
 
 void Menu::updater()
 {
-    int pollSecs = 15;
-
-    while (!quit && !globalQuit)
-    {
-        // TODO: pause when menu is not rendered
-        // Scan
-        if (WIFI_enabled())
-        {
-            // scan for available networks and add a menu item for each
-            WIFI_connection connection;
-            if(WIFI_connectionInfo(&connection) < 0)
-                continue; // try again in a bit
-
-            // grab list and compare it to previous result
-            // only relayout the menu if changes happended
-            std::vector<WIFI_network> scanResults(SCAN_MAX_RESULTS);
-            int cnt = WIFI_scan(scanResults.data(), SCAN_MAX_RESULTS);
-            if(cnt < 0)
-                continue; // try again in a bit
-
-            std::map<std::string, WIFI_network> scanSsids;
-            for (int i = 0; i < cnt; i++)
-                scanSsids.emplace(scanResults[i].ssid, scanResults[i]);
-
-            // dont repopulate if any submenu is open
-            bool menuOpen = false;
-            for(auto i : items)
-            {
-                if(i->isDeferred())
-                {
-                    menuOpen = true;
-                    break;
-                }
-            }
-
-            // something changed?
-            if (!menuOpen)
-            {
-                // remember selection and restore
-                std::string selectedName;
-                bool selectionApplied = false;
-
-                {
-                    WriteLock w(itemLock);
-                    selectedName = getSelectedItemName();
-                    items.clear();
-                    items.push_back(toggleItem);
-                    items.push_back(diagItem);
-                    layout_called = false;
-
-                    for (auto &[s, r] : scanSsids)
-                    {
-                        bool connected = false;
-                        bool hasCredentials = WIFI_isKnown(r.ssid, r.security);
-
-                        if (strcmp(connection.ssid, r.ssid) == 0)
-                            connected = true;
-
-                        MenuList *options;
-                        if (connected)
-                            options = new MenuList(MenuItemType::List, "Options",
-                                                {
-                                                    new MenuItem{ListItemType::Button, "Disconnect", "Disconnect from this network.",
-                                                                    [&](AbstractMenuItem &item) -> InputReactionHint
-                                                                    { WIFI_disconnect(); selectionDirty = true; return Exit; }},
-                                                    new ForgetItem(r, selectionDirty)
-                                                });
-                        else 
-                        if (hasCredentials)
-                            options = new MenuList(MenuItemType::List, "Options", { new ConnectKnownItem(r, selectionDirty), new ForgetItem(r, selectionDirty) });
-                        else
-                            options = new MenuList(MenuItemType::List, "Options", { new ConnectNewItem(r, selectionDirty) });
-
-                        auto itm = new NetworkItem{r, connected, options};
-                        if(connected && !std::string(connection.ip).empty())
-                            itm->setDesc(std::string(r.bssid) + " | " + std::string(connection.ip));
-                        items.push_back(itm);
-                    }
-                }
-                MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-
-                // Attempt to restore prev selection
-                selectionApplied = selectByName(selectedName);
-                globalDirty |= selectionApplied;
-                // If selection was restored, we already called performLayout internally
-                selectionDirty |= !selectionApplied;
-            }
-            pollSecs = 2;
-        }
-        else
-        {
-            WriteLock w(itemLock);
-            items.clear();
-            items.push_back(toggleItem);
-            items.push_back(diagItem);
-            layout_called = false;
-            selectionDirty = true;
-            pollSecs = 15;
-        }
-
-        // reset selection scope (locks internally)
-        if (selectionDirty)
-        {
-            MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
-            selectionDirty = false;        
-        }
-
-        std::this_thread::sleep_for(std::chrono::seconds(pollSecs));
-    }
+	int pollSecs = 15;
+
+	while (!quit && !globalQuit) {
+		// TODO: pause when menu is not rendered
+		// Scan
+		if (WIFI_enabled()) {
+			// scan for available networks and add a menu item for each
+			WIFI_connection connection;
+			if (WIFI_connectionInfo(&connection) < 0)
+				continue; // try again in a bit
+
+			// grab list and compare it to previous result
+			// only relayout the menu if changes happended
+			std::vector<WIFI_network> scanResults(SCAN_MAX_RESULTS);
+			int cnt = WIFI_scan(scanResults.data(), SCAN_MAX_RESULTS);
+			if (cnt < 0)
+				continue; // try again in a bit
+
+			std::map<std::string, WIFI_network> scanSsids;
+			for (int i = 0; i < cnt; i++)
+				scanSsids.emplace(scanResults[i].ssid, scanResults[i]);
+
+			// dont repopulate if any submenu is open
+			bool menuOpen = false;
+			for (auto i : items) {
+				if (i->isDeferred()) {
+					menuOpen = true;
+					break;
+				}
+			}
+
+			// something changed?
+			if (!menuOpen) {
+				// remember selection and restore
+				std::string selectedName;
+				bool selectionApplied = false;
+
+				{
+					WriteLock w(itemLock);
+					selectedName = getSelectedItemName();
+					items.clear();
+					items.push_back(toggleItem);
+					items.push_back(diagItem);
+					layout_called = false;
+
+					for (auto &[s, r] : scanSsids) {
+						bool connected = false;
+						bool hasCredentials = WIFI_isKnown(r.ssid, r.security);
+
+						if (strcmp(connection.ssid, r.ssid) == 0)
+							connected = true;
+
+						MenuList *options;
+						if (connected)
+							options = new MenuList(
+								MenuItemType::List, "Options",
+								{new MenuItem{ListItemType::Button, "Disconnect", "Disconnect from this network.",
+											  [&](AbstractMenuItem &item) -> InputReactionHint {
+												  WIFI_disconnect();
+												  selectionDirty = true;
+												  return Exit;
+											  }},
+								 new ForgetItem(r, selectionDirty)});
+						else if (hasCredentials)
+							options = new MenuList(
+								MenuItemType::List, "Options",
+								{new ConnectKnownItem(r, selectionDirty), new ForgetItem(r, selectionDirty)});
+						else
+							options =
+								new MenuList(MenuItemType::List, "Options", {new ConnectNewItem(r, selectionDirty)});
+
+						auto itm = new NetworkItem{r, connected, options};
+						if (connected && !std::string(connection.ip).empty())
+							itm->setDesc(std::string(r.bssid) + " | " + std::string(connection.ip));
+						items.push_back(itm);
+					}
+				}
+				MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+
+				// Attempt to restore prev selection
+				selectionApplied = selectByName(selectedName);
+				globalDirty |= selectionApplied;
+				// If selection was restored, we already called performLayout internally
+				selectionDirty |= !selectionApplied;
+			}
+			pollSecs = 2;
+		} else {
+			WriteLock w(itemLock);
+			items.clear();
+			items.push_back(toggleItem);
+			items.push_back(diagItem);
+			layout_called = false;
+			selectionDirty = true;
+			pollSecs = 15;
+		}
+
+		// reset selection scope (locks internally)
+		if (selectionDirty) {
+			MenuList::performLayout((SDL_Rect){0, 0, FIXED_WIDTH, FIXED_HEIGHT});
+			selectionDirty = false;
+		}
+
+		std::this_thread::sleep_for(std::chrono::seconds(pollSecs));
+	}
 }
 
-ConnectKnownItem::ConnectKnownItem(WIFI_network n, bool& dirty)
-    : MenuItem(ListItemType::Button, "Connect", "Connect to this network.", [&](AbstractMenuItem &item) -> InputReactionHint{
-        WIFI_connect(net.ssid, net.security); 
-        dirty = true;
-        return Exit;
-    }), net(n)
-{}
-
-ConnectNewItem::ConnectNewItem(WIFI_network n, bool& dirty)
-    : MenuItem(ListItemType::Button, "Enter WiFi passcode", "Connect to this network.", DeferToSubmenu, new KeyboardPrompt("Enter Wifi passcode", 
-        [&](AbstractMenuItem &item) -> InputReactionHint {
-            WIFI_connectPass(net.ssid, net.security, item.getName().c_str()); 
-            dirty = true;
-            return Exit; 
-        })), net(n)
-{}
-
-ForgetItem::ForgetItem(WIFI_network n, bool& dirty)
-    : MenuItem(ListItemType::Button, "Forget", "Removes credentials for this network.",
-        [&](AbstractMenuItem &item) -> InputReactionHint { 
-            WIFI_forget(net.ssid, net.security); 
-            dirty = true; 
-            return Exit;
-        }), net(n)
-{}
-
-
-NetworkItem::NetworkItem(WIFI_network n, bool connected, MenuList* submenu)
-    : MenuItem(ListItemType::Custom, n.ssid, n.bssid, DeferToSubmenu, submenu), net(n), connected(connected)
-{}
-
-void NetworkItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const
+ConnectKnownItem::ConnectKnownItem(WIFI_network n, bool &dirty)
+	: MenuItem(ListItemType::Button, "Connect", "Connect to this network.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   WIFI_connect(net.ssid, net.security);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  net(n)
 {
-    SDL_Color text_color = uintToColour(THEME_COLOR4_255);
-    SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
-
-    // hack - this should be correlated to max_width
-    int mw = dst.w;
-
-    if (selected)
-    {
-        // gray pill
-        GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
-    }
-
-    // wifi icon
-    auto asset =
-        net.rssi >= -60 ? ASSET_WIFI :    // anything above 61
-        net.rssi >= -70 ? ASSET_WIFI_MED  // -61 and below
-                        : ASSET_WIFI_LOW; // -71 and below
-    SDL_Rect rect = {0, 0, 12, 12};
-    int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
-    int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-    SDL_Rect tgt{ix, y};
-    GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
-
-    // connected
-    if(connected) {
-        SDL_Rect rect = {0, 0, 12, 12};
-        ix = ix - SCALE1(OPTION_PADDING + rect.w);
-        int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-        SDL_Rect tgt{ix, y};
-        GFX_blitAssetColor(ASSET_CHECKCIRCLE, NULL, surface, &tgt, THEME_COLOR6);
-    }
-    // encrypted
-    else if(net.security != SECURITY_NONE) {
-        SDL_Rect rect = {0, 0, 8, 11};
-        ix = ix - SCALE1(OPTION_PADDING + rect.w + 2);
-        int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
-        SDL_Rect tgt{ix, y};
-        GFX_blitAssetColor(ASSET_LOCK, NULL, surface, &tgt, THEME_COLOR6);
-    }
-
-    if (selected)
-    {
-        // white pill
-        int w = 0;
-        TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
-        w += SCALE1(OPTION_PADDING * 2);
-        GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
-        text_color = uintToColour(THEME_COLOR5_255);
-    }
-
-    text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
-    SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
-    SDL_FreeSurface(text);
+}
+
+ConnectNewItem::ConnectNewItem(WIFI_network n, bool &dirty)
+	: MenuItem(ListItemType::Button, "Enter WiFi passcode", "Connect to this network.", DeferToSubmenu,
+			   new KeyboardPrompt("Enter Wifi passcode",
+								  [&](AbstractMenuItem &item) -> InputReactionHint {
+									  WIFI_connectPass(net.ssid, net.security, item.getName().c_str());
+									  dirty = true;
+									  return Exit;
+								  })),
+	  net(n)
+{
+}
+
+ForgetItem::ForgetItem(WIFI_network n, bool &dirty)
+	: MenuItem(ListItemType::Button, "Forget", "Removes credentials for this network.",
+			   [&](AbstractMenuItem &item) -> InputReactionHint {
+				   WIFI_forget(net.ssid, net.security);
+				   dirty = true;
+				   return Exit;
+			   }),
+	  net(n)
+{
+}
+
+
+NetworkItem::NetworkItem(WIFI_network n, bool connected, MenuList *submenu)
+	: MenuItem(ListItemType::Custom, n.ssid, n.bssid, DeferToSubmenu, submenu), net(n), connected(connected)
+{
+}
+
+void NetworkItem::drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+								 bool selected) const
+{
+	SDL_Color text_color = uintToColour(THEME_COLOR4_255);
+	SDL_Surface *text = TTF_RenderUTF8_Blended(font.tiny, item.getLabel().c_str(), COLOR_WHITE); // always white
+
+	// hack - this should be correlated to max_width
+	int mw = dst.w;
+
+	if (selected) {
+		// gray pill
+		GFX_blitPillLightCPP(ASSET_BUTTON, surface, {dst.x, dst.y, mw, SCALE1(BUTTON_SIZE)});
+	}
+
+	// wifi icon
+	auto asset = net.rssi >= -60 ? ASSET_WIFI :		   // anything above 61
+					 net.rssi >= -70 ? ASSET_WIFI_MED  // -61 and below
+									 : ASSET_WIFI_LOW; // -71 and below
+	SDL_Rect rect = {0, 0, 12, 12};
+	int ix = dst.x + dst.w - SCALE1(OPTION_PADDING + rect.w);
+	int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+	SDL_Rect tgt{ix, y};
+	GFX_blitAssetColor(asset, NULL, surface, &tgt, THEME_COLOR6);
+
+	// connected
+	if (connected) {
+		SDL_Rect rect = {0, 0, 12, 12};
+		ix = ix - SCALE1(OPTION_PADDING + rect.w);
+		int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+		SDL_Rect tgt{ix, y};
+		GFX_blitAssetColor(ASSET_CHECKCIRCLE, NULL, surface, &tgt, THEME_COLOR6);
+	}
+	// encrypted
+	else if (net.security != SECURITY_NONE) {
+		SDL_Rect rect = {0, 0, 8, 11};
+		ix = ix - SCALE1(OPTION_PADDING + rect.w + 2);
+		int y = dst.y + SCALE1(BUTTON_SIZE - rect.h) / 2;
+		SDL_Rect tgt{ix, y};
+		GFX_blitAssetColor(ASSET_LOCK, NULL, surface, &tgt, THEME_COLOR6);
+	}
+
+	if (selected) {
+		// white pill
+		int w = 0;
+		TTF_SizeUTF8(font.small, item.getName().c_str(), &w, NULL);
+		w += SCALE1(OPTION_PADDING * 2);
+		GFX_blitPillDarkCPP(ASSET_BUTTON, surface, {dst.x, dst.y, w, SCALE1(BUTTON_SIZE)});
+		text_color = uintToColour(THEME_COLOR5_255);
+	}
+
+	text = TTF_RenderUTF8_Blended(font.small, item.getName().c_str(), text_color);
+	SDL_BlitSurfaceCPP(text, {}, surface, {dst.x + SCALE1(OPTION_PADDING), dst.y + SCALE1(1)});
+	SDL_FreeSurface(text);
 }
\ No newline at end of file
diff --git a/workspace/all/settings/wifimenu.hpp b/workspace/all/settings/wifimenu.hpp
index 0bb589d27..a08578639 100644
--- a/workspace/all/settings/wifimenu.hpp
+++ b/workspace/all/settings/wifimenu.hpp
@@ -5,69 +5,70 @@
 
 namespace Wifi
 {
-    class Menu : public MenuList
-    {
-        const int &globalQuit;
-        int &globalDirty;
-        // wifi on/off
-        MenuItem *toggleItem;
-        // diagnostics on/off
-        MenuItem *diagItem;
-
-        std::thread worker;
-        bool quit = false;
-        bool selectionDirty = false;
-
-    public:
-        Menu(const int &globalQuit, int &globalDirty);
-        ~Menu();
-
-        InputReactionHint handleInput(int &dirty, int &quit) override;
-
-    private:
-        std::any getWifToggleState() const;
-        void setWifiToggleState(const std::any &on);
-        void resetWifiToggleState();
-
-        std::any getWifDiagnosticsState() const;
-        void setWifiDiagnosticsState(const std::any &on);
-        void resetWifiDiagnosticsState();
-
-        void updater();
-    };
-
-    class NetworkItem : public MenuItem
-    {
-        WIFI_network net;
-        bool connected;
-
-    public:
-        NetworkItem(WIFI_network n, bool connected, MenuList *submenu);
-
-        void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item, bool selected) const override;
-    };
-
-    class ConnectKnownItem : public MenuItem
-    {
-        WIFI_network net;
-
-    public:
-        ConnectKnownItem(WIFI_network n, bool& dirty);
-    };
-
-    class ConnectNewItem : public MenuItem
-    {
-        WIFI_network net;
-
-    public:
-        ConnectNewItem(WIFI_network n, bool& dirty);
-    };
-
-    class ForgetItem : public MenuItem
-    {
-        WIFI_network net;
-
-    public:
-        ForgetItem(WIFI_network n, bool& dirty);
-    };
-}
\ No newline at end of file
+class Menu : public MenuList
+{
+	const int &globalQuit;
+	int &globalDirty;
+	// wifi on/off
+	MenuItem *toggleItem;
+	// diagnostics on/off
+	MenuItem *diagItem;
+
+	std::thread worker;
+	bool quit = false;
+	bool selectionDirty = false;
+
+  public:
+	Menu(const int &globalQuit, int &globalDirty);
+	~Menu();
+
+	InputReactionHint handleInput(int &dirty, int &quit) override;
+
+  private:
+	std::any getWifToggleState() const;
+	void setWifiToggleState(const std::any &on);
+	void resetWifiToggleState();
+
+	std::any getWifDiagnosticsState() const;
+	void setWifiDiagnosticsState(const std::any &on);
+	void resetWifiDiagnosticsState();
+
+	void updater();
+};
+
+class NetworkItem : public MenuItem
+{
+	WIFI_network net;
+	bool connected;
+
+  public:
+	NetworkItem(WIFI_network n, bool connected, MenuList *submenu);
+
+	void drawCustomItem(SDL_Surface *surface, const SDL_Rect &dst, const AbstractMenuItem &item,
+						bool selected) const override;
+};
+
+class ConnectKnownItem : public MenuItem
+{
+	WIFI_network net;
+
+  public:
+	ConnectKnownItem(WIFI_network n, bool &dirty);
+};
+
+class ConnectNewItem : public MenuItem
+{
+	WIFI_network net;
+
+  public:
+	ConnectNewItem(WIFI_network n, bool &dirty);
+};
+
+class ForgetItem : public MenuItem
+{
+	WIFI_network net;
+
+  public:
+	ForgetItem(WIFI_network n, bool &dirty);
+};
+} // namespace Wifi
\ No newline at end of file
diff --git a/workspace/all/syncsettings/syncsettings.c b/workspace/all/syncsettings/syncsettings.c
index 2bf4c5934..6a093ffe0 100644
--- a/workspace/all/syncsettings/syncsettings.c
+++ b/workspace/all/syncsettings/syncsettings.c
@@ -2,9 +2,10 @@
 #include <unistd.h>
 #include "msettings.h"
 
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 	InitSettings();
-	
+
 	sleep(1);
 	SetVolume(GetVolume());
 	SetBrightness(GetBrightness());
diff --git a/workspace/desktop/libmsettings/msettings.c b/workspace/desktop/libmsettings/msettings.c
index 32d5e340a..3c924274d 100644
--- a/workspace/desktop/libmsettings/msettings.c
+++ b/workspace/desktop/libmsettings/msettings.c
@@ -5,11 +5,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-//#include <sys/mman.h>
-//#include <sys/ioctl.h>
-//#include <errno.h>
-//#include <sys/stat.h>
-//#include <dlfcn.h>
+// #include <sys/mman.h>
+// #include <sys/ioctl.h>
+// #include <errno.h>
+// #include <sys/stat.h>
+// #include <dlfcn.h>
 #include <string.h>
 
 // Legacy MinUI settings
@@ -32,7 +32,7 @@ typedef struct SettingsV4 {
 	int speaker;
 	int mute;
 	int unused[2];
-	int jack; 
+	int jack;
 } SettingsV4;
 
 // Current NextUI settings format
@@ -45,7 +45,7 @@ typedef struct SettingsV5 {
 	int mute;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV5;
 
 
@@ -62,7 +62,7 @@ typedef struct SettingsV6 {
 	int exposure;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV6;
 
 typedef struct SettingsV7 {
@@ -82,7 +82,7 @@ typedef struct SettingsV7 {
 	int mutedexposure;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV7;
 
 typedef struct SettingsV8 {
@@ -103,7 +103,7 @@ typedef struct SettingsV8 {
 	int toggled_volume;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV8;
 
 typedef struct SettingsV9 {
@@ -134,7 +134,7 @@ typedef struct SettingsV9 {
 	int turbo_r2;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV9;
 
 // When incrementing SETTINGS_VERSION, update the Settings typedef and add
@@ -169,13 +169,14 @@ static Settings DefaultSettings = {
 	.turbo_r2 = 0,
 	.jack = 0,
 };
-static Settings* msettings;
+static Settings *msettings;
 
 static char SettingsPath[256];
 
 ///////////////////////////////////////
 
-int peekVersion(const char *filename) {
+int peekVersion(const char *filename)
+{
 	int version = 0;
 	FILE *file = fopen(filename, "r");
 	if (file) {
@@ -185,26 +186,26 @@ int peekVersion(const char *filename) {
 	return version;
 }
 
-void InitSettings(void){
+void InitSettings(void)
+{
 	// We are not really using them, but we should be able to debug them
 	sprintf(SettingsPath, "%s/msettings.bin", getenv("USERDATA_PATH"));
-	//sprintf(SettingsPath, "%s/msettings.bin", SDCARD_PATH "/.userdata");
-	msettings = (Settings*)malloc(sizeof(Settings));
-	
+	// sprintf(SettingsPath, "%s/msettings.bin", SDCARD_PATH "/.userdata");
+	msettings = (Settings *)malloc(sizeof(Settings));
+
 	int version = peekVersion(SettingsPath);
-	if(version > 0) {
+	if (version > 0) {
 		// fopen file pointer
 		int fd = open(SettingsPath, O_RDONLY);
-		if(fd) {
+		if (fd) {
 			if (version == SETTINGS_VERSION) {
 				read(fd, msettings, sizeof(Settings));
-			}
-			else {
+			} else {
 				// initialize with defaults
 				memcpy(msettings, &DefaultSettings, sizeof(Settings));
-				
+
 				// overwrite with migrated data
-				if(version==8) {
+				if (version == 8) {
 					printf("Found settings v8.\n");
 					SettingsV8 old;
 					read(fd, &old, sizeof(SettingsV8));
@@ -216,7 +217,7 @@ void InitSettings(void){
 					msettings->toggled_contrast = old.toggled_contrast;
 					msettings->toggled_exposure = old.toggled_exposure;
 					msettings->toggled_saturation = old.toggled_saturation;
-					
+
 					msettings->saturation = old.saturation;
 					msettings->contrast = old.contrast;
 					msettings->exposure = old.exposure;
@@ -228,8 +229,7 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else if(version==7) {
+				} else if (version == 7) {
 					printf("Found settings v7.\n");
 					SettingsV7 old;
 					read(fd, &old, sizeof(SettingsV7));
@@ -251,12 +251,11 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else if(version==6) {
+				} else if (version == 6) {
 					printf("Found settings v6.\n");
 					SettingsV6 old;
 					read(fd, &old, sizeof(SettingsV6));
-					
+
 					msettings->saturation = old.saturation;
 					msettings->contrast = old.contrast;
 					msettings->exposure = old.exposure;
@@ -268,8 +267,7 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else if(version==5) {
+				} else if (version == 5) {
 					printf("Found settings v5.\n");
 					SettingsV5 old;
 					read(fd, &old, sizeof(SettingsV5));
@@ -281,8 +279,7 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else if(version==4) {
+				} else if (version == 4) {
 					printf("Found settings v4.\n");
 					SettingsV4 old;
 					read(fd, &old, sizeof(SettingsV4));
@@ -295,8 +292,7 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else if(version==3) {
+				} else if (version == 3) {
 					printf("Found settings v3.\n");
 					SettingsV3 old;
 					read(fd, &old, sizeof(SettingsV3));
@@ -306,103 +302,235 @@ void InitSettings(void){
 					msettings->speaker = old.speaker;
 					msettings->mute = old.mute;
 					msettings->jack = old.jack;
-				}
-				else {
+				} else {
 					printf("Found unsupported settings version: %i.\n", version);
 				}
 			}
 
 			close(fd);
-		}
-		else {
+		} else {
 			printf("Unable to read settings, using defaults\n");
 			// load defaults
 			memcpy(msettings, &DefaultSettings, sizeof(Settings));
 		}
-	}
-	else {
+	} else {
 		printf("No settings found, using defaults\n");
 		// load defaults
 		memcpy(msettings, &DefaultSettings, sizeof(Settings));
 	}
 }
-static inline void SaveSettings(void) {
+static inline void SaveSettings(void)
+{
 	FILE *file = fopen(SettingsPath, "w");
 	if (file) {
 		fwrite(msettings, sizeof(Settings), 1, file);
 		fclose(file);
 	}
 }
-void QuitSettings(void){
+void QuitSettings(void)
+{
 	SaveSettings();
 	// dealloc settings
 	free(msettings);
 	msettings = NULL;
 }
-int InitializedSettings(void){
+int InitializedSettings(void)
+{
 	return msettings != NULL;
 }
 
 // not implemented here
 
-int GetBrightness(void) { return 0; }
-int GetColortemp(void) { return 0; }
-int GetContrast(void) { return 0; }
-int GetSaturation(void) { return 0; }
-int GetExposure(void) { return 0; }
-int GetVolume(void) { return 0; }
-
-int GetMutedBrightness(void) { return 0; }
-int GetMutedColortemp(void) { return 0; }
-int GetMutedContrast(void) { return 0; }
-int GetMutedSaturation(void) { return 0; }
-int GetMutedExposure(void) { return 0; }
-int GetMutedVolume(void) { return 0; }
-int GetMuteDisablesDpad(void) { return 0; }
-int GetMuteEmulatesJoystick(void) { return 0; }
-int GetMuteTurboA(void) { return 0; }
-int GetMuteTurboB(void) { return 0; }
-int GetMuteTurboX(void) { return 0; }
-int GetMuteTurboY(void) { return 0; }
-int GetMuteTurboL1(void) { return 0; }
-int GetMuteTurboL2(void) { return 0; }
-int GetMuteTurboR1(void) { return 0; }
-int GetMuteTurboR2(void) { return 0; }
-
-void SetMutedBrightness(int value){}
-void SetMutedColortemp(int value){}
-void SetMutedContrast(int value){}
-void SetMutedSaturation(int value){}
-void SetMutedExposure(int value){}
-void SetMutedVolume(int value){}
-void SetMuteDisablesDpad(int value) {}
-void SetMuteEmulatesJoystick(int value) {}
-void SetMuteTurboA(int value) {}
-void SetMuteTurboB(int value) {}
-void SetMuteTurboX(int value) {}
-void SetMuteTurboY(int value) {}
-void SetMuteTurboL1(int value) {}
-void SetMuteTurboL2(int value) {}
-void SetMuteTurboR1(int value) {}
-void SetMuteTurboR2(int value) {}
-
-void SetRawBrightness(int value) {}
-void SetRawVolume(int value){}
-
-void SetBrightness(int value) {}
-void SetColortemp(int value) {}
-void SetContrast(int value) {}
-void SetSaturation(int value) {}
-void SetExposure(int value) {}
-void SetVolume(int value) {}
-
-int GetJack(void) { return 0; }
-void SetJack(int value) {}
-
-int GetAudioSink(void) { return 0; }
-void SetAudioSink(int value) {}
-
-int GetHDMI(void) { return 0; }
-void SetHDMI(int value) {}
-
-int GetMute(void) { return 0; }
\ No newline at end of file
+int GetBrightness(void)
+{
+	return 0;
+}
+int GetColortemp(void)
+{
+	return 0;
+}
+int GetContrast(void)
+{
+	return 0;
+}
+int GetSaturation(void)
+{
+	return 0;
+}
+int GetExposure(void)
+{
+	return 0;
+}
+int GetVolume(void)
+{
+	return 0;
+}
+
+int GetMutedBrightness(void)
+{
+	return 0;
+}
+int GetMutedColortemp(void)
+{
+	return 0;
+}
+int GetMutedContrast(void)
+{
+	return 0;
+}
+int GetMutedSaturation(void)
+{
+	return 0;
+}
+int GetMutedExposure(void)
+{
+	return 0;
+}
+int GetMutedVolume(void)
+{
+	return 0;
+}
+int GetMuteDisablesDpad(void)
+{
+	return 0;
+}
+int GetMuteEmulatesJoystick(void)
+{
+	return 0;
+}
+int GetMuteTurboA(void)
+{
+	return 0;
+}
+int GetMuteTurboB(void)
+{
+	return 0;
+}
+int GetMuteTurboX(void)
+{
+	return 0;
+}
+int GetMuteTurboY(void)
+{
+	return 0;
+}
+int GetMuteTurboL1(void)
+{
+	return 0;
+}
+int GetMuteTurboL2(void)
+{
+	return 0;
+}
+int GetMuteTurboR1(void)
+{
+	return 0;
+}
+int GetMuteTurboR2(void)
+{
+	return 0;
+}
+
+void SetMutedBrightness(int value)
+{
+}
+void SetMutedColortemp(int value)
+{
+}
+void SetMutedContrast(int value)
+{
+}
+void SetMutedSaturation(int value)
+{
+}
+void SetMutedExposure(int value)
+{
+}
+void SetMutedVolume(int value)
+{
+}
+void SetMuteDisablesDpad(int value)
+{
+}
+void SetMuteEmulatesJoystick(int value)
+{
+}
+void SetMuteTurboA(int value)
+{
+}
+void SetMuteTurboB(int value)
+{
+}
+void SetMuteTurboX(int value)
+{
+}
+void SetMuteTurboY(int value)
+{
+}
+void SetMuteTurboL1(int value)
+{
+}
+void SetMuteTurboL2(int value)
+{
+}
+void SetMuteTurboR1(int value)
+{
+}
+void SetMuteTurboR2(int value)
+{
+}
+
+void SetRawBrightness(int value)
+{
+}
+void SetRawVolume(int value)
+{
+}
+
+void SetBrightness(int value)
+{
+}
+void SetColortemp(int value)
+{
+}
+void SetContrast(int value)
+{
+}
+void SetSaturation(int value)
+{
+}
+void SetExposure(int value)
+{
+}
+void SetVolume(int value)
+{
+}
+
+int GetJack(void)
+{
+	return 0;
+}
+void SetJack(int value)
+{
+}
+
+int GetAudioSink(void)
+{
+	return 0;
+}
+void SetAudioSink(int value)
+{
+}
+
+int GetHDMI(void)
+{
+	return 0;
+}
+void SetHDMI(int value)
+{
+}
+
+int GetMute(void)
+{
+	return 0;
+}
\ No newline at end of file
diff --git a/workspace/desktop/libmsettings/msettings.h b/workspace/desktop/libmsettings/msettings.h
index 93f05c9f7..a03275336 100644
--- a/workspace/desktop/libmsettings/msettings.h
+++ b/workspace/desktop/libmsettings/msettings.h
@@ -23,21 +23,21 @@ int GetExposure(void);
 int GetVolume(void);
 
 void SetRawBrightness(int value); // 0-255
-void SetRawVolume(int value); // 0-160
+void SetRawVolume(int value);	  // 0-160
 
 void SetBrightness(int value); // 0-10
-void SetColortemp(int value); // 0-40
-void SetContrast(int value); // -4-5
+void SetColortemp(int value);  // 0-40
+void SetContrast(int value);   // -4-5
 void SetSaturation(int value); // -5-5
-void SetExposure(int value); // -4-5
-void SetVolume(int value); // 0-20
+void SetExposure(int value);   // -4-5
+void SetVolume(int value);	   // 0-20
 
 int GetJack(void);
 void SetJack(int value); // 0-1
 
-#define AUDIO_SINK_DEFAULT 0 // use system default, usually speaker (or jack if plugged in)
+#define AUDIO_SINK_DEFAULT 0   // use system default, usually speaker (or jack if plugged in)
 #define AUDIO_SINK_BLUETOOTH 1 // software control via bluealsa, not a separate card
-#define AUDIO_SINK_USBDAC 2 // assumes being exposed as card 1 to alsa
+#define AUDIO_SINK_USBDAC 2	   // assumes being exposed as card 1 to alsa
 int GetAudioSink(void);
 void SetAudioSink(int value);
 
@@ -82,4 +82,4 @@ void SetMuteTurboL2(int);
 void SetMuteTurboR1(int);
 void SetMuteTurboR2(int);
 
-#endif  // __msettings_h__
+#endif // __msettings_h__
diff --git a/workspace/desktop/platform/platform.c b/workspace/desktop/platform/platform.c
index 196819497..b1f42d092 100644
--- a/workspace/desktop/platform/platform.c
+++ b/workspace/desktop/platform/platform.c
@@ -22,7 +22,7 @@
 
 #include <dirent.h>
 
-static int finalScaleFilter=GL_LINEAR;
+static int finalScaleFilter = GL_LINEAR;
 static int reloadShaderTextures = 1;
 
 // shader stuff
@@ -48,8 +48,8 @@ typedef struct Shader {
 	GLint OrigInputSize;
 	GLint texLocation;
 	GLint texelSizeLocation;
-	ShaderParam *pragmas;  // Dynamic array of parsed pragma parameters
-	int num_pragmas;       // Count of valid pragma parameters
+	ShaderParam *pragmas; // Dynamic array of parsed pragma parameters
+	int num_pragmas;	  // Count of valid pragma parameters
 
 } Shader;
 
@@ -57,22 +57,46 @@ GLuint g_shader_default = 0;
 GLuint g_shader_overlay = 0;
 GLuint g_noshader = 0;
 
-Shader* shaders[MAXSHADERS] = {
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
+Shader *shaders[MAXSHADERS] = {
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
 };
 
-static int nrofshaders = 0; // choose between 1 and 3 pipelines, > pipelines = more cpu usage, but more shader options and shader upscaling stuff
+static int nrofshaders = 0; // choose between 1 and 3 pipelines, > pipelines = more cpu usage, but more shader options
+							// and shader upscaling stuff
 
 ///////////////////////////////
 
 static SDL_Joystick *joystick;
-void PLAT_initInput(void) {
+void PLAT_initInput(void)
+{
 	SDL_InitSubSystem(SDL_INIT_JOYSTICK);
 	joystick = SDL_JoystickOpen(0);
 }
-void PLAT_quitInput(void) {
+void PLAT_quitInput(void)
+{
 	SDL_JoystickClose(joystick);
 	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 }
@@ -80,21 +104,21 @@ void PLAT_quitInput(void) {
 ///////////////////////////////
 
 static struct VID_Context {
-	SDL_Window* window;
-	SDL_Renderer* renderer;
-	SDL_Texture* target_layer1;
-	SDL_Texture* target_layer2;
-	SDL_Texture* stream_layer1;
-	SDL_Texture* target_layer3;
-	SDL_Texture* target_layer4;
-	SDL_Texture* target_layer5;
-	SDL_Texture* target;
-	SDL_Texture* effect;
-	SDL_Texture* overlay;
-	SDL_Surface* screen;
+	SDL_Window *window;
+	SDL_Renderer *renderer;
+	SDL_Texture *target_layer1;
+	SDL_Texture *target_layer2;
+	SDL_Texture *stream_layer1;
+	SDL_Texture *target_layer3;
+	SDL_Texture *target_layer4;
+	SDL_Texture *target_layer5;
+	SDL_Texture *target;
+	SDL_Texture *effect;
+	SDL_Texture *overlay;
+	SDL_Surface *screen;
 	SDL_GLContext gl_context;
-	
-	GFX_Renderer* blit; // yeesh
+
+	GFX_Renderer *blit; // yeesh
 	int width;
 	int height;
 	int pitch;
@@ -108,320 +132,329 @@ static int rotate = 0;
 static uint32_t SDL_transparentBlack = 0;
 #define OVERLAYS_FOLDER SDCARD_PATH "/Overlays"
 
-static char* overlay_path = NULL;
-
+static char *overlay_path = NULL;
 
 
 #define MAX_SHADERLINE_LENGTH 512
-int extractPragmaParameters(const char *shaderSource, ShaderParam *params, int maxParams) {
-    const char *pragmaPrefix = "#pragma parameter";
-    char line[MAX_SHADERLINE_LENGTH];
-    int paramCount = 0;
-
-    const char *currentPos = shaderSource;
-
-    while (*currentPos && paramCount < maxParams) {
-        int i = 0;
-
-        // Read a line
-        while (*currentPos && *currentPos != '\n' && i < MAX_SHADERLINE_LENGTH - 1) {
-            line[i++] = *currentPos++;
-        }
-        line[i] = '\0';
-        if (*currentPos == '\n') currentPos++;
-
-        // Check if it's a #pragma parameter line
-        if (strncmp(line, pragmaPrefix, strlen(pragmaPrefix)) == 0) {
-            const char *start = line + strlen(pragmaPrefix);
-            while (*start == ' ') start++;
-
-            ShaderParam *p = &params[paramCount];
-
-            // Try to parse
-            if (sscanf(start, "%127s \"%127[^\"]\" %f %f %f %f",
-                       p->name, p->label, &p->def, &p->min, &p->max, &p->step) == 6) {
-                paramCount++;
-            } else {
-                fprintf(stderr, "Failed to parse line:\n%s\n", line);
-            }
-        }
-    }
-
-    return paramCount; // number of parameters found
-}
-
-
-GLuint link_program(GLuint vertex_shader, GLuint fragment_shader, const char* cache_key) {
-    char cache_path[512];
-    snprintf(cache_path, sizeof(cache_path), "/mnt/SDCARD/.shadercache/%s.bin", cache_key);
-	
-
-    GLuint program = glCreateProgram();
-    GLint success;
-
-    // Try to load cached binary first
-    FILE *f = fopen(cache_path, "rb");
-    if (f) {
-        GLint binaryFormat;
-        fread(&binaryFormat, sizeof(GLint), 1, f);
-        fseek(f, 0, SEEK_END);
-        size_t length = ftell(f) - sizeof(GLint);
-        fseek(f, sizeof(GLint), SEEK_SET);
-        void *binary = malloc(length);
-        fread(binary, 1, length, f);
-        fclose(f);
-
-        glProgramBinary(program, binaryFormat, binary, length);
-        free(binary);
-
-        glGetProgramiv(program, GL_LINK_STATUS, &success);
-        if (success) {
-            LOG_info("Loaded shader program from cache: %s\n", cache_key);
-            return program;
-        } else {
-            LOG_info("Cache load failed, falling back to compile.\n");
-            glDeleteProgram(program);
-            program = glCreateProgram();
-        }
-    }
-
-    // Compile and link if cache failed
-    glAttachShader(program, vertex_shader);
-    glAttachShader(program, fragment_shader);
-    glProgramParameteri(program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
-    glLinkProgram(program);
-    glGetProgramiv(program, GL_LINK_STATUS, &success);
-
-    if (!success) {
-        GLint logLength;
-        glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
-        char* log = (char*)malloc(logLength);
-        glGetProgramInfoLog(program, logLength, &logLength, log);
-        printf("Program link error: %s\n", log);
-        free(log);
-        return program;
-    }
-
-    GLint binaryLength;
-    GLenum binaryFormat;
-    glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
-    void* binary = malloc(binaryLength);
-    glGetProgramBinary(program, binaryLength, NULL, &binaryFormat, binary);
-
-    mkdir("/mnt/SDCARD/.shadercache", 0755); 
-    f = fopen(cache_path, "wb");
-    if (f) {
-        fwrite(&binaryFormat, sizeof(GLenum), 1, f);
-        fwrite(binary, 1, binaryLength, f);
-        fclose(f);
-        LOG_info("Saved shader program to cache: %s\n", cache_key);
-    }
-    free(binary);
-
-    LOG_info("Program linked and cached\n");
-    return program;
-}
-
-char* load_shader_source(const char* filename) {
+int extractPragmaParameters(const char *shaderSource, ShaderParam *params, int maxParams)
+{
+	const char *pragmaPrefix = "#pragma parameter";
+	char line[MAX_SHADERLINE_LENGTH];
+	int paramCount = 0;
+
+	const char *currentPos = shaderSource;
+
+	while (*currentPos && paramCount < maxParams) {
+		int i = 0;
+
+		// Read a line
+		while (*currentPos && *currentPos != '\n' && i < MAX_SHADERLINE_LENGTH - 1) {
+			line[i++] = *currentPos++;
+		}
+		line[i] = '\0';
+		if (*currentPos == '\n')
+			currentPos++;
+
+		// Check if it's a #pragma parameter line
+		if (strncmp(line, pragmaPrefix, strlen(pragmaPrefix)) == 0) {
+			const char *start = line + strlen(pragmaPrefix);
+			while (*start == ' ')
+				start++;
+
+			ShaderParam *p = &params[paramCount];
+
+			// Try to parse
+			if (sscanf(start, "%127s \"%127[^\"]\" %f %f %f %f", p->name, p->label, &p->def, &p->min, &p->max,
+					   &p->step) == 6) {
+				paramCount++;
+			} else {
+				fprintf(stderr, "Failed to parse line:\n%s\n", line);
+			}
+		}
+	}
+
+	return paramCount; // number of parameters found
+}
+
+
+GLuint link_program(GLuint vertex_shader, GLuint fragment_shader, const char *cache_key)
+{
+	char cache_path[512];
+	snprintf(cache_path, sizeof(cache_path), "/mnt/SDCARD/.shadercache/%s.bin", cache_key);
+
+
+	GLuint program = glCreateProgram();
+	GLint success;
+
+	// Try to load cached binary first
+	FILE *f = fopen(cache_path, "rb");
+	if (f) {
+		GLint binaryFormat;
+		fread(&binaryFormat, sizeof(GLint), 1, f);
+		fseek(f, 0, SEEK_END);
+		size_t length = ftell(f) - sizeof(GLint);
+		fseek(f, sizeof(GLint), SEEK_SET);
+		void *binary = malloc(length);
+		fread(binary, 1, length, f);
+		fclose(f);
+
+		glProgramBinary(program, binaryFormat, binary, length);
+		free(binary);
+
+		glGetProgramiv(program, GL_LINK_STATUS, &success);
+		if (success) {
+			LOG_info("Loaded shader program from cache: %s\n", cache_key);
+			return program;
+		} else {
+			LOG_info("Cache load failed, falling back to compile.\n");
+			glDeleteProgram(program);
+			program = glCreateProgram();
+		}
+	}
+
+	// Compile and link if cache failed
+	glAttachShader(program, vertex_shader);
+	glAttachShader(program, fragment_shader);
+	glProgramParameteri(program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
+	glLinkProgram(program);
+	glGetProgramiv(program, GL_LINK_STATUS, &success);
+
+	if (!success) {
+		GLint logLength;
+		glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
+		char *log = (char *)malloc(logLength);
+		glGetProgramInfoLog(program, logLength, &logLength, log);
+		printf("Program link error: %s\n", log);
+		free(log);
+		return program;
+	}
+
+	GLint binaryLength;
+	GLenum binaryFormat;
+	glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
+	void *binary = malloc(binaryLength);
+	glGetProgramBinary(program, binaryLength, NULL, &binaryFormat, binary);
+
+	mkdir("/mnt/SDCARD/.shadercache", 0755);
+	f = fopen(cache_path, "wb");
+	if (f) {
+		fwrite(&binaryFormat, sizeof(GLenum), 1, f);
+		fwrite(binary, 1, binaryLength, f);
+		fclose(f);
+		LOG_info("Saved shader program to cache: %s\n", cache_key);
+	}
+	free(binary);
+
+	LOG_info("Program linked and cached\n");
+	return program;
+}
+
+char *load_shader_source(const char *filename)
+{
 	char filepath[256];
 	snprintf(filepath, sizeof(filepath), "%s", filename);
-    FILE* file = fopen(filepath, "rb");
-    if (!file) {
-        fprintf(stderr, "Failed to open shader file: %s\n", filepath);
-        return NULL;
-    }
-
-    fseek(file, 0, SEEK_END);
-    long length = ftell(file);
-    rewind(file);
-
-    char* source = (char*)malloc(length + 1);
-    if (!source) {
-        fprintf(stderr, "Memory allocation failed\n");
-        fclose(file);
-        return NULL;
-    }
-
-    fread(source, 1, length, file);
-    source[length] = '\0';
-    fclose(file);
-    return source;
-}
-
-GLuint load_shader_from_file(GLenum type, const char* filename, const char* path) {
+	FILE *file = fopen(filepath, "rb");
+	if (!file) {
+		fprintf(stderr, "Failed to open shader file: %s\n", filepath);
+		return NULL;
+	}
+
+	fseek(file, 0, SEEK_END);
+	long length = ftell(file);
+	rewind(file);
+
+	char *source = (char *)malloc(length + 1);
+	if (!source) {
+		fprintf(stderr, "Memory allocation failed\n");
+		fclose(file);
+		return NULL;
+	}
+
+	fread(source, 1, length, file);
+	source[length] = '\0';
+	fclose(file);
+	return source;
+}
+
+GLuint load_shader_from_file(GLenum type, const char *filename, const char *path)
+{
 	char filepath[256];
-	snprintf(filepath, sizeof(filepath), "%s/%s", path,filename);
-    char* source = load_shader_source(filepath);
-    if (!source) return 0;
-
-    const char* define = NULL;
-    const char* default_precision = NULL;
-    if (type == GL_VERTEX_SHADER) {
-        define = "#define VERTEX\n";
-    } else if (type == GL_FRAGMENT_SHADER) {
-        define = "#define FRAGMENT\n";
-        //default_precision =
-        //    "#ifdef GL_ES\n"
-        //    "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-        //    "precision highp float;\n"
-        //    "#else\n"
-        //    "precision mediump float;\n"
-        //    "#endif\n"
-        //    "#endif\n"
+	snprintf(filepath, sizeof(filepath), "%s/%s", path, filename);
+	char *source = load_shader_source(filepath);
+	if (!source)
+		return 0;
+
+	const char *define = NULL;
+	const char *default_precision = NULL;
+	if (type == GL_VERTEX_SHADER) {
+		define = "#define VERTEX\n";
+	} else if (type == GL_FRAGMENT_SHADER) {
+		define = "#define FRAGMENT\n";
+		// default_precision =
+		//     "#ifdef GL_ES\n"
+		//     "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
+		//     "precision highp float;\n"
+		//     "#else\n"
+		//     "precision mediump float;\n"
+		//     "#endif\n"
+		//     "#endif\n"
 		//	"#define PARAMETER_UNIFORM\n";
-    } else {
-        fprintf(stderr, "Unsupported shader type\n");
-        free(source);
-        return 0;
-    }
-
-    const char* version_start = strstr(source, "#version");
-    const char* version_end = version_start ? strchr(version_start, '\n') : NULL;
-
-    const char* replacement_version = "#version 120\n";
-    const char* fallback_version = "#version 120\n";
-
-    char* combined = NULL;
-    size_t define_len = strlen(define);
-    size_t precision_len = default_precision ? strlen(default_precision) : 0;
-    size_t source_len = strlen(source);
-    size_t combined_len = 0;
-
-    // Helper: check if the version is one of the desktop ones to upgrade
-    int should_replace = 0;
-    if (version_start && version_end) {
-        char version_str[32] = {0};
-        size_t len = version_end - version_start;
-        if (len < sizeof(version_str)) {
-            strncpy(version_str, version_start, len);
-            version_str[len] = '\0';
-
-            // Check for desktop GLSL versions that should be replaced
-            //if (
-            //    strstr(version_str, "#version 110") ||
-            //    strstr(version_str, "#version 120") ||
-            //    strstr(version_str, "#version 130") ||
-            //    strstr(version_str, "#version 140") ||
-            //    strstr(version_str, "#version 150") ||
-            //    strstr(version_str, "#version 330") ||
-            //    strstr(version_str, "#version 400") ||
-            //    strstr(version_str, "#version 410") ||
-            //    strstr(version_str, "#version 420") ||
-            //    strstr(version_str, "#version 430") ||
-            //    strstr(version_str, "#version 440") ||
-            //    strstr(version_str, "#version 450")
-            //) {
-            //    should_replace = 1;
-            //}
-        }
-    }
-
-    if (version_start && version_end && should_replace) {
-        // Replace old desktop version with replacement version
-        size_t header_len = version_end - source + 1;
-        size_t version_len = strlen(replacement_version);
-        combined_len = version_len + define_len + precision_len + (source_len - header_len) + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            return 0;
-        }
-
-        strcpy(combined, replacement_version);
-        strcat(combined, define);
-        if (default_precision) strcat(combined, default_precision);
-        strcat(combined, source + header_len);
-    } else if (version_start && version_end) {
-        // Keep existing version, insert define after it
-        size_t header_len = version_end - source + 1;
-        combined_len = header_len + define_len + precision_len + (source_len - header_len) + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            return 0;
-        }
-
-        memcpy(combined, source, header_len);
-        memcpy(combined + header_len, define, define_len);
-        if (default_precision)
-            memcpy(combined + header_len + define_len, default_precision, precision_len);
-        strcpy(combined + header_len + define_len + precision_len, source + header_len);
-    } else {
-        // No version — use fallback
-        size_t version_len = strlen(fallback_version);
-        combined_len = version_len + define_len + precision_len + source_len + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            return 0;
-        }
-
-        strcpy(combined, fallback_version);
-        strcat(combined, define);
-        if (default_precision) strcat(combined, default_precision);
-        strcat(combined, source);
-    }
-
-    GLuint shader = glCreateShader(type);
-    const char* combined_ptr = combined;
-    glShaderSource(shader, 1, &combined_ptr, NULL);
-    glCompileShader(shader);
-
-    free(source);
-    free(combined);
-
-    GLint compiled;
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-    if (!compiled) {
-        char log[512];
-        glGetShaderInfoLog(shader, sizeof(log), NULL, log);
-        fprintf(stderr, "Shader compilation failed:\n%s\n", log);
-        glDeleteShader(shader);
-        return 0;
-    }
-	else{
+	} else {
+		fprintf(stderr, "Unsupported shader type\n");
+		free(source);
+		return 0;
+	}
+
+	const char *version_start = strstr(source, "#version");
+	const char *version_end = version_start ? strchr(version_start, '\n') : NULL;
+
+	const char *replacement_version = "#version 120\n";
+	const char *fallback_version = "#version 120\n";
+
+	char *combined = NULL;
+	size_t define_len = strlen(define);
+	size_t precision_len = default_precision ? strlen(default_precision) : 0;
+	size_t source_len = strlen(source);
+	size_t combined_len = 0;
+
+	// Helper: check if the version is one of the desktop ones to upgrade
+	int should_replace = 0;
+	if (version_start && version_end) {
+		char version_str[32] = {0};
+		size_t len = version_end - version_start;
+		if (len < sizeof(version_str)) {
+			strncpy(version_str, version_start, len);
+			version_str[len] = '\0';
+
+			// Check for desktop GLSL versions that should be replaced
+			// if (
+			//    strstr(version_str, "#version 110") ||
+			//    strstr(version_str, "#version 120") ||
+			//    strstr(version_str, "#version 130") ||
+			//    strstr(version_str, "#version 140") ||
+			//    strstr(version_str, "#version 150") ||
+			//    strstr(version_str, "#version 330") ||
+			//    strstr(version_str, "#version 400") ||
+			//    strstr(version_str, "#version 410") ||
+			//    strstr(version_str, "#version 420") ||
+			//    strstr(version_str, "#version 430") ||
+			//    strstr(version_str, "#version 440") ||
+			//    strstr(version_str, "#version 450")
+			//) {
+			//    should_replace = 1;
+			//}
+		}
+	}
+
+	if (version_start && version_end && should_replace) {
+		// Replace old desktop version with replacement version
+		size_t header_len = version_end - source + 1;
+		size_t version_len = strlen(replacement_version);
+		combined_len = version_len + define_len + precision_len + (source_len - header_len) + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			return 0;
+		}
+
+		strcpy(combined, replacement_version);
+		strcat(combined, define);
+		if (default_precision)
+			strcat(combined, default_precision);
+		strcat(combined, source + header_len);
+	} else if (version_start && version_end) {
+		// Keep existing version, insert define after it
+		size_t header_len = version_end - source + 1;
+		combined_len = header_len + define_len + precision_len + (source_len - header_len) + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			return 0;
+		}
+
+		memcpy(combined, source, header_len);
+		memcpy(combined + header_len, define, define_len);
+		if (default_precision)
+			memcpy(combined + header_len + define_len, default_precision, precision_len);
+		strcpy(combined + header_len + define_len + precision_len, source + header_len);
+	} else {
+		// No version — use fallback
+		size_t version_len = strlen(fallback_version);
+		combined_len = version_len + define_len + precision_len + source_len + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			return 0;
+		}
+
+		strcpy(combined, fallback_version);
+		strcat(combined, define);
+		if (default_precision)
+			strcat(combined, default_precision);
+		strcat(combined, source);
+	}
+
+	GLuint shader = glCreateShader(type);
+	const char *combined_ptr = combined;
+	glShaderSource(shader, 1, &combined_ptr, NULL);
+	glCompileShader(shader);
+
+	free(source);
+	free(combined);
+
+	GLint compiled;
+	glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+	if (!compiled) {
+		char log[512];
+		glGetShaderInfoLog(shader, sizeof(log), NULL, log);
+		fprintf(stderr, "Shader compilation failed:\n%s\n", log);
+		glDeleteShader(shader);
+		return 0;
+	} else {
 		fprintf(stdout, "Shader compilation successful\n");
 	}
 
-    return shader;
+	return shader;
 }
 
-void PLAT_initShaders() {
+void PLAT_initShaders()
+{
 	SDL_GL_MakeCurrent(vid.window, vid.gl_context);
 	glViewport(0, 0, device_width, device_height);
-	
+
 	GLuint vertex;
 	GLuint fragment;
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "default.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "default.glsl",SYSSHADERS_FOLDER);
-	g_shader_default = link_program(vertex, fragment,"defaultv2.glsl");
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "default.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "default.glsl", SYSSHADERS_FOLDER);
+	g_shader_default = link_program(vertex, fragment, "defaultv2.glsl");
+
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "overlay.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "overlay.glsl", SYSSHADERS_FOLDER);
+	g_shader_overlay = link_program(vertex, fragment, "overlay.glsl");
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "overlay.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "overlay.glsl",SYSSHADERS_FOLDER);
-	g_shader_overlay = link_program(vertex, fragment,"overlay.glsl");
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "noshader.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "noshader.glsl", SYSSHADERS_FOLDER);
+	g_noshader = link_program(vertex, fragment, "noshader.glsl");
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "noshader.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "noshader.glsl",SYSSHADERS_FOLDER);
-	g_noshader = link_program(vertex, fragment,"noshader.glsl");
-	
-	LOG_info("default shaders loaded, %i\n\n",g_shader_default);
+	LOG_info("default shaders loaded, %i\n\n", g_shader_default);
 }
 
-SDL_Surface* PLAT_initVideo(void) {
+SDL_Surface *PLAT_initVideo(void)
+{
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
 
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
-	//SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
+	// SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
 
-	if(SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
+	if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
 		LOG_info("Error intializing SDL: %s\n", SDL_GetError());
 	SDL_ShowCursor(0);
-	
+
 	// SDL_version compiled;
 	// SDL_version linked;
 	// SDL_VERSION(&compiled);
@@ -450,22 +483,23 @@ SDL_Surface* PLAT_initVideo(void) {
 	// }
 	// SDL_GetCurrentDisplayMode(0, &mode);
 	// LOG_info("Current display mode: %ix%i (%s)\n", mode.w,mode.h, SDL_GetPixelFormatName(mode.format));
-	
+
 	int w = FIXED_WIDTH;
 	int h = FIXED_HEIGHT;
 	int p = FIXED_PITCH;
 
-	vid.window   = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w,h, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN);
-	if(!vid.window)
+	vid.window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h,
+								  SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
+	if (!vid.window)
 		LOG_info("Error creating SDL window: %s\n", SDL_GetError());
-	
-	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY,"0");
-	SDL_SetHint(SDL_HINT_RENDER_DRIVER,"opengl");
-	SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION,"1");
 
-	vid.renderer = SDL_CreateRenderer(vid.window,-1,SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC);
+	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "0");
+	SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
+	SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "1");
+
+	vid.renderer = SDL_CreateRenderer(vid.window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 	SDL_SetRenderDrawBlendMode(vid.renderer, SDL_BLENDMODE_BLEND);
-	
+
 	SDL_RendererInfo info;
 	SDL_GetRendererInfo(vid.renderer, &info);
 	LOG_info("Current render driver: %s\n", info.name);
@@ -476,15 +510,15 @@ SDL_Surface* PLAT_initVideo(void) {
 
 	LOG_info("OpenGL version: %s\n", (char *)glGetString(GL_VERSION));
 
-	vid.stream_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w,h);
-	vid.target_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer2 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer3 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer4 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer5 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	
-	vid.target	= NULL; // only needed for non-native sizes
-	
+	vid.stream_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w, h);
+	vid.target_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer2 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer3 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer4 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer5 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+
+	vid.target = NULL; // only needed for non-native sizes
+
 	vid.screen = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_RGBA8888);
 
 	SDL_SetSurfaceBlendMode(vid.screen, SDL_BLENDMODE_BLEND);
@@ -493,75 +527,77 @@ SDL_Surface* PLAT_initVideo(void) {
 	SDL_SetTextureBlendMode(vid.target_layer3, SDL_BLENDMODE_BLEND);
 	SDL_SetTextureBlendMode(vid.target_layer4, SDL_BLENDMODE_BLEND);
 	SDL_SetTextureBlendMode(vid.target_layer5, SDL_BLENDMODE_BLEND);
-	
-	
-	vid.width	= w;
-	vid.height	= h;
-	vid.pitch	= p;
+
+
+	vid.width = w;
+	vid.height = h;
+	vid.pitch = p;
 
 	SDL_transparentBlack = SDL_MapRGBA(vid.screen->format, 0, 0, 0, 0);
-	
-	device_width	= w;
-	device_height	= h;
-	device_pitch	= p;
-	
+
+	device_width = w;
+	device_height = h;
+	device_pitch = p;
+
 	vid.sharpness = SHARPNESS_SOFT;
-	
+
 	return vid.screen;
 }
 
-void PLAT_resetShaders() {
-
+void PLAT_resetShaders()
+{
 }
 
-char* PLAT_findFileInDir(const char *directory, const char *filename) {
-    char *filename_copy = strdup(filename);
-    if (!filename_copy) {
-        perror("strdup");
-        return NULL;
-    }
-
-    // Strip extension from filename
-    char *dot_pos = strrchr(filename_copy, '.');
-    if (dot_pos) {
-        *dot_pos = '\0';
-    }
+char *PLAT_findFileInDir(const char *directory, const char *filename)
+{
+	char *filename_copy = strdup(filename);
+	if (!filename_copy) {
+		perror("strdup");
+		return NULL;
+	}
 
-    DIR *dir = opendir(directory);
-    if (!dir) {
-        perror("opendir");
-        free(filename_copy);
-        return NULL;
-    }
+	// Strip extension from filename
+	char *dot_pos = strrchr(filename_copy, '.');
+	if (dot_pos) {
+		*dot_pos = '\0';
+	}
 
-    struct dirent *entry;
-    char *full_path = NULL;
+	DIR *dir = opendir(directory);
+	if (!dir) {
+		perror("opendir");
+		free(filename_copy);
+		return NULL;
+	}
 
-    while ((entry = readdir(dir)) != NULL) {
-        if (strstr(entry->d_name, filename_copy) == entry->d_name) {
-            full_path = (char *)malloc(strlen(directory) + strlen(entry->d_name) + 2); // +1 for slash, +1 for '\0'
-            if (!full_path) {
-                perror("malloc");
-                closedir(dir);
-                free(filename_copy);
-                return NULL;
-            }
+	struct dirent *entry;
+	char *full_path = NULL;
+
+	while ((entry = readdir(dir)) != NULL) {
+		if (strstr(entry->d_name, filename_copy) == entry->d_name) {
+			full_path = (char *)malloc(strlen(directory) + strlen(entry->d_name) + 2); // +1 for slash, +1 for '\0'
+			if (!full_path) {
+				perror("malloc");
+				closedir(dir);
+				free(filename_copy);
+				return NULL;
+			}
 
-            snprintf(full_path, strlen(directory) + strlen(entry->d_name) + 2, "%s/%s", directory, entry->d_name);
-            closedir(dir);
-            free(filename_copy);
-            return full_path;
-        }
-    }
+			snprintf(full_path, strlen(directory) + strlen(entry->d_name) + 2, "%s/%s", directory, entry->d_name);
+			closedir(dir);
+			free(filename_copy);
+			return full_path;
+		}
+	}
 
-    closedir(dir);
-    free(filename_copy);
-    return NULL;
+	closedir(dir);
+	free(filename_copy);
+	return NULL;
 }
 
 
 #define MAX_SHADER_PRAGMAS 32
-void loadShaderPragmas(Shader *shader, const char *shaderSource) {
+void loadShaderPragmas(Shader *shader, const char *shaderSource)
+{
 	shader->pragmas = calloc(MAX_SHADER_PRAGMAS, sizeof(ShaderParam));
 	if (!shader->pragmas) {
 		fprintf(stderr, "Out of memory allocating pragmas for %s\n", shader->filename);
@@ -570,97 +606,95 @@ void loadShaderPragmas(Shader *shader, const char *shaderSource) {
 	shader->num_pragmas = extractPragmaParameters(shaderSource, shader->pragmas, MAX_SHADER_PRAGMAS);
 }
 
-ShaderParam* PLAT_getShaderPragmas(int i) {
-    return shaders[i]->pragmas;
+ShaderParam *PLAT_getShaderPragmas(int i)
+{
+	return shaders[i]->pragmas;
 }
 
-void PLAT_updateShader(int i, const char *filename, int *scale, int *filter, int *scaletype, int *srctype) {
+void PLAT_updateShader(int i, const char *filename, int *scale, int *filter, int *scaletype, int *srctype)
+{
+	if (i < 0 || i >= nrofshaders) {
+		return;
+	}
+	Shader *shader = shaders[i];
+
+	if (filename != NULL) {
+		SDL_GL_MakeCurrent(vid.window, vid.gl_context);
+		LOG_info("loading shader \n");
 
-    if (i < 0 || i >= nrofshaders) {
-        return;
-    }
-    Shader* shader = shaders[i];
+		char filepath[512];
+		snprintf(filepath, sizeof(filepath), SHADERS_FOLDER "/glsl/%s", filename);
+		const char *shaderSource = load_shader_source(filepath);
+		loadShaderPragmas(shader, shaderSource);
+		GLuint vertex_shader1 = load_shader_from_file(GL_VERTEX_SHADER, filename, SHADERS_FOLDER "/glsl");
+		GLuint fragment_shader1 = load_shader_from_file(GL_FRAGMENT_SHADER, filename, SHADERS_FOLDER "/glsl");
 
-    if (filename != NULL) {
-        SDL_GL_MakeCurrent(vid.window, vid.gl_context);
-        LOG_info("loading shader \n");
 
-        char filepath[512];
-        snprintf(filepath, sizeof(filepath), SHADERS_FOLDER "/glsl/%s",filename);
-        const char *shaderSource  = load_shader_source(filepath);
-        loadShaderPragmas(shader,shaderSource);
-         GLuint vertex_shader1 = load_shader_from_file(GL_VERTEX_SHADER, filename,SHADERS_FOLDER "/glsl");
-    GLuint fragment_shader1 = load_shader_from_file(GL_FRAGMENT_SHADER, filename,SHADERS_FOLDER "/glsl");
-        
-        
-        // Link the shader program
+		// Link the shader program
 		if (shader->shader_p != 0) {
-			LOG_info("Deleting previous shader %i\n",shader->shader_p);
+			LOG_info("Deleting previous shader %i\n", shader->shader_p);
 			glDeleteProgram(shader->shader_p);
 		}
-        shader->shader_p = link_program(vertex_shader1, fragment_shader1,filename);
-        
-		shader->u_FrameDirection = glGetUniformLocation( shader->shader_p, "FrameDirection");
-		shader->u_FrameCount = glGetUniformLocation( shader->shader_p, "FrameCount");
-		shader->u_OutputSize = glGetUniformLocation( shader->shader_p, "OutputSize");
-		shader->u_TextureSize = glGetUniformLocation( shader->shader_p, "TextureSize");
-		shader->u_InputSize = glGetUniformLocation( shader->shader_p, "InputSize");
-		shader->OrigInputSize = glGetUniformLocation( shader->shader_p, "OrigInputSize");
+		shader->shader_p = link_program(vertex_shader1, fragment_shader1, filename);
+
+		shader->u_FrameDirection = glGetUniformLocation(shader->shader_p, "FrameDirection");
+		shader->u_FrameCount = glGetUniformLocation(shader->shader_p, "FrameCount");
+		shader->u_OutputSize = glGetUniformLocation(shader->shader_p, "OutputSize");
+		shader->u_TextureSize = glGetUniformLocation(shader->shader_p, "TextureSize");
+		shader->u_InputSize = glGetUniformLocation(shader->shader_p, "InputSize");
+		shader->OrigInputSize = glGetUniformLocation(shader->shader_p, "OrigInputSize");
 		shader->texLocation = glGetUniformLocation(shader->shader_p, "Texture");
 		shader->texelSizeLocation = glGetUniformLocation(shader->shader_p, "texelSize");
 		for (int i = 0; i < shader->num_pragmas; ++i) {
 			shader->pragmas[i].uniformLocation = glGetUniformLocation(shader->shader_p, shader->pragmas[i].name);
 			shader->pragmas[i].value = shader->pragmas[i].def;
-			printf("Param: %s = %f (min: %f, max: %f, step: %f)\n",
-				shader->pragmas[i].name,
-				shader->pragmas[i].def,
-				shader->pragmas[i].min,
-				shader->pragmas[i].max,
-				shader->pragmas[i].step);
+			printf("Param: %s = %f (min: %f, max: %f, step: %f)\n", shader->pragmas[i].name, shader->pragmas[i].def,
+				   shader->pragmas[i].min, shader->pragmas[i].max, shader->pragmas[i].step);
+		}
+
+		if (shader->shader_p == 0) {
+			LOG_info("Shader linking failed for %s\n", filename);
 		}
 
-        if (shader->shader_p == 0) {
-            LOG_info("Shader linking failed for %s\n", filename);
-        }
-
-        GLint success = 0;
-        glGetProgramiv(shader->shader_p, GL_LINK_STATUS, &success);
-        if (!success) {
-            char infoLog[512];
-            glGetProgramInfoLog(shader->shader_p, 512, NULL, infoLog);
-            LOG_info("Shader Program Linking Failed: %s\n", infoLog);
-        } else {
-			LOG_info("Shader Program Linking Success %s shader ID is %i\n", filename,shader->shader_p);
+		GLint success = 0;
+		glGetProgramiv(shader->shader_p, GL_LINK_STATUS, &success);
+		if (!success) {
+			char infoLog[512];
+			glGetProgramInfoLog(shader->shader_p, 512, NULL, infoLog);
+			LOG_info("Shader Program Linking Failed: %s\n", infoLog);
+		} else {
+			LOG_info("Shader Program Linking Success %s shader ID is %i\n", filename, shader->shader_p);
 		}
 		shader->filename = strdup(filename);
-    }
-    if (scale != NULL) {
-        shader->scale = *scale +1;
+	}
+	if (scale != NULL) {
+		shader->scale = *scale + 1;
 		reloadShaderTextures = 1;
-    }
-    if (scaletype != NULL) {
-        shader->scaletype = *scaletype;
-    }
-    if (srctype != NULL) {
-        shader->srctype = *srctype;
-    }
-    if (filter != NULL) {
-        shader->filter = (*filter == 1) ? GL_LINEAR : GL_NEAREST;
+	}
+	if (scaletype != NULL) {
+		shader->scaletype = *scaletype;
+	}
+	if (srctype != NULL) {
+		shader->srctype = *srctype;
+	}
+	if (filter != NULL) {
+		shader->filter = (*filter == 1) ? GL_LINEAR : GL_NEAREST;
 		reloadShaderTextures = 1;
-    }
+	}
 	shader->updated = 1;
-
 }
 
-void PLAT_setShaders(int nr) {
-	LOG_info("set nr of shaders to %i\n",nr);
+void PLAT_setShaders(int nr)
+{
+	LOG_info("set nr of shaders to %i\n", nr);
 	nrofshaders = nr;
 	reloadShaderTextures = 1;
 }
 
 
-static void clearVideo(void) {
-	for (int i=0; i<3; i++) {
+static void clearVideo(void)
+{
+	for (int i = 0; i < 3; i++) {
 		SDL_RenderClear(vid.renderer);
 		SDL_FillRect(vid.screen, NULL, SDL_transparentBlack);
 		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
@@ -668,22 +702,32 @@ static void clearVideo(void) {
 	}
 }
 
-void PLAT_quitVideo(void) {
+void PLAT_quitVideo(void)
+{
 	clearVideo();
 
 	glFinish();
 	SDL_GL_DeleteContext(vid.gl_context);
 	SDL_FreeSurface(vid.screen);
 
-	if (vid.target) SDL_DestroyTexture(vid.target);
-	if (vid.effect) SDL_DestroyTexture(vid.effect);
-	if (vid.overlay) SDL_DestroyTexture(vid.overlay);
-	if (vid.target_layer3) SDL_DestroyTexture(vid.target_layer3);
-	if (vid.target_layer1) SDL_DestroyTexture(vid.target_layer1);
-	if (vid.target_layer2) SDL_DestroyTexture(vid.target_layer2);
-	if (vid.target_layer4) SDL_DestroyTexture(vid.target_layer4);
-	if (vid.target_layer5) SDL_DestroyTexture(vid.target_layer5);
-	if (overlay_path) free(overlay_path);
+	if (vid.target)
+		SDL_DestroyTexture(vid.target);
+	if (vid.effect)
+		SDL_DestroyTexture(vid.effect);
+	if (vid.overlay)
+		SDL_DestroyTexture(vid.overlay);
+	if (vid.target_layer3)
+		SDL_DestroyTexture(vid.target_layer3);
+	if (vid.target_layer1)
+		SDL_DestroyTexture(vid.target_layer1);
+	if (vid.target_layer2)
+		SDL_DestroyTexture(vid.target_layer2);
+	if (vid.target_layer4)
+		SDL_DestroyTexture(vid.target_layer4);
+	if (vid.target_layer5)
+		SDL_DestroyTexture(vid.target_layer5);
+	if (overlay_path)
+		free(overlay_path);
 	SDL_DestroyTexture(vid.stream_layer1);
 	SDL_DestroyRenderer(vid.renderer);
 	SDL_DestroyWindow(vid.window);
@@ -692,73 +736,80 @@ void PLAT_quitVideo(void) {
 	system("cat /dev/zero > /dev/fb0 2>/dev/null");
 }
 
-void PLAT_clearVideo(SDL_Surface* screen) {
+void PLAT_clearVideo(SDL_Surface *screen)
+{
 	// SDL_FillRect(screen, NULL, 0); // TODO: revisit
 	SDL_FillRect(screen, NULL, SDL_transparentBlack);
 }
-void PLAT_clearAll(void) {
-	// ok honestely mixing SDL and OpenGL is really bad, but hey it works just got to sometimes clear gpu stuff and pull context back to SDL 
-	// so yeah clear all layers and pull a flip() to make it switch back to SDL before clearing
+void PLAT_clearAll(void)
+{
+	// ok honestely mixing SDL and OpenGL is really bad, but hey it works just got to sometimes clear gpu stuff and pull
+	// context back to SDL so yeah clear all layers and pull a flip() to make it switch back to SDL before clearing
 	PLAT_clearLayers(0);
-	PLAT_flip(vid.screen,0);
+	PLAT_flip(vid.screen, 0);
 
 	// then do normal SDL clearing stuff
-	PLAT_clearVideo(vid.screen); 
+	PLAT_clearVideo(vid.screen);
 	SDL_RenderClear(vid.renderer);
-
 }
 
-void PLAT_setVsync(int vsync) {
-	
+void PLAT_setVsync(int vsync)
+{
 }
 
 static int hard_scale = 4; // TODO: base src size, eg. 160x144 can be 4
 
-static void resizeVideo(int w, int h, int p) {
-	if (w==vid.width && h==vid.height && p==vid.pitch) return;
-	
+static void resizeVideo(int w, int h, int p)
+{
+	if (w == vid.width && h == vid.height && p == vid.pitch)
+		return;
+
 	// TODO: minarch disables crisp (and nn upscale before linear downscale) when native, is this true?
-	
-	if (w>=device_width && h>=device_height) hard_scale = 1;
+
+	if (w >= device_width && h >= device_height)
+		hard_scale = 1;
 	// else if (h>=160) hard_scale = 2; // limits gba and up to 2x (seems sufficient for 640x480)
-	else hard_scale = 4;
+	else
+		hard_scale = 4;
 
 	// LOG_info("resizeVideo(%i,%i,%i) hard_scale: %i crisp: %i\n",w,h,p, hard_scale,vid.sharpness==SHARPNESS_CRISP);
 
 	SDL_DestroyTexture(vid.stream_layer1);
-	if (vid.target) SDL_DestroyTexture(vid.target);
-	
+	if (vid.target)
+		SDL_DestroyTexture(vid.target);
+
 	// SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, vid.sharpness==SHARPNESS_SOFT?"1":"0", SDL_HINT_OVERRIDE);
-	vid.stream_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w,h);
+	vid.stream_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w, h);
 	SDL_SetTextureBlendMode(vid.stream_layer1, SDL_BLENDMODE_BLEND);
-	
-	if (vid.sharpness==SHARPNESS_CRISP) {
+
+	if (vid.sharpness == SHARPNESS_CRISP) {
 		// SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, "1", SDL_HINT_OVERRIDE);
-		vid.target = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w * hard_scale,h * hard_scale);
-	}
-	else {
+		vid.target = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w * hard_scale,
+									   h * hard_scale);
+	} else {
 		vid.target = NULL;
 	}
-	
 
-	vid.width	= w;
-	vid.height	= h;
-	vid.pitch	= p;
+
+	vid.width = w;
+	vid.height = h;
+	vid.pitch = p;
 
 	reloadShaderTextures = 1;
 }
 
-SDL_Surface* PLAT_resizeVideo(int w, int h, int p) {
-	resizeVideo(w,h,p);
+SDL_Surface *PLAT_resizeVideo(int w, int h, int p)
+{
+	resizeVideo(w, h, p);
 	return vid.screen;
 }
 
-void PLAT_setSharpness(int sharpness) {
-	if(sharpness==1) {
+void PLAT_setSharpness(int sharpness)
+{
+	if (sharpness == 1) {
 		LOG_info("finalScaleFilter set to GL_LINEAR\n");
-		finalScaleFilter=GL_LINEAR;
-	}
-	else {
+		finalScaleFilter = GL_LINEAR;
+	} else {
 		LOG_info("finalScaleFilter set to GL_NEAREST\n");
 		finalScaleFilter = GL_NEAREST;
 	}
@@ -782,197 +833,195 @@ static struct FX_Context {
 	.color = 0,
 	.next_color = 0,
 };
-static void rgb565_to_rgb888(uint32_t rgb565, uint8_t *r, uint8_t *g, uint8_t *b) {
-    // Extract the red component (5 bits)
-    uint8_t red = (rgb565 >> 11) & 0x1F;
-    // Extract the green component (6 bits)
-    uint8_t green = (rgb565 >> 5) & 0x3F;
-    // Extract the blue component (5 bits)
-    uint8_t blue = rgb565 & 0x1F;
-
-    // Scale the values to 8-bit range
-    *r = (red << 3) | (red >> 2);
-    *g = (green << 2) | (green >> 4);
-    *b = (blue << 3) | (blue >> 2);
-}
-static char* effect_path;
+static void rgb565_to_rgb888(uint32_t rgb565, uint8_t *r, uint8_t *g, uint8_t *b)
+{
+	// Extract the red component (5 bits)
+	uint8_t red = (rgb565 >> 11) & 0x1F;
+	// Extract the green component (6 bits)
+	uint8_t green = (rgb565 >> 5) & 0x3F;
+	// Extract the blue component (5 bits)
+	uint8_t blue = rgb565 & 0x1F;
+
+	// Scale the values to 8-bit range
+	*r = (red << 3) | (red >> 2);
+	*g = (green << 2) | (green >> 4);
+	*b = (blue << 3) | (blue >> 2);
+}
+static char *effect_path;
 static int effectUpdated = 0;
-static void updateEffect(void) {
-	if (effect.next_scale==effect.scale && effect.next_type==effect.type && effect.next_color==effect.color) return; // unchanged
-	
+static void updateEffect(void)
+{
+	if (effect.next_scale == effect.scale && effect.next_type == effect.type && effect.next_color == effect.color)
+		return; // unchanged
+
 	int live_scale = effect.scale;
 	int live_color = effect.color;
 	effect.scale = effect.next_scale;
 	effect.type = effect.next_type;
 	effect.color = effect.next_color;
-	
-	if (effect.type==EFFECT_NONE) return; // disabled
-	if (effect.type==effect.live_type && effect.scale==live_scale && effect.color==live_color) return; // already loaded
-	
+
+	if (effect.type == EFFECT_NONE)
+		return; // disabled
+	if (effect.type == effect.live_type && effect.scale == live_scale && effect.color == live_color)
+		return; // already loaded
+
 	int opacity = 128; // 1 - 1/2 = 50%
-	if (effect.type==EFFECT_LINE) {
-		if (effect.scale<3) {
+	if (effect.type == EFFECT_LINE) {
+		if (effect.scale < 3) {
 			effect_path = RES_PATH "/line-2.png";
-		}
-		else if (effect.scale<4) {
+		} else if (effect.scale < 4) {
 			effect_path = RES_PATH "/line-3.png";
-		}
-		else if (effect.scale<5) {
+		} else if (effect.scale < 5) {
 			effect_path = RES_PATH "/line-4.png";
-		}
-		else if (effect.scale<6) {
+		} else if (effect.scale < 6) {
 			effect_path = RES_PATH "/line-5.png";
-		}
-		else if (effect.scale<8) {
+		} else if (effect.scale < 8) {
 			effect_path = RES_PATH "/line-6.png";
-		}
-		else {
+		} else {
 			effect_path = RES_PATH "/line-8.png";
 		}
-	}
-	else if (effect.type==EFFECT_GRID) {
-		if (effect.scale<3) {
+	} else if (effect.type == EFFECT_GRID) {
+		if (effect.scale < 3) {
 			effect_path = RES_PATH "/grid-2.png";
 			opacity = 64; // 1 - 3/4 = 25%
-		}
-		else if (effect.scale<4) {
+		} else if (effect.scale < 4) {
 			effect_path = RES_PATH "/grid-3.png";
 			opacity = 112; // 1 - 5/9 = ~44%
-		}
-		else if (effect.scale<5) {
+		} else if (effect.scale < 5) {
 			effect_path = RES_PATH "/grid-4.png";
 			opacity = 144; // 1 - 7/16 = ~56%
-		}
-		else if (effect.scale<6) {
+		} else if (effect.scale < 6) {
 			effect_path = RES_PATH "/grid-5.png";
 			opacity = 160; // 1 - 9/25 = ~64%
-			// opacity = 96; // TODO: tmp, for white grid
-		}
-		else if (effect.scale<8) {
+						   // opacity = 96; // TODO: tmp, for white grid
+		} else if (effect.scale < 8) {
 			effect_path = RES_PATH "/grid-6.png";
 			opacity = 112; // 1 - 5/9 = ~44%
-		}
-		else if (effect.scale<11) {
+		} else if (effect.scale < 11) {
 			effect_path = RES_PATH "/grid-8.png";
 			opacity = 144; // 1 - 7/16 = ~56%
-		}
-		else {
+		} else {
 			effect_path = RES_PATH "/grid-11.png";
 			opacity = 136; // 1 - 57/121 = ~52%
 		}
 	}
 	effectUpdated = 1;
-	
 }
 int screenx = 0;
 int screeny = 0;
-void PLAT_setOffsetX(int x) {
-    if (x < 0 || x > 128) return;
-    screenx = x - 64;
-	LOG_info("screenx: %i %i\n",screenx,x);
-}
-void PLAT_setOffsetY(int y) {
-    if (y < 0 || y > 128) return;
-    screeny = y - 64; 
-	LOG_info("screeny: %i %i\n",screeny,y);
-}
-static int overlayUpdated=0;
-void PLAT_setOverlay(const char* filename, const char* tag) {
-    if (vid.overlay) {
-        SDL_DestroyTexture(vid.overlay);
-        vid.overlay = NULL;
-    }
+void PLAT_setOffsetX(int x)
+{
+	if (x < 0 || x > 128)
+		return;
+	screenx = x - 64;
+	LOG_info("screenx: %i %i\n", screenx, x);
+}
+void PLAT_setOffsetY(int y)
+{
+	if (y < 0 || y > 128)
+		return;
+	screeny = y - 64;
+	LOG_info("screeny: %i %i\n", screeny, y);
+}
+static int overlayUpdated = 0;
+void PLAT_setOverlay(const char *filename, const char *tag)
+{
+	if (vid.overlay) {
+		SDL_DestroyTexture(vid.overlay);
+		vid.overlay = NULL;
+	}
 	overlay_path = NULL;
-	overlayUpdated=1;
+	overlayUpdated = 1;
 
-    if (!filename || strcmp(filename, "") == 0) {
+	if (!filename || strcmp(filename, "") == 0) {
 		overlay_path = strdup("");
-        printf("Skipping overlay update.\n");
-        return;
-    }
-
-
+		printf("Skipping overlay update.\n");
+		return;
+	}
 
-    size_t path_len = strlen(OVERLAYS_FOLDER) + strlen(tag) + strlen(filename) + 4; // +3 for slashes and null-terminator
-    overlay_path = malloc(path_len);
 
-    if (!overlay_path) {
-        perror("malloc failed");
-        return;
-    }
+	size_t path_len =
+		strlen(OVERLAYS_FOLDER) + strlen(tag) + strlen(filename) + 4; // +3 for slashes and null-terminator
+	overlay_path = malloc(path_len);
 
-    snprintf(overlay_path, path_len, "%s/%s/%s", OVERLAYS_FOLDER, tag, filename);
-    printf("Overlay path set to: %s\n", overlay_path);
+	if (!overlay_path) {
+		perror("malloc failed");
+		return;
+	}
 
+	snprintf(overlay_path, path_len, "%s/%s/%s", OVERLAYS_FOLDER, tag, filename);
+	printf("Overlay path set to: %s\n", overlay_path);
 }
 
-void applyRoundedCorners(SDL_Surface* surface, SDL_Rect* rect, int radius) {
-	if (!surface) return;
+void applyRoundedCorners(SDL_Surface *surface, SDL_Rect *rect, int radius)
+{
+	if (!surface)
+		return;
 
-    Uint32* pixels = (Uint32*)surface->pixels;
-    SDL_PixelFormat* fmt = surface->format;
+	Uint32 *pixels = (Uint32 *)surface->pixels;
+	SDL_PixelFormat *fmt = surface->format;
 	SDL_Rect target = {0, 0, surface->w, surface->h};
 	if (rect)
 		target = *rect;
-    
-    Uint32 transparent_black = SDL_MapRGBA(fmt, 0, 0, 0, 0);  // Fully transparent black
+
+	Uint32 transparent_black = SDL_MapRGBA(fmt, 0, 0, 0, 0); // Fully transparent black
 
 	const int xBeg = target.x;
 	const int xEnd = target.x + target.w;
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
-	for (int y = yBeg; y < yEnd; ++y)
-	{
+	for (int y = yBeg; y < yEnd; ++y) {
 		for (int x = xBeg; x < xEnd; ++x) {
-            int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
-            int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
-            if (dx * dx + dy * dy > radius * radius) {
-                pixels[y * target.w + x] = transparent_black;  // Set to fully transparent black
-            }
-        }
-    }
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
+			if (dx * dx + dy * dy > radius * radius) {
+				pixels[y * target.w + x] = transparent_black; // Set to fully transparent black
+			}
+		}
+	}
 }
 
-void PLAT_clearLayers(int layer) {
-	if(layer==0 || layer==1) {
+void PLAT_clearLayers(int layer)
+{
+	if (layer == 0 || layer == 1) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==2) {
+	if (layer == 0 || layer == 2) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer2);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==3) {
+	if (layer == 0 || layer == 3) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer3);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==4) {
+	if (layer == 0 || layer == 4) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==5) {
+	if (layer == 0 || layer == 5) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer5);
 		SDL_RenderClear(vid.renderer);
 	}
 
 	SDL_SetRenderTarget(vid.renderer, NULL);
 }
-void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,int layer) {
-    if (!inputSurface || !vid.target_layer1 || !vid.renderer) return; 
+void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,
+					  int layer)
+{
+	if (!inputSurface || !vid.target_layer1 || !vid.renderer)
+		return;
 
-    SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-                                                 SDL_PIXELFORMAT_RGBA8888, 
-                                                 SDL_TEXTUREACCESS_TARGET,  
-                                                 inputSurface->w, inputSurface->h); 
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
-    if (!tempTexture) {
-        printf("Failed to create temporary texture: %s\n", SDL_GetError());
-        return;
-    }
+	if (!tempTexture) {
+		printf("Failed to create temporary texture: %s\n", SDL_GetError());
+		return;
+	}
 
-    SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-    switch (layer)
-	{
+	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
+	switch (layer) {
 	case 1:
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 		break;
@@ -993,52 +1042,44 @@ void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, flo
 		break;
 	}
 
-    // Adjust brightness
-    Uint8 r = 255, g = 255, b = 255;
-    if (brightness < 1.0f) {
-        r = g = b = (Uint8)(255 * brightness);
-    } else if (brightness > 1.0f) {
-        r = g = b = 255;
-    }
-
-    SDL_SetTextureColorMod(tempTexture, r, g, b);
-
-    // Aspect ratio handling
-    SDL_Rect srcRect = { 0, 0, inputSurface->w, inputSurface->h }; 
-    SDL_Rect dstRect = { x, y, w, h };  
-
-    if (maintainAspectRatio) {
-        float aspectRatio = (float)inputSurface->w / (float)inputSurface->h;
-    
-        if (w / (float)h > aspectRatio) {
-            dstRect.w = (int)(h * aspectRatio);
-        } else {
-            dstRect.h = (int)(w / aspectRatio);
-        }
-    }
-
-    SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
-    SDL_SetRenderTarget(vid.renderer, NULL);
-    SDL_DestroyTexture(tempTexture);
-}
-
-
-void PLAT_animateSurface(
-	SDL_Surface *inputSurface,
-	int x, int y,
-	int target_x, int target_y,
-	int w, int h,
-	int duration_ms,
-	int start_opacity,
-	int target_opacity,
-	int layer
-) {
-	if (!inputSurface || !vid.target_layer2 || !vid.renderer) return;
-
-	SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	// Adjust brightness
+	Uint8 r = 255, g = 255, b = 255;
+	if (brightness < 1.0f) {
+		r = g = b = (Uint8)(255 * brightness);
+	} else if (brightness > 1.0f) {
+		r = g = b = 255;
+	}
+
+	SDL_SetTextureColorMod(tempTexture, r, g, b);
+
+	// Aspect ratio handling
+	SDL_Rect srcRect = {0, 0, inputSurface->w, inputSurface->h};
+	SDL_Rect dstRect = {x, y, w, h};
+
+	if (maintainAspectRatio) {
+		float aspectRatio = (float)inputSurface->w / (float)inputSurface->h;
+
+		if (w / (float)h > aspectRatio) {
+			dstRect.w = (int)(h * aspectRatio);
+		} else {
+			dstRect.h = (int)(w / aspectRatio);
+		}
+	}
+
+	SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
+	SDL_SetRenderTarget(vid.renderer, NULL);
+	SDL_DestroyTexture(tempTexture);
+}
+
+
+void PLAT_animateSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+						 int duration_ms, int start_opacity, int target_opacity, int layer)
+{
+	if (!inputSurface || !vid.target_layer2 || !vid.renderer)
+		return;
+
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!tempTexture) {
 		printf("Failed to create temporary texture: %s\n", SDL_GetError());
@@ -1046,14 +1087,13 @@ void PLAT_animateSurface(
 	}
 
 	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND);  // Enable blending for opacity
+	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND); // Enable blending for opacity
 
 	const int fps = 60;
 	const int frame_delay = 1000 / fps;
 	const int total_frames = duration_ms / frame_delay;
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 
 		int current_x = x + (int)((target_x - x) * t);
@@ -1061,8 +1101,10 @@ void PLAT_animateSurface(
 
 		// Interpolate opacity
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
 		SDL_SetTextureAlphaMod(tempTexture, current_opacity);
 
@@ -1071,11 +1113,11 @@ void PLAT_animateSurface(
 		else
 			SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 
-		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0); 
+		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect srcRect = { 0, 0, inputSurface->w, inputSurface->h };
-		SDL_Rect dstRect = { current_x, current_y, w, h };
+		SDL_Rect srcRect = {0, 0, inputSurface->w, inputSurface->h};
+		SDL_Rect dstRect = {current_x, current_y, w, h};
 		SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
@@ -1087,10 +1129,11 @@ void PLAT_animateSurface(
 
 static int text_offset = 0;
 
-int PLAT_resetScrollText(TTF_Font* font, const char* in_name,int max_width) {
+int PLAT_resetScrollText(TTF_Font *font, const char *in_name, int max_width)
+{
 	int text_width, text_height;
-	
-    TTF_SizeUTF8(font, in_name, &text_width, &text_height);
+
+	TTF_SizeUTF8(font, in_name, &text_width, &text_height);
 
 	text_offset = 0;
 
@@ -1100,77 +1143,78 @@ int PLAT_resetScrollText(TTF_Font* font, const char* in_name,int max_width) {
 		return 1;
 	}
 }
-void PLAT_scrollTextTexture(
-    TTF_Font* font,
-    const char* in_name,
-    int x, int y,      // Position on target layer
-    int w, int h,      // Clipping width and height
-    SDL_Color color,
-    float transparency
-) {
-    static int frame_counter = 0;
+void PLAT_scrollTextTexture(TTF_Font *font, const char *in_name, int x, int y, // Position on target layer
+							int w, int h,									   // Clipping width and height
+							SDL_Color color, float transparency)
+{
+	static int frame_counter = 0;
 	int padding = 30;
 
-    if (transparency < 0.0f) transparency = 0.0f;
-    if (transparency > 1.0f) transparency = 1.0f;
-    color.a = (Uint8)(transparency * 255);
-
-    // Render the original text only once
-    SDL_Surface* singleSur = TTF_RenderUTF8_Blended(font, in_name, color);
-    if (!singleSur) return;
+	if (transparency < 0.0f)
+		transparency = 0.0f;
+	if (transparency > 1.0f)
+		transparency = 1.0f;
+	color.a = (Uint8)(transparency * 255);
 
-    int single_width = singleSur->w;
-    int single_height = singleSur->h;
+	// Render the original text only once
+	SDL_Surface *singleSur = TTF_RenderUTF8_Blended(font, in_name, color);
+	if (!singleSur)
+		return;
 
-    // Create a surface to hold two copies side by side with padding
-    SDL_Surface* text_surface = SDL_CreateRGBSurfaceWithFormat(0,
-        single_width * 2 + padding, single_height, 32, SDL_PIXELFORMAT_RGBA8888);
+	int single_width = singleSur->w;
+	int single_height = singleSur->h;
 
-    SDL_FillRect(text_surface, NULL, THEME_COLOR1);
-    SDL_BlitSurface(singleSur, NULL, text_surface, NULL);
+	// Create a surface to hold two copies side by side with padding
+	SDL_Surface *text_surface =
+		SDL_CreateRGBSurfaceWithFormat(0, single_width * 2 + padding, single_height, 32, SDL_PIXELFORMAT_RGBA8888);
 
-    SDL_Rect second = { single_width + padding, 0, single_width, single_height };
-    SDL_BlitSurface(singleSur, NULL, text_surface, &second);
-    SDL_FreeSurface(singleSur);
+	SDL_FillRect(text_surface, NULL, THEME_COLOR1);
+	SDL_BlitSurface(singleSur, NULL, text_surface, NULL);
 
-    SDL_Texture* full_text_texture = SDL_CreateTextureFromSurface(vid.renderer, text_surface);
-    int full_text_width = text_surface->w;
-    SDL_FreeSurface(text_surface);
+	SDL_Rect second = {single_width + padding, 0, single_width, single_height};
+	SDL_BlitSurface(singleSur, NULL, text_surface, &second);
+	SDL_FreeSurface(singleSur);
 
-    if (!full_text_texture) return;
+	SDL_Texture *full_text_texture = SDL_CreateTextureFromSurface(vid.renderer, text_surface);
+	int full_text_width = text_surface->w;
+	SDL_FreeSurface(text_surface);
 
-    SDL_SetTextureBlendMode(full_text_texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(full_text_texture, color.a);
+	if (!full_text_texture)
+		return;
 
-    SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
+	SDL_SetTextureBlendMode(full_text_texture, SDL_BLENDMODE_BLEND);
+	SDL_SetTextureAlphaMod(full_text_texture, color.a);
 
-    SDL_Rect src_rect = { text_offset, 0, w, single_height };
-    SDL_Rect dst_rect = { x, y, w, single_height };
+	SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 
-    SDL_RenderCopy(vid.renderer, full_text_texture, &src_rect, &dst_rect);
+	SDL_Rect src_rect = {text_offset, 0, w, single_height};
+	SDL_Rect dst_rect = {x, y, w, single_height};
 
-    SDL_SetRenderTarget(vid.renderer, NULL);
-    SDL_DestroyTexture(full_text_texture);
+	SDL_RenderCopy(vid.renderer, full_text_texture, &src_rect, &dst_rect);
 
-    // Scroll only if text is wider than clip width
-    if (single_width > w) {
-        frame_counter++;
-        if (frame_counter >= 0) {
-            text_offset += 2;
-            if (text_offset >= single_width + padding) {
-                text_offset = 0;
-            }
-            frame_counter = 0;
-        }
-    } else {
-        text_offset = 0;
-    }
+	SDL_SetRenderTarget(vid.renderer, NULL);
+	SDL_DestroyTexture(full_text_texture);
+
+	// Scroll only if text is wider than clip width
+	if (single_width > w) {
+		frame_counter++;
+		if (frame_counter >= 0) {
+			text_offset += 2;
+			if (text_offset >= single_width + padding) {
+				text_offset = 0;
+			}
+			frame_counter = 0;
+		}
+	} else {
+		text_offset = 0;
+	}
 
-    PLAT_GPU_Flip();
+	PLAT_GPU_Flip();
 }
 
 // super fast without update_texture to draw screen
-void PLAT_GPU_Flip() {
+void PLAT_GPU_Flip()
+{
 	SDL_RenderClear(vid.renderer);
 	SDL_RenderCopy(vid.renderer, vid.target_layer1, NULL, NULL);
 	SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
@@ -1181,19 +1225,14 @@ void PLAT_GPU_Flip() {
 	SDL_RenderPresent(vid.renderer);
 }
 
-void PLAT_animateSurfaceOpacity(
-	SDL_Surface *inputSurface,
-	int x, int y, int w, int h,
-	int start_opacity, int target_opacity,
-	int duration_ms,
-	int layer
-) {
-	if (!inputSurface) return;
+void PLAT_animateSurfaceOpacity(SDL_Surface *inputSurface, int x, int y, int w, int h, int start_opacity,
+								int target_opacity, int duration_ms, int layer)
+{
+	if (!inputSurface)
+		return;
 
-	SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!tempTexture) {
 		printf("Failed to create temporary texture: %s\n", SDL_GetError());
@@ -1201,50 +1240,52 @@ void PLAT_animateSurfaceOpacity(
 	}
 
 	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND); 
+	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND);
 
 	const int fps = 60;
 	const int frame_delay = 1000 / fps;
 	const int total_frames = duration_ms / frame_delay;
 
-	SDL_Texture* target_layer = (layer == 0) ? vid.target_layer2 : vid.target_layer4;
+	SDL_Texture *target_layer = (layer == 0) ? vid.target_layer2 : vid.target_layer4;
 	if (!target_layer) {
 		SDL_DestroyTexture(tempTexture);
 		return;
 	}
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
 		SDL_SetTextureAlphaMod(tempTexture, current_opacity);
 		SDL_SetRenderTarget(vid.renderer, target_layer);
 		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect dstRect = { x, y, w, h };
+		SDL_Rect dstRect = {x, y, w, h};
 		SDL_RenderCopy(vid.renderer, tempTexture, NULL, &dstRect);
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
 		// blit to 0 for normal draw
 		vid.blit = 0;
-		PLAT_flip(vid.screen,0);
-
+		PLAT_flip(vid.screen, 0);
 	}
 
 	SDL_DestroyTexture(tempTexture);
 }
 
-SDL_Surface* PLAT_captureRendererToSurface() {
-	if (!vid.renderer) return NULL;
+SDL_Surface *PLAT_captureRendererToSurface()
+{
+	if (!vid.renderer)
+		return NULL;
 
 	int width, height;
 	SDL_GetRendererOutputSize(vid.renderer, &width, &height);
 
-	SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_RGBA8888);
+	SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_RGBA8888);
 	if (!surface) {
 		printf("Failed to create surface: %s\n", SDL_GetError());
 		return NULL;
@@ -1260,7 +1301,7 @@ SDL_Surface* PLAT_captureRendererToSurface() {
 	}
 
 	// remove transparancy
-	Uint32* pixels = (Uint32*)surface->pixels;
+	Uint32 *pixels = (Uint32 *)surface->pixels;
 	int total_pixels = (surface->pitch / 4) * surface->h;
 
 	for (int i = 0; i < total_pixels; i++) {
@@ -1273,19 +1314,15 @@ SDL_Surface* PLAT_captureRendererToSurface() {
 	return surface;
 }
 
-void PLAT_animateAndFadeSurface(
-	SDL_Surface *inputSurface,
-	int x, int y, int target_x, int target_y, int w, int h, int duration_ms,
-	SDL_Surface *fadeSurface,
-	int fade_x, int fade_y, int fade_w, int fade_h,
-	int start_opacity, int target_opacity,int layer
-) {
-	if (!inputSurface || !vid.renderer) return;
+void PLAT_animateAndFadeSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+								int duration_ms, SDL_Surface *fadeSurface, int fade_x, int fade_y, int fade_w,
+								int fade_h, int start_opacity, int target_opacity, int layer)
+{
+	if (!inputSurface || !vid.renderer)
+		return;
 
-	SDL_Texture* moveTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	SDL_Texture *moveTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!moveTexture) {
 		printf("Failed to create move texture: %s\n", SDL_GetError());
@@ -1294,7 +1331,7 @@ void PLAT_animateAndFadeSurface(
 
 	SDL_UpdateTexture(moveTexture, NULL, inputSurface->pixels, inputSurface->pitch);
 
-	SDL_Texture* fadeTexture = NULL;
+	SDL_Texture *fadeTexture = NULL;
 	if (fadeSurface) {
 		fadeTexture = SDL_CreateTextureFromSurface(vid.renderer, fadeSurface);
 		if (!fadeTexture) {
@@ -1312,18 +1349,18 @@ void PLAT_animateAndFadeSurface(
 	Uint32 start_time = SDL_GetTicks();
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 
 		int current_x = x + (int)((target_x - x) * t);
 		int current_y = y + (int)((target_y - y) * t);
 
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
-		switch (layer)
-		{
+		switch (layer) {
 		case 1:
 			SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 			break;
@@ -1346,95 +1383,104 @@ void PLAT_animateAndFadeSurface(
 		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect moveSrcRect = { 0, 0, inputSurface->w, inputSurface->h };
-		SDL_Rect moveDstRect = { current_x, current_y, w, h };
+		SDL_Rect moveSrcRect = {0, 0, inputSurface->w, inputSurface->h};
+		SDL_Rect moveDstRect = {current_x, current_y, w, h};
 		SDL_RenderCopy(vid.renderer, moveTexture, &moveSrcRect, &moveDstRect);
 
 		if (fadeTexture) {
 			SDL_SetTextureAlphaMod(fadeTexture, current_opacity);
-			SDL_Rect fadeDstRect = { fade_x, fade_y, fade_w, fade_h };
+			SDL_Rect fadeDstRect = {fade_x, fade_y, fade_w, fade_h};
 			SDL_RenderCopy(vid.renderer, fadeTexture, NULL, &fadeDstRect);
 		}
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
 		PLAT_GPU_Flip();
-
 	}
 
 	SDL_DestroyTexture(moveTexture);
-	if (fadeTexture) SDL_DestroyTexture(fadeTexture);
+	if (fadeTexture)
+		SDL_DestroyTexture(fadeTexture);
 }
 
-void PLAT_setEffect(int next_type) {
+void PLAT_setEffect(int next_type)
+{
 	effect.next_type = next_type;
 }
-void PLAT_setEffectColor(int next_color) {
+void PLAT_setEffectColor(int next_color)
+{
 	effect.next_color = next_color;
 }
-void PLAT_vsync(int remaining) {
-	if (remaining>0) SDL_Delay(remaining);
+void PLAT_vsync(int remaining)
+{
+	if (remaining > 0)
+		SDL_Delay(remaining);
 }
 
-scaler_t PLAT_getScaler(GFX_Renderer* renderer) {
+scaler_t PLAT_getScaler(GFX_Renderer *renderer)
+{
 	// LOG_info("getScaler for scale: %i\n", renderer->scale);
 	effect.next_scale = renderer->scale;
 	return scale1x1_c16;
 }
 
-void setRectToAspectRatio(SDL_Rect* dst_rect) {
-    int x = vid.blit->src_x;
-    int y = vid.blit->src_y;
-    int w = vid.blit->src_w;
-    int h = vid.blit->src_h;
-
-    if (vid.blit->aspect == 0) {
-        w = vid.blit->src_w * vid.blit->scale;
-        h = vid.blit->src_h * vid.blit->scale;
-        dst_rect->x = (device_width - w) / 2 + screenx;
-        dst_rect->y = (device_height - h) / 2 + screeny;
-        dst_rect->w = w;
-        dst_rect->h = h;
-    } else if (vid.blit->aspect > 0) {
-        if (should_rotate) {
-            h = device_width;
-            w = h * vid.blit->aspect;
-            if (w > device_height) {
-                w = device_height;
-                h = w / vid.blit->aspect;
-            }
-        } else {
-            h = device_height;
-            w = h * vid.blit->aspect;
-            if (w > device_width) {
-                w = device_width;
-                h = w / vid.blit->aspect;
-            }
-        }
-        dst_rect->x = (device_width - w) / 2 + screenx;
-        dst_rect->y = (device_height - h) / 2 + screeny;
-        dst_rect->w = w;
-        dst_rect->h = h;
-    } else {
-        dst_rect->x = screenx;
-        dst_rect->y = screeny;
-        dst_rect->w = should_rotate ? device_height : device_width;
-        dst_rect->h = should_rotate ? device_width : device_height;
-    }
-}
-
-void PLAT_blitRenderer(GFX_Renderer* renderer) {
+void setRectToAspectRatio(SDL_Rect *dst_rect)
+{
+	int x = vid.blit->src_x;
+	int y = vid.blit->src_y;
+	int w = vid.blit->src_w;
+	int h = vid.blit->src_h;
+
+	if (vid.blit->aspect == 0) {
+		w = vid.blit->src_w * vid.blit->scale;
+		h = vid.blit->src_h * vid.blit->scale;
+		dst_rect->x = (device_width - w) / 2 + screenx;
+		dst_rect->y = (device_height - h) / 2 + screeny;
+		dst_rect->w = w;
+		dst_rect->h = h;
+	} else if (vid.blit->aspect > 0) {
+		if (should_rotate) {
+			h = device_width;
+			w = h * vid.blit->aspect;
+			if (w > device_height) {
+				w = device_height;
+				h = w / vid.blit->aspect;
+			}
+		} else {
+			h = device_height;
+			w = h * vid.blit->aspect;
+			if (w > device_width) {
+				w = device_width;
+				h = w / vid.blit->aspect;
+			}
+		}
+		dst_rect->x = (device_width - w) / 2 + screenx;
+		dst_rect->y = (device_height - h) / 2 + screeny;
+		dst_rect->w = w;
+		dst_rect->h = h;
+	} else {
+		dst_rect->x = screenx;
+		dst_rect->y = screeny;
+		dst_rect->w = should_rotate ? device_height : device_width;
+		dst_rect->h = should_rotate ? device_width : device_height;
+	}
+}
+
+void PLAT_blitRenderer(GFX_Renderer *renderer)
+{
 	vid.blit = renderer;
 	SDL_RenderClear(vid.renderer);
-	resizeVideo(vid.blit->true_w,vid.blit->true_h,vid.blit->src_p);
+	resizeVideo(vid.blit->true_w, vid.blit->true_h, vid.blit->src_p);
 }
 
-void PLAT_clearShaders() {
+void PLAT_clearShaders()
+{
 	// this funciton was empty so am abusing it for now for this, later need to make a seperate function for it
 	// set blit to 0 maybe should be seperate function later
 	vid.blit = NULL;
 }
 
-void PLAT_flipHidden() {
+void PLAT_flipHidden()
+{
 	SDL_RenderClear(vid.renderer);
 	resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
 	SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
@@ -1447,55 +1493,55 @@ void PLAT_flipHidden() {
 	//  SDL_RenderPresent(vid.renderer); // no present want to flip  hidden
 }
 
-void PLAT_flip(SDL_Surface* IGNORED, int ignored) {
+void PLAT_flip(SDL_Surface *IGNORED, int ignored)
+{
 	// dont think we need this here tbh
-	// SDL_RenderClear(vid.renderer);    
+	// SDL_RenderClear(vid.renderer);
 	if (!vid.blit) {
-        resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
-        SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
+		resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
+		SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
 		SDL_RenderCopy(vid.renderer, vid.target_layer1, NULL, NULL);
-        SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
-        SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
+		SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
+		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer3, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer4, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer5, NULL, NULL);
-        SDL_RenderPresent(vid.renderer);
-        return;
-    }
-    SDL_UpdateTexture(vid.stream_layer1, NULL, vid.blit->src, vid.blit->src_p);
-
-    SDL_Texture* target = vid.stream_layer1;
-    int x = vid.blit->src_x;
-    int y = vid.blit->src_y;
-    int w = vid.blit->src_w;
-    int h = vid.blit->src_h;
-    if (vid.sharpness == SHARPNESS_CRISP) {
-		
-        SDL_SetRenderTarget(vid.renderer, vid.target);
-        SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
-        SDL_SetRenderTarget(vid.renderer, NULL);
-        x *= hard_scale;
-        y *= hard_scale;
-        w *= hard_scale;
-        h *= hard_scale;
-        target = vid.target;
-    }
-
-    SDL_Rect* src_rect = &(SDL_Rect){x, y, w, h};
-    SDL_Rect* dst_rect = &(SDL_Rect){0, 0, device_width, device_height};
-
-    setRectToAspectRatio(dst_rect);
-	
-    SDL_RenderCopy(vid.renderer, target, src_rect, dst_rect);
-
-    SDL_RenderPresent(vid.renderer);
-    vid.blit = NULL;
+		SDL_RenderPresent(vid.renderer);
+		return;
+	}
+	SDL_UpdateTexture(vid.stream_layer1, NULL, vid.blit->src, vid.blit->src_p);
+
+	SDL_Texture *target = vid.stream_layer1;
+	int x = vid.blit->src_x;
+	int y = vid.blit->src_y;
+	int w = vid.blit->src_w;
+	int h = vid.blit->src_h;
+	if (vid.sharpness == SHARPNESS_CRISP) {
+		SDL_SetRenderTarget(vid.renderer, vid.target);
+		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
+		SDL_SetRenderTarget(vid.renderer, NULL);
+		x *= hard_scale;
+		y *= hard_scale;
+		w *= hard_scale;
+		h *= hard_scale;
+		target = vid.target;
+	}
+
+	SDL_Rect *src_rect = &(SDL_Rect){x, y, w, h};
+	SDL_Rect *dst_rect = &(SDL_Rect){0, 0, device_width, device_height};
+
+	setRectToAspectRatio(dst_rect);
+
+	SDL_RenderCopy(vid.renderer, target, src_rect, dst_rect);
+
+	SDL_RenderPresent(vid.renderer);
+	vid.blit = NULL;
 }
 
 static int frame_count = 0;
-void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_texture,
-                   int x, int y, int dst_width, int dst_height, Shader* shader, int alpha, int filter) {
-
+void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint *target_texture, int x, int y, int dst_width,
+				   int dst_height, Shader *shader, int alpha, int filter)
+{
 	static GLuint static_VAO = 0, static_VBO = 0;
 	static GLuint last_program = 0;
 	static GLfloat last_texelSize[2] = {-1.0f, -1.0f};
@@ -1506,7 +1552,7 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 
 
 	if (shader_program != last_program)
-    	glUseProgram(shader_program);
+		glUseProgram(shader_program);
 
 	if (static_VAO == 0) {
 		glGenVertexArrays(1, &static_VAO);
@@ -1516,62 +1562,59 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 
 		float vertices[] = {
 			//   x,     y,    u,    v,    z,    w
-			-1.0f,  1.0f,  0.0f, 1.0f, 0.0f, 1.0f,  // top-left
-			-1.0f, -1.0f,  0.0f, 0.0f, 0.0f, 1.0f,  // bottom-left
-			 1.0f,  1.0f,  1.0f, 1.0f, 0.0f, 1.0f,  // top-right
-			 1.0f, -1.0f,  1.0f, 0.0f, 0.0f, 1.0f   // bottom-right
+			-1.0f, 1.0f,  0.0f, 1.0f, 0.0f, 1.0f, // top-left
+			-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, // bottom-left
+			1.0f,  1.0f,  1.0f, 1.0f, 0.0f, 1.0f, // top-right
+			1.0f,  -1.0f, 1.0f, 0.0f, 0.0f, 1.0f  // bottom-right
 		};
 
 		glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
 	}
-	
+
 
 	if (shader_program != last_program) {
 		GLint posAttrib = glGetAttribLocation(shader_program, "VertexCoord");
 		if (posAttrib >= 0) {
-			
-			glVertexAttribPointer(posAttrib, 2, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (void*)0);
+			glVertexAttribPointer(posAttrib, 2, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (void *)0);
 			glEnableVertexAttribArray(posAttrib);
 		}
 		GLint texAttrib = glGetAttribLocation(shader_program, "TexCoord");
 		if (texAttrib >= 0) {
-			
-			glVertexAttribPointer(texAttrib, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (void*)(2 * sizeof(float)));
+			glVertexAttribPointer(texAttrib, 4, GL_FLOAT, GL_FALSE, 6 * sizeof(float), (void *)(2 * sizeof(float)));
 			glEnableVertexAttribArray(texAttrib);
 		}
 
 
-
-		if (shader->u_FrameDirection >= 0) glUniform1i(shader->u_FrameDirection, 1);
-		if (shader->u_FrameCount >= 0) glUniform1i(shader->u_FrameCount, frame_count);
-		if (shader->u_OutputSize >= 0) glUniform2f(shader->u_OutputSize, dst_width, dst_height);
-		if (shader->u_TextureSize >= 0) glUniform2f(shader->u_TextureSize, shader->texw, shader->texh); 
-		if (shader->OrigInputSize >= 0) glUniform2f(shader->OrigInputSize, shader->srcw, shader->srch); 
-		if (shader->u_InputSize >= 0) glUniform2f(shader->u_InputSize, shader->srcw, shader->srch); 
+		if (shader->u_FrameDirection >= 0)
+			glUniform1i(shader->u_FrameDirection, 1);
+		if (shader->u_FrameCount >= 0)
+			glUniform1i(shader->u_FrameCount, frame_count);
+		if (shader->u_OutputSize >= 0)
+			glUniform2f(shader->u_OutputSize, dst_width, dst_height);
+		if (shader->u_TextureSize >= 0)
+			glUniform2f(shader->u_TextureSize, shader->texw, shader->texh);
+		if (shader->OrigInputSize >= 0)
+			glUniform2f(shader->OrigInputSize, shader->srcw, shader->srch);
+		if (shader->u_InputSize >= 0)
+			glUniform2f(shader->u_InputSize, shader->srcw, shader->srch);
 		for (int i = 0; i < shader->num_pragmas; ++i) {
 			glUniform1f(shader->pragmas[i].uniformLocation, shader->pragmas[i].value);
 		}
 
 		GLint u_MVP = glGetUniformLocation(shader_program, "MVPMatrix");
 		if (u_MVP >= 0) {
-			float identity[16] = {
-				1,0,0,0,
-				0,1,0,0,
-				0,0,1,0,
-				0,0,0,1
-			};
+			float identity[16] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1};
 			glUniformMatrix4fv(u_MVP, 1, GL_FALSE, identity);
 		}
 		glBindVertexArray(static_VAO);
 	}
 	static GLuint lastfbo = -1;
 	if (target_texture) {
-		if (*target_texture==0 || shader->updated || reloadShaderTextures) { 
-			
+		if (*target_texture == 0 || shader->updated || reloadShaderTextures) {
 			// if(target_texture) {
 			// 	glDeleteTextures(1,target_texture);
 			// }
-			if(*target_texture==0)
+			if (*target_texture == 0)
 				glGenTextures(1, target_texture);
 			glBindTexture(GL_TEXTURE_2D, *target_texture);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
@@ -1584,23 +1627,23 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 		if (fbo == 0) {
 			glGenFramebuffers(1, &fbo);
 		}
-		
+
 		if (lastfbo == 0) {
 			glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-			
 		}
 		lastfbo = fbo;
 		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, *target_texture, 0);
-		
-    } else {
-		// things like overlays and stuff we don't need to write to another texture so they can be directly written to screen framebuffer
+
+	} else {
+		// things like overlays and stuff we don't need to write to another texture so they can be directly written to
+		// screen framebuffer
 		if (lastfbo != 0) {
-        	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		}
 		lastfbo = 0;
-    }
+	}
 
-	if(alpha==1) {
+	if (alpha == 1) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	} else {
@@ -1614,36 +1657,39 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 	}
 	glViewport(x, y, dst_width, dst_height);
 
-	
-	if (shader->texLocation >= 0) glUniform1i(shader->texLocation, 0);  
-	
 
-	if (shader->texelSizeLocation >= 0 && (shader->updated || texelSize[0] != last_texelSize[0] || texelSize[1] != last_texelSize[1])) {
+	if (shader->texLocation >= 0)
+		glUniform1i(shader->texLocation, 0);
+
+
+	if (shader->texelSizeLocation >= 0 &&
+		(shader->updated || texelSize[0] != last_texelSize[0] || texelSize[1] != last_texelSize[1])) {
 		glUniform2fv(shader->texelSizeLocation, 1, texelSize);
 		last_texelSize[0] = texelSize[0];
 		last_texelSize[1] = texelSize[1];
 	}
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	last_program = shader_program;
 }
 
 typedef struct {
-    SDL_Surface* loaded_effect;
-    SDL_Surface* loaded_overlay;
-    int effect_ready;
-    int overlay_ready;
+	SDL_Surface *loaded_effect;
+	SDL_Surface *loaded_overlay;
+	int effect_ready;
+	int overlay_ready;
 } FramePreparation;
 
 static FramePreparation frame_prep = {0};
 
-int prepareFrameThread(void *data) {
-    while (1) {
+int prepareFrameThread(void *data)
+{
+	while (1) {
 		updateEffect();
 
-        if (effectUpdated) {
-			LOG_info("effect updated %s\n",effect_path);
-			if(effect_path) {
-				SDL_Surface* tmp = IMG_Load(effect_path);
+		if (effectUpdated) {
+			LOG_info("effect updated %s\n", effect_path);
+			if (effect_path) {
+				SDL_Surface *tmp = IMG_Load(effect_path);
 				if (tmp) {
 					frame_prep.loaded_effect = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_RGBA32, 0);
 					SDL_FreeSurface(tmp);
@@ -1654,19 +1700,17 @@ int prepareFrameThread(void *data) {
 				frame_prep.loaded_effect = 0;
 			}
 			effectUpdated = 0;
-			frame_prep.effect_ready = 1; 
-        }
-		if(effect.type == EFFECT_NONE && frame_prep.loaded_effect !=0) {
+			frame_prep.effect_ready = 1;
+		}
+		if (effect.type == EFFECT_NONE && frame_prep.loaded_effect != 0) {
 			frame_prep.loaded_effect = 0;
 			frame_prep.effect_ready = 1;
-	
 		}
 
-        if (overlayUpdated) {
-
+		if (overlayUpdated) {
 			LOG_info("overlay updated\n");
-			if(overlay_path) {
-				SDL_Surface* tmp = IMG_Load(overlay_path);
+			if (overlay_path) {
+				SDL_Surface *tmp = IMG_Load(overlay_path);
 				if (tmp) {
 					frame_prep.loaded_overlay = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_RGBA32, 0);
 					SDL_FreeSurface(tmp);
@@ -1677,57 +1721,60 @@ int prepareFrameThread(void *data) {
 				frame_prep.loaded_overlay = 0;
 			}
 			frame_prep.overlay_ready = 1;
-			overlayUpdated=0;
-        }
+			overlayUpdated = 0;
+		}
 
-        SDL_Delay(120); 
-    }
-    return 0;
+		SDL_Delay(120);
+	}
+	return 0;
 }
 
 static SDL_Thread *prepare_thread = NULL;
 
-void PLAT_GL_Swap() {
-
+void PLAT_GL_Swap()
+{
 	if (prepare_thread == NULL) {
-        prepare_thread = SDL_CreateThread(prepareFrameThread, "PrepareFrameThread", NULL);
+		prepare_thread = SDL_CreateThread(prepareFrameThread, "PrepareFrameThread", NULL);
 
-        if (prepare_thread == NULL) {
-            printf("Error creating background thread: %s\n", SDL_GetError());
-            return; 
-        }
-    }
+		if (prepare_thread == NULL) {
+			printf("Error creating background thread: %s\n", SDL_GetError());
+			return;
+		}
+	}
 
-    static int lastframecount = 0;
-    if (reloadShaderTextures) lastframecount = frame_count;
-    if (frame_count < lastframecount + 3)
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	static int lastframecount = 0;
+	if (reloadShaderTextures)
+		lastframecount = frame_count;
+	if (frame_count < lastframecount + 3)
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    SDL_Rect dst_rect = {0, 0, device_width, device_height};
-    setRectToAspectRatio(&dst_rect);
+	SDL_Rect dst_rect = {0, 0, device_width, device_height};
+	setRectToAspectRatio(&dst_rect);
 
-    if (!vid.blit->src) {
-        return;
-    }
+	if (!vid.blit->src) {
+		return;
+	}
 
 	SDL_GL_MakeCurrent(vid.window, vid.gl_context);
 
-    static GLuint effect_tex = 0;
-    static int effect_w = 0, effect_h = 0;
-    static GLuint overlay_tex = 0;
-    static int overlay_w = 0, overlay_h = 0;
-    static int overlayload = 0;
+	static GLuint effect_tex = 0;
+	static int effect_w = 0, effect_h = 0;
+	static GLuint overlay_tex = 0;
+	static int overlay_w = 0, overlay_h = 0;
+	static int overlayload = 0;
 
 
-	 if (frame_prep.effect_ready) {
-		if(frame_prep.loaded_effect) {
-			if(!effect_tex) glGenTextures(1, &effect_tex);
+	if (frame_prep.effect_ready) {
+		if (frame_prep.loaded_effect) {
+			if (!effect_tex)
+				glGenTextures(1, &effect_tex);
 			glBindTexture(GL_TEXTURE_2D, effect_tex);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_effect->w, frame_prep.loaded_effect->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_effect->pixels);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_effect->w, frame_prep.loaded_effect->h, 0,
+						 GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_effect->pixels);
 			effect_w = frame_prep.loaded_effect->w;
 			effect_h = frame_prep.loaded_effect->h;
 		} else {
@@ -1736,240 +1783,235 @@ void PLAT_GL_Swap() {
 			}
 			effect_tex = 0;
 		}
-        frame_prep.effect_ready = 0; 
-    }
+		frame_prep.effect_ready = 0;
+	}
 
-    if (frame_prep.overlay_ready) {
-		if(frame_prep.loaded_overlay) {
-			if(!overlay_tex) glGenTextures(1, &overlay_tex);
+	if (frame_prep.overlay_ready) {
+		if (frame_prep.loaded_overlay) {
+			if (!overlay_tex)
+				glGenTextures(1, &overlay_tex);
 			glBindTexture(GL_TEXTURE_2D, overlay_tex);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_overlay->w, frame_prep.loaded_overlay->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_overlay->pixels);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_overlay->w, frame_prep.loaded_overlay->h, 0,
+						 GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_overlay->pixels);
 			overlay_w = frame_prep.loaded_overlay->w;
 			overlay_h = frame_prep.loaded_overlay->h;
-		
+
 		} else {
 			if (overlay_tex) {
 				glDeleteTextures(1, &overlay_tex);
 			}
 			overlay_tex = 0;
 		}
-        frame_prep.overlay_ready = 0; 
-    }
-	
-    static GLuint src_texture = 0;
-    static int src_w_last = 0, src_h_last = 0;
-    static int last_w = 0, last_h = 0;
-
-    if (!src_texture || reloadShaderTextures) {
-        // if (src_texture) {
-        //     glDeleteTextures(1, &src_texture);
-        //     src_texture = 0;
-        // }
-		if (src_texture==0)
-        	glGenTextures(1, &src_texture);
-        glBindTexture(GL_TEXTURE_2D, src_texture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    }
-
-    glBindTexture(GL_TEXTURE_2D, src_texture);
-    if (vid.blit->src_w != src_w_last || vid.blit->src_h != src_h_last || reloadShaderTextures) {
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, vid.blit->src_w, vid.blit->src_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, vid.blit->src);
-        src_w_last = vid.blit->src_w;
-        src_h_last = vid.blit->src_h;
-    } else {
-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, vid.blit->src_w, vid.blit->src_h, GL_RGBA, GL_UNSIGNED_BYTE, vid.blit->src);
-    }
-
-    if (nrofshaders < 1) {
-        runShaderPass(src_texture, g_shader_default, NULL, dst_rect.x, dst_rect.y,
-            dst_rect.w, dst_rect.h,
-            &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = vid.blit->src_w, .texh = vid.blit->src_h},
-            0, GL_NONE);
-    }
-
-    last_w = vid.blit->src_w;
-    last_h = vid.blit->src_h;
-
-    for (int i = 0; i < nrofshaders; i++) {
-        int src_w = last_w;
-        int src_h = last_h;
-        int dst_w = src_w * shaders[i]->scale;
-        int dst_h = src_h * shaders[i]->scale;
-
-        if (shaders[i]->scale == 9) {
-            dst_w = dst_rect.w;
-            dst_h = dst_rect.h;
-        }
-
-        if (reloadShaderTextures) {
-            for (int j = i; j < nrofshaders; j++) {
-                int real_input_w = (i == 0) ? vid.blit->src_w : last_w;
-                int real_input_h = (i == 0) ? vid.blit->src_h : last_h;
-
-                shaders[i]->srcw = shaders[i]->srctype == 0 ? vid.blit->src_w : shaders[i]->srctype == 2 ? dst_rect.w : real_input_w;
-                shaders[i]->srch = shaders[i]->srctype == 0 ? vid.blit->src_h : shaders[i]->srctype == 2 ? dst_rect.h : real_input_h;
-                shaders[i]->texw = shaders[i]->scaletype == 0 ? vid.blit->src_w : shaders[i]->scaletype == 2 ? dst_rect.w : real_input_w;
-                shaders[i]->texh = shaders[i]->scaletype == 0 ? vid.blit->src_h : shaders[i]->scaletype == 2 ? dst_rect.h : real_input_h;
-            }
-        }
-
-        static int shaderinfocount = 0;
-        static int shaderinfoscreen = 0;
-        if (shaderinfocount > 600 && shaderinfoscreen == i) {
-            currentshaderpass = i + 1;
-            currentshadertexw = shaders[i]->texw;
-            currentshadertexh = shaders[i]->texh;
-            currentshadersrcw = shaders[i]->srcw;
-            currentshadersrch = shaders[i]->srch;
-            currentshaderdstw = dst_w;
-            currentshaderdsth = dst_h;
-            shaderinfocount = 0;
-            shaderinfoscreen++;
-            if (shaderinfoscreen >= nrofshaders)
-                shaderinfoscreen = 0;
-        }
-        shaderinfocount++;
-
-        if (shaders[i]->shader_p) {
-            runShaderPass(
-                (i == 0) ? src_texture : shaders[i - 1]->texture,
-                shaders[i]->shader_p,
-                &shaders[i]->texture,
-                0, 0, dst_w, dst_h,
-                shaders[i],
-                0,
-                (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter
-            );
-        } else {
-            runShaderPass(
-                (i == 0) ? src_texture : shaders[i - 1]->texture,
-                g_noshader,
-                &shaders[i]->texture,
-                0, 0, dst_w, dst_h,
-                shaders[i],
-                0,
-                (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter
-            );
-        }
-
-        last_w = dst_w;
-        last_h = dst_h;
-    }
-
-    if (nrofshaders > 0) {
-        runShaderPass(
-            shaders[nrofshaders - 1]->texture,
-            g_shader_default,
-            NULL,
-            dst_rect.x, dst_rect.y, dst_rect.w, dst_rect.h,
-            &(Shader){.srcw = last_w, .srch = last_h, .texw = last_w, .texh = last_h},
-            0, GL_NONE
-        );
-    }
-
-    if (effect_tex) {
-        runShaderPass(
-            effect_tex,
-            g_shader_overlay,
-            NULL,
-			dst_rect.x, dst_rect.y, effect_w, effect_h,
-            &(Shader){.srcw = effect_w, .srch = effect_h, .texw = effect_w, .texh = effect_h},
-            1, GL_NONE
-        );
-    }
-
-    if (overlay_tex) {
-        runShaderPass(
-            overlay_tex,
-            g_shader_overlay,
-            NULL,
-            0, 0, device_width, device_height,
-            &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = overlay_w, .texh = overlay_h},
-            1, GL_NONE
-        );
-    }
-
-    SDL_GL_SwapWindow(vid.window);
-    frame_count++;
-    reloadShaderTextures = 0;
-}
-
-// tryin to some arm neon optimization for first time for flipping image upside down, they sit in platform cause not all have neon extensions
-void PLAT_pixelFlipper(uint8_t* pixels, int width, int height) {
-    const int rowBytes = width * 4;
-    uint8_t* rowTop;
-    uint8_t* rowBottom;
-
-    for (int y = 0; y < height / 2; ++y) {
-        rowTop = pixels + y * rowBytes;
-        rowBottom = pixels + (height - 1 - y) * rowBytes;
-
-        int x = 0;
-        for (; x + 15 < rowBytes; x += 16) {
-            uint8x16_t top = vld1q_u8(rowTop + x);
-            uint8x16_t bottom = vld1q_u8(rowBottom + x);
-
-            vst1q_u8(rowTop + x, bottom);
-            vst1q_u8(rowBottom + x, top);
-        }
-        for (; x < rowBytes; ++x) {
-            uint8_t temp = rowTop[x];
-            rowTop[x] = rowBottom[x];
-            rowBottom[x] = temp;
-        }
-    }
-}
-
-unsigned char* PLAT_GL_screenCapture(int* outWidth, int* outHeight) {
-    glViewport(0, 0, device_width, device_height);
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-	
-    int width = viewport[2];
-    int height = viewport[3];
-
-    if (outWidth) *outWidth = width;
-    if (outHeight) *outHeight = height;
-
-    unsigned char* pixels = malloc(width * height * 4); // RGBA
-    if (!pixels) return NULL;
-
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+		frame_prep.overlay_ready = 0;
+	}
+
+	static GLuint src_texture = 0;
+	static int src_w_last = 0, src_h_last = 0;
+	static int last_w = 0, last_h = 0;
+
+	if (!src_texture || reloadShaderTextures) {
+		// if (src_texture) {
+		//     glDeleteTextures(1, &src_texture);
+		//     src_texture = 0;
+		// }
+		if (src_texture == 0)
+			glGenTextures(1, &src_texture);
+		glBindTexture(GL_TEXTURE_2D, src_texture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	}
+
+	glBindTexture(GL_TEXTURE_2D, src_texture);
+	if (vid.blit->src_w != src_w_last || vid.blit->src_h != src_h_last || reloadShaderTextures) {
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, vid.blit->src_w, vid.blit->src_h, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+					 vid.blit->src);
+		src_w_last = vid.blit->src_w;
+		src_h_last = vid.blit->src_h;
+	} else {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, vid.blit->src_w, vid.blit->src_h, GL_RGBA, GL_UNSIGNED_BYTE,
+						vid.blit->src);
+	}
+
+	if (nrofshaders < 1) {
+		runShaderPass(
+			src_texture, g_shader_default, NULL, dst_rect.x, dst_rect.y, dst_rect.w, dst_rect.h,
+			&(Shader){
+				.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = vid.blit->src_w, .texh = vid.blit->src_h},
+			0, GL_NONE);
+	}
+
+	last_w = vid.blit->src_w;
+	last_h = vid.blit->src_h;
+
+	for (int i = 0; i < nrofshaders; i++) {
+		int src_w = last_w;
+		int src_h = last_h;
+		int dst_w = src_w * shaders[i]->scale;
+		int dst_h = src_h * shaders[i]->scale;
+
+		if (shaders[i]->scale == 9) {
+			dst_w = dst_rect.w;
+			dst_h = dst_rect.h;
+		}
+
+		if (reloadShaderTextures) {
+			for (int j = i; j < nrofshaders; j++) {
+				int real_input_w = (i == 0) ? vid.blit->src_w : last_w;
+				int real_input_h = (i == 0) ? vid.blit->src_h : last_h;
+
+				shaders[i]->srcw = shaders[i]->srctype == 0	  ? vid.blit->src_w
+								   : shaders[i]->srctype == 2 ? dst_rect.w
+															  : real_input_w;
+				shaders[i]->srch = shaders[i]->srctype == 0	  ? vid.blit->src_h
+								   : shaders[i]->srctype == 2 ? dst_rect.h
+															  : real_input_h;
+				shaders[i]->texw = shaders[i]->scaletype == 0	? vid.blit->src_w
+								   : shaders[i]->scaletype == 2 ? dst_rect.w
+																: real_input_w;
+				shaders[i]->texh = shaders[i]->scaletype == 0	? vid.blit->src_h
+								   : shaders[i]->scaletype == 2 ? dst_rect.h
+																: real_input_h;
+			}
+		}
+
+		static int shaderinfocount = 0;
+		static int shaderinfoscreen = 0;
+		if (shaderinfocount > 600 && shaderinfoscreen == i) {
+			currentshaderpass = i + 1;
+			currentshadertexw = shaders[i]->texw;
+			currentshadertexh = shaders[i]->texh;
+			currentshadersrcw = shaders[i]->srcw;
+			currentshadersrch = shaders[i]->srch;
+			currentshaderdstw = dst_w;
+			currentshaderdsth = dst_h;
+			shaderinfocount = 0;
+			shaderinfoscreen++;
+			if (shaderinfoscreen >= nrofshaders)
+				shaderinfoscreen = 0;
+		}
+		shaderinfocount++;
+
+		if (shaders[i]->shader_p) {
+			runShaderPass((i == 0) ? src_texture : shaders[i - 1]->texture, shaders[i]->shader_p, &shaders[i]->texture,
+						  0, 0, dst_w, dst_h, shaders[i], 0,
+						  (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter);
+		} else {
+			runShaderPass((i == 0) ? src_texture : shaders[i - 1]->texture, g_noshader, &shaders[i]->texture, 0, 0,
+						  dst_w, dst_h, shaders[i], 0,
+						  (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter);
+		}
+
+		last_w = dst_w;
+		last_h = dst_h;
+	}
+
+	if (nrofshaders > 0) {
+		runShaderPass(shaders[nrofshaders - 1]->texture, g_shader_default, NULL, dst_rect.x, dst_rect.y, dst_rect.w,
+					  dst_rect.h, &(Shader){.srcw = last_w, .srch = last_h, .texw = last_w, .texh = last_h}, 0,
+					  GL_NONE);
+	}
+
+	if (effect_tex) {
+		runShaderPass(effect_tex, g_shader_overlay, NULL, dst_rect.x, dst_rect.y, effect_w, effect_h,
+					  &(Shader){.srcw = effect_w, .srch = effect_h, .texw = effect_w, .texh = effect_h}, 1, GL_NONE);
+	}
+
+	if (overlay_tex) {
+		runShaderPass(overlay_tex, g_shader_overlay, NULL, 0, 0, device_width, device_height,
+					  &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = overlay_w, .texh = overlay_h},
+					  1, GL_NONE);
+	}
+
+	SDL_GL_SwapWindow(vid.window);
+	frame_count++;
+	reloadShaderTextures = 0;
+}
+
+// tryin to some arm neon optimization for first time for flipping image upside down, they sit in platform cause not all
+// have neon extensions
+void PLAT_pixelFlipper(uint8_t *pixels, int width, int height)
+{
+	const int rowBytes = width * 4;
+	uint8_t *rowTop;
+	uint8_t *rowBottom;
+
+	for (int y = 0; y < height / 2; ++y) {
+		rowTop = pixels + y * rowBytes;
+		rowBottom = pixels + (height - 1 - y) * rowBytes;
+
+		int x = 0;
+		for (; x + 15 < rowBytes; x += 16) {
+			uint8x16_t top = vld1q_u8(rowTop + x);
+			uint8x16_t bottom = vld1q_u8(rowBottom + x);
+
+			vst1q_u8(rowTop + x, bottom);
+			vst1q_u8(rowBottom + x, top);
+		}
+		for (; x < rowBytes; ++x) {
+			uint8_t temp = rowTop[x];
+			rowTop[x] = rowBottom[x];
+			rowBottom[x] = temp;
+		}
+	}
+}
+
+unsigned char *PLAT_GL_screenCapture(int *outWidth, int *outHeight)
+{
+	glViewport(0, 0, device_width, device_height);
+	GLint viewport[4];
+	glGetIntegerv(GL_VIEWPORT, viewport);
+
+	int width = viewport[2];
+	int height = viewport[3];
+
+	if (outWidth)
+		*outWidth = width;
+	if (outHeight)
+		*outHeight = height;
+
+	unsigned char *pixels = malloc(width * height * 4); // RGBA
+	if (!pixels)
+		return NULL;
+
+	glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
 
 	PLAT_pixelFlipper(pixels, width, height);
 
-    return pixels; // caller must free
+	return pixels; // caller must free
 }
 
 ///////////////////////////////
 
-// TODO: 
-#define OVERLAY_WIDTH PILL_SIZE // unscaled
+// TODO:
+#define OVERLAY_WIDTH PILL_SIZE	 // unscaled
 #define OVERLAY_HEIGHT PILL_SIZE // unscaled
 #define OVERLAY_BPP 4
 #define OVERLAY_DEPTH 16
-#define OVERLAY_PITCH (OVERLAY_WIDTH * OVERLAY_BPP) // unscaled
-#define OVERLAY_RGBA_MASK 0x00ff0000,0x0000ff00,0x000000ff,0xff000000 // ARGB
+#define OVERLAY_PITCH (OVERLAY_WIDTH * OVERLAY_BPP)						 // unscaled
+#define OVERLAY_RGBA_MASK 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 // ARGB
 static struct OVL_Context {
-	SDL_Surface* overlay;
+	SDL_Surface *overlay;
 } ovl;
 
-SDL_Surface* PLAT_initOverlay(void) {
-	ovl.overlay = SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(OVERLAY_WIDTH,OVERLAY_HEIGHT),OVERLAY_DEPTH,OVERLAY_RGBA_MASK);
+SDL_Surface *PLAT_initOverlay(void)
+{
+	ovl.overlay =
+		SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(OVERLAY_WIDTH, OVERLAY_HEIGHT), OVERLAY_DEPTH, OVERLAY_RGBA_MASK);
 	return ovl.overlay;
 }
-void PLAT_quitOverlay(void) {
-	if (ovl.overlay) SDL_FreeSurface(ovl.overlay);
+void PLAT_quitOverlay(void)
+{
+	if (ovl.overlay)
+		SDL_FreeSurface(ovl.overlay);
 }
-void PLAT_enableOverlay(int enable) {
-
+void PLAT_enableOverlay(int enable)
+{
 }
 
 ///////////////////////////////
@@ -1980,21 +2022,24 @@ void PLAT_updateNetworkStatus()
 	online = 1;
 }
 
-void PLAT_getBatteryStatus(int* is_charging, int* charge) {
+void PLAT_getBatteryStatus(int *is_charging, int *charge)
+{
 	PLAT_getBatteryStatusFine(is_charging, charge);
 }
 
-void PLAT_getBatteryStatusFine(int* is_charging, int* charge)
+void PLAT_getBatteryStatusFine(int *is_charging, int *charge)
 {
 	*is_charging = 1;
 	*charge = 100;
 }
 
-void PLAT_enableBacklight(int enable) {
+void PLAT_enableBacklight(int enable)
+{
 	// buh
 }
 
-void PLAT_powerOff(int reboot) {
+void PLAT_powerOff(int reboot)
+{
 	SND_quit();
 	VIB_quit();
 	PWR_quit();
@@ -2004,19 +2049,23 @@ void PLAT_powerOff(int reboot) {
 
 ///////////////////////////////
 
-void PLAT_setCPUSpeed(int speed) {
+void PLAT_setCPUSpeed(int speed)
+{
 	// buh
 }
 
-void PLAT_setRumble(int strength) {
+void PLAT_setRumble(int strength)
+{
 	// buh
 }
 
-int PLAT_pickSampleRate(int requested, int max) {
+int PLAT_pickSampleRate(int requested, int max)
+{
 	return MIN(requested, max);
 }
 
-char* PLAT_getModel(void) {
+char *PLAT_getModel(void)
+{
 	return "Desktop";
 }
 
@@ -2025,11 +2074,13 @@ void PLAT_getOsVersionInfo(char *output_str, size_t max_len)
 	sprintf(output_str, "%s", "1.2.3");
 }
 
-int PLAT_isOnline(void) {
+int PLAT_isOnline(void)
+{
 	return online;
 }
 
-ConnectionStrength PLAT_connectionStrength(void) {
+ConnectionStrength PLAT_connectionStrength(void)
+{
 	return SIGNAL_STRENGTH_HIGH;
 }
 
@@ -2044,73 +2095,80 @@ ConnectionStrength PLAT_connectionStrength(void) {
 static char cached_timezones[MAX_TIMEZONES][MAX_TZ_LENGTH];
 static int cached_tz_count = -1;
 
-int compare_timezones(const void *a, const void *b) {
-    return strcmp((const char *)a, (const char *)b);
-}
-
-void PLAT_initTimezones() {
-    if (cached_tz_count != -1) { // Already initialized
-        return;
-    }
-    
-    FILE *file = fopen(ZONE_TAB_PATH, "r");
-    if (!file) {
-        LOG_info("Error opening file %s\n", ZONE_TAB_PATH);
-        return;
-    }
-    
-    char line[MAX_LINE_LENGTH];
-    cached_tz_count = 0;
-    
-    while (fgets(line, sizeof(line), file)) {
-        // Skip comment lines
-        if (line[0] == '#' || strlen(line) < 3) {
-            continue;
-        }
-        
-        char *token = strtok(line, "\t"); // Skip country code
-        if (!token) continue;
-        
-        token = strtok(NULL, "\t"); // Skip latitude/longitude
-        if (!token) continue;
-        
-        token = strtok(NULL, "\t\n"); // Extract timezone
-        if (!token) continue;
-        
-        // Check for duplicates before adding
-        int duplicate = 0;
-        for (int i = 0; i < cached_tz_count; i++) {
-            if (strcmp(cached_timezones[i], token) == 0) {
-                duplicate = 1;
-                break;
-            }
-        }
-        
-        if (!duplicate && cached_tz_count < MAX_TIMEZONES) {
-            strncpy(cached_timezones[cached_tz_count], token, MAX_TZ_LENGTH - 1);
-            cached_timezones[cached_tz_count][MAX_TZ_LENGTH - 1] = '\0'; // Ensure null-termination
-            cached_tz_count++;
-        }
-    }
-    
-    fclose(file);
-    
-    // Sort the list alphabetically
-    qsort(cached_timezones, cached_tz_count, MAX_TZ_LENGTH, compare_timezones);
-}
-
-void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count) {
-    if (cached_tz_count == -1) {
-        LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
-        *tz_count = 0;
-        return;
-    }
-    
-    memcpy(timezones, cached_timezones, sizeof(cached_timezones));
-    *tz_count = cached_tz_count;
-}
-
-char *PLAT_getCurrentTimezone() {
+int compare_timezones(const void *a, const void *b)
+{
+	return strcmp((const char *)a, (const char *)b);
+}
+
+void PLAT_initTimezones()
+{
+	if (cached_tz_count != -1) { // Already initialized
+		return;
+	}
+
+	FILE *file = fopen(ZONE_TAB_PATH, "r");
+	if (!file) {
+		LOG_info("Error opening file %s\n", ZONE_TAB_PATH);
+		return;
+	}
+
+	char line[MAX_LINE_LENGTH];
+	cached_tz_count = 0;
+
+	while (fgets(line, sizeof(line), file)) {
+		// Skip comment lines
+		if (line[0] == '#' || strlen(line) < 3) {
+			continue;
+		}
+
+		char *token = strtok(line, "\t"); // Skip country code
+		if (!token)
+			continue;
+
+		token = strtok(NULL, "\t"); // Skip latitude/longitude
+		if (!token)
+			continue;
+
+		token = strtok(NULL, "\t\n"); // Extract timezone
+		if (!token)
+			continue;
+
+		// Check for duplicates before adding
+		int duplicate = 0;
+		for (int i = 0; i < cached_tz_count; i++) {
+			if (strcmp(cached_timezones[i], token) == 0) {
+				duplicate = 1;
+				break;
+			}
+		}
+
+		if (!duplicate && cached_tz_count < MAX_TIMEZONES) {
+			strncpy(cached_timezones[cached_tz_count], token, MAX_TZ_LENGTH - 1);
+			cached_timezones[cached_tz_count][MAX_TZ_LENGTH - 1] = '\0'; // Ensure null-termination
+			cached_tz_count++;
+		}
+	}
+
+	fclose(file);
+
+	// Sort the list alphabetically
+	qsort(cached_timezones, cached_tz_count, MAX_TZ_LENGTH, compare_timezones);
+}
+
+void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count)
+{
+	if (cached_tz_count == -1) {
+		LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
+		*tz_count = 0;
+		return;
+	}
+
+	memcpy(timezones, cached_timezones, sizeof(cached_timezones));
+	*tz_count = cached_tz_count;
+}
+
+char *PLAT_getCurrentTimezone()
+{
 	// call readlink -f /tmp/localtime to get the current timezone path, and
 	// then remove /usr/share/zoneinfo/ from the beginning of the path to get the timezone name.
 	char *tz_path = (char *)malloc(256);
@@ -2131,12 +2189,12 @@ char *PLAT_getCurrentTimezone() {
 	}
 }
 
-void PLAT_setCurrentTimezone(const char* tz) {
+void PLAT_setCurrentTimezone(const char *tz)
+{
 	return;
-	if (cached_tz_count == -1)
-	{
+	if (cached_tz_count == -1) {
 		LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
-        return;
+		return;
 	}
 
 	// tzset()
@@ -2158,12 +2216,23 @@ void PLAT_setCurrentTimezone(const char* tz) {
 
 /////////////////////
 
- void PLAT_wifiInit() {}
- bool PLAT_hasWifi() { return true; }
- bool PLAT_wifiEnabled() { return true; }
- void PLAT_wifiEnable(bool on) {}
+void PLAT_wifiInit()
+{
+}
+bool PLAT_hasWifi()
+{
+	return true;
+}
+bool PLAT_wifiEnabled()
+{
+	return true;
+}
+void PLAT_wifiEnable(bool on)
+{
+}
 
- int PLAT_wifiScan(struct WIFI_network *networks, int max) {
+int PLAT_wifiScan(struct WIFI_network *networks, int max)
+{
 	for (int i = 0; i < 5; i++) {
 		struct WIFI_network *network = &networks[i];
 
@@ -2174,16 +2243,31 @@ void PLAT_setCurrentTimezone(const char* tz) {
 		network->security = i % 2 ? SECURITY_WPA2_PSK : SECURITY_WEP;
 	}
 	return 5;
- }
- bool PLAT_wifiConnected() { return true; }
- int PLAT_wifiConnection(struct WIFI_connection *connection_info) {
+}
+bool PLAT_wifiConnected()
+{
+	return true;
+}
+int PLAT_wifiConnection(struct WIFI_connection *connection_info)
+{
 	connection_info->freq = 2400;
 	strcpy(connection_info->ip, "127.0.0.1");
 	strcpy(connection_info->ssid, "Network1");
 	return 0;
- }
- bool PLAT_wifiHasCredentials(char *ssid, WifiSecurityType sec) { return false; }
- void PLAT_wifiForget(char *ssid, WifiSecurityType sec) {}
- void PLAT_wifiConnect(char *ssid, WifiSecurityType sec) {}
- void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char* pass) {}
- void PLAT_wifiDisconnect() {}
\ No newline at end of file
+}
+bool PLAT_wifiHasCredentials(char *ssid, WifiSecurityType sec)
+{
+	return false;
+}
+void PLAT_wifiForget(char *ssid, WifiSecurityType sec)
+{
+}
+void PLAT_wifiConnect(char *ssid, WifiSecurityType sec)
+{
+}
+void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char *pass)
+{
+}
+void PLAT_wifiDisconnect()
+{
+}
\ No newline at end of file
diff --git a/workspace/desktop/platform/platform.h b/workspace/desktop/platform/platform.h
index 7485bbf8c..0c6861fc2 100644
--- a/workspace/desktop/platform/platform.h
+++ b/workspace/desktop/platform/platform.h
@@ -9,130 +9,130 @@
 
 ///////////////////////////////
 
-#define BUTTON_UP		BUTTON_NA
-#define BUTTON_DOWN		BUTTON_NA
-#define BUTTON_LEFT		BUTTON_NA
-#define BUTTON_RIGHT	BUTTON_NA
-
-#define BUTTON_SELECT	BUTTON_NA
-#define BUTTON_START	BUTTON_NA
-
-#define BUTTON_A		BUTTON_NA
-#define BUTTON_B		BUTTON_NA
-#define BUTTON_X		BUTTON_NA
-#define BUTTON_Y		BUTTON_NA
-
-#define BUTTON_L1		BUTTON_NA
-#define BUTTON_R1		BUTTON_NA
-#define BUTTON_L2		BUTTON_NA
-#define BUTTON_R2		BUTTON_NA
-#define BUTTON_L3		BUTTON_NA
-#define BUTTON_R3		BUTTON_NA
-
-#define BUTTON_MENU		BUTTON_NA
-#define BUTTON_MENU_ALT	BUTTON_NA
-#define	BUTTON_POWER	BUTTON_NA
-#define	BUTTON_PLUS		BUTTON_NA
-#define	BUTTON_MINUS	BUTTON_NA
+#define BUTTON_UP BUTTON_NA
+#define BUTTON_DOWN BUTTON_NA
+#define BUTTON_LEFT BUTTON_NA
+#define BUTTON_RIGHT BUTTON_NA
+
+#define BUTTON_SELECT BUTTON_NA
+#define BUTTON_START BUTTON_NA
+
+#define BUTTON_A BUTTON_NA
+#define BUTTON_B BUTTON_NA
+#define BUTTON_X BUTTON_NA
+#define BUTTON_Y BUTTON_NA
+
+#define BUTTON_L1 BUTTON_NA
+#define BUTTON_R1 BUTTON_NA
+#define BUTTON_L2 BUTTON_NA
+#define BUTTON_R2 BUTTON_NA
+#define BUTTON_L3 BUTTON_NA
+#define BUTTON_R3 BUTTON_NA
+
+#define BUTTON_MENU BUTTON_NA
+#define BUTTON_MENU_ALT BUTTON_NA
+#define BUTTON_POWER BUTTON_NA
+#define BUTTON_PLUS BUTTON_NA
+#define BUTTON_MINUS BUTTON_NA
 
 ///////////////////////////////
 
 // see https://wiki.libsdl.org/SDL2/SDL_Scancode
 
-#define CODE_UP			82 // Up Arrow
-#define CODE_DOWN		81 // Down Arrow
-#define CODE_LEFT		80 // Left Arrow
-#define CODE_RIGHT		79 // Right Arrow
+#define CODE_UP 82	  // Up Arrow
+#define CODE_DOWN 81  // Down Arrow
+#define CODE_LEFT 80  // Left Arrow
+#define CODE_RIGHT 79 // Right Arrow
 
-#define CODE_SELECT		53 // ^
-#define CODE_START		40 // Return
+#define CODE_SELECT 53 // ^
+#define CODE_START 40  // Return
 
-#define CODE_A			22 // S
-#define CODE_B			4  // A
-#define CODE_X			26 // W
-#define CODE_Y			20 // Q
+#define CODE_A 22 // S
+#define CODE_B 4  // A
+#define CODE_X 26 // W
+#define CODE_Y 20 // Q
 
-#define CODE_L1			CODE_NA
-#define CODE_R1			CODE_NA
-#define CODE_L2			CODE_NA
-#define CODE_R2			CODE_NA
-#define CODE_L3			CODE_NA
-#define CODE_R3			CODE_NA
+#define CODE_L1 CODE_NA
+#define CODE_R1 CODE_NA
+#define CODE_L2 CODE_NA
+#define CODE_R2 CODE_NA
+#define CODE_L3 CODE_NA
+#define CODE_R3 CODE_NA
 
-#define CODE_MENU		44 // Space
-#define CODE_POWER		42 // Backspace
+#define CODE_MENU 44  // Space
+#define CODE_POWER 42 // Backspace
 
-#define CODE_PLUS		CODE_NA
-#define CODE_MINUS		CODE_NA
+#define CODE_PLUS CODE_NA
+#define CODE_MINUS CODE_NA
 
 ///////////////////////////////
-						// HATS
-#define JOY_UP			JOY_NA
-#define JOY_DOWN		JOY_NA
-#define JOY_LEFT		JOY_NA
-#define JOY_RIGHT		JOY_NA
+// HATS
+#define JOY_UP JOY_NA
+#define JOY_DOWN JOY_NA
+#define JOY_LEFT JOY_NA
+#define JOY_RIGHT JOY_NA
 
-#define JOY_SELECT		JOY_NA
-#define JOY_START		JOY_NA
+#define JOY_SELECT JOY_NA
+#define JOY_START JOY_NA
 
 // TODO: these ended up swapped in the first public release of stock :sob:
-#define JOY_A			JOY_NA
-#define JOY_B			JOY_NA
-#define JOY_X			JOY_NA
-#define JOY_Y			JOY_NA
-
-#define JOY_L1			JOY_NA
-#define JOY_R1			JOY_NA
-#define JOY_L2			JOY_NA
-#define JOY_R2			JOY_NA
-#define JOY_L3			JOY_NA
-#define JOY_R3			JOY_NA
-
-#define JOY_MENU		JOY_NA
-#define JOY_POWER		JOY_NA
-#define JOY_PLUS		JOY_NA
-#define JOY_MINUS		JOY_NA
+#define JOY_A JOY_NA
+#define JOY_B JOY_NA
+#define JOY_X JOY_NA
+#define JOY_Y JOY_NA
+
+#define JOY_L1 JOY_NA
+#define JOY_R1 JOY_NA
+#define JOY_L2 JOY_NA
+#define JOY_R2 JOY_NA
+#define JOY_L3 JOY_NA
+#define JOY_R3 JOY_NA
+
+#define JOY_MENU JOY_NA
+#define JOY_POWER JOY_NA
+#define JOY_PLUS JOY_NA
+#define JOY_MINUS JOY_NA
 
 ///////////////////////////////
 
-#define BTN_RESUME			BTN_X
-#define BTN_SLEEP 			BTN_POWER
-#define BTN_WAKE 			BTN_POWER
-#define BTN_MOD_VOLUME 		BTN_NONE
-#define BTN_MOD_COLORTEMP	BTN_NONE
-#define BTN_MOD_BRIGHTNESS 	BTN_MENU
-#define BTN_MOD_PLUS 		BTN_PLUS
-#define BTN_MOD_MINUS 		BTN_MINUS
+#define BTN_RESUME BTN_X
+#define BTN_SLEEP BTN_POWER
+#define BTN_WAKE BTN_POWER
+#define BTN_MOD_VOLUME BTN_NONE
+#define BTN_MOD_COLORTEMP BTN_NONE
+#define BTN_MOD_BRIGHTNESS BTN_MENU
+#define BTN_MOD_PLUS BTN_PLUS
+#define BTN_MOD_MINUS BTN_MINUS
 
 ///////////////////////////////
 
 // average smallish screen
-//#define FIXED_SCALE 	2
-//#define FIXED_WIDTH		640
-//#define FIXED_HEIGHT	480
-//#define MAIN_ROW_COUNT 6
-//#define PADDING 10
+// #define FIXED_SCALE 	2
+// #define FIXED_WIDTH		640
+// #define FIXED_HEIGHT	480
+// #define MAIN_ROW_COUNT 6
+// #define PADDING 10
 
 // emulate Brick
-#define FIXED_SCALE 	3
-#define FIXED_WIDTH		1024
-#define FIXED_HEIGHT	768
+#define FIXED_SCALE 3
+#define FIXED_WIDTH 1024
+#define FIXED_HEIGHT 768
 #define MAIN_ROW_COUNT 7
 #define QUICK_SWITCHER_COUNT 3
 #define PADDING 5
 
 // emulate TSP
-//#define FIXED_SCALE 	2
-//#define FIXED_WIDTH		1280
-//#define FIXED_HEIGHT	720
-//#define MAIN_ROW_COUNT  10
-//#define QUICK_SWITCHER_COUNT 4
-//#define PADDING 10
-
-#define FIXED_BPP		2
-#define FIXED_DEPTH		(FIXED_BPP * 8)
-#define FIXED_PITCH		(FIXED_WIDTH * FIXED_BPP)
-#define FIXED_SIZE		(FIXED_PITCH * FIXED_HEIGHT)
+// #define FIXED_SCALE 	2
+// #define FIXED_WIDTH		1280
+// #define FIXED_HEIGHT	720
+// #define MAIN_ROW_COUNT  10
+// #define QUICK_SWITCHER_COUNT 4
+// #define PADDING 10
+
+#define FIXED_BPP 2
+#define FIXED_DEPTH (FIXED_BPP * 8)
+#define FIXED_PITCH (FIXED_WIDTH * FIXED_BPP)
+#define FIXED_SIZE (FIXED_PITCH * FIXED_HEIGHT)
 
 // #define HAS_HDMI	1
 // #define HDMI_WIDTH 	1280
@@ -143,7 +143,6 @@
 ///////////////////////////////
 
 
-
 ///////////////////////////////
 
 #define SDCARD_PATH "/Library/Developer/Projects/private/MinUI_FAKESD"
diff --git a/workspace/tg5040/audiomon/audiomon.cpp b/workspace/tg5040/audiomon/audiomon.cpp
index c905ec4e1..87fba2ca1 100644
--- a/workspace/tg5040/audiomon/audiomon.cpp
+++ b/workspace/tg5040/audiomon/audiomon.cpp
@@ -17,435 +17,453 @@
 #include <syslog.h>
 #include <errno.h>
 
-extern "C"
-{
+extern "C" {
 #include "msettings.h"
 }
 
 #define AUDIO_FILE "/mnt/SDCARD/.userdata/tg5040/.asoundrc"
 #define UUID_A2DP "0000110b-0000-1000-8000-00805f9b34fb"
 
-enum DeviceType {
-    DEVICE_BLUETOOTH,
-    DEVICE_USB_AUDIO
-};
+enum DeviceType { DEVICE_BLUETOOTH, DEVICE_USB_AUDIO };
 
 bool use_syslog = false;
 bool running = true;
 
-void log(const std::string& msg) {
-    if (use_syslog) syslog(LOG_INFO, "%s", msg.c_str());
-    else std::cout << msg << std::endl;
+void log(const std::string &msg)
+{
+	if (use_syslog)
+		syslog(LOG_INFO, "%s", msg.c_str());
+	else
+		std::cout << msg << std::endl;
 }
 
-void ensureDirExists(const std::string& path) {
-    mkdir(path.c_str(), 0755);
+void ensureDirExists(const std::string &path)
+{
+	mkdir(path.c_str(), 0755);
 }
 
-void writeAudioFile(const std::string& device_identifier, DeviceType type) {
-    ensureDirExists("/mnt/SDCARD/.userdata/tg5040");
-    std::ofstream f(AUDIO_FILE);
-    if (!f) {
-        log("Failed to write audio config file");
-        return;
-    }
-
-    if (type == DEVICE_BLUETOOTH) {
-        // Bluetooth A2DP configuration
-        f << "defaults.bluealsa.device \"" << device_identifier << "\"\n\n"
-          << "pcm.!default {\n"
-          << "    type plug\n"
-          << "    slave.pcm {\n"
-          << "        type bluealsa\n"
-          << "        device \"" << device_identifier << "\"\n"
-          << "        profile \"a2dp\"\n"
-          << "        delay 0\n"
-          << "    }\n"
-          << "}\n"
-          << "ctl.!default {\n"
-          << "    type bluealsa\n"
-          << "}\n";
-        log("Updated .asoundrc with Bluetooth device: " + device_identifier);
-    } else if (type == DEVICE_USB_AUDIO) {
-        // USB Audio configuration using ALSA card
-        f << "pcm.!default {\n"
-          << "    type hw\n"
-          << "    card " << device_identifier << "\n"
-          << "}\n"
-          << "ctl.!default {\n"
-          << "    type hw\n"
-          << "    card " << device_identifier << "\n"
-          << "}\n";
-        log("Updated .asoundrc with USB audio device: " + device_identifier);
-    }
-
-    f.flush(); // flush C++ stream buffer
-
-    // Ensure it's flushed to disk
-    int fd = ::open(AUDIO_FILE, O_WRONLY);
-    if (fd >= 0) {
-        fsync(fd);
-        close(fd);
-    }
+void writeAudioFile(const std::string &device_identifier, DeviceType type)
+{
+	ensureDirExists("/mnt/SDCARD/.userdata/tg5040");
+	std::ofstream f(AUDIO_FILE);
+	if (!f) {
+		log("Failed to write audio config file");
+		return;
+	}
+
+	if (type == DEVICE_BLUETOOTH) {
+		// Bluetooth A2DP configuration
+		f << "defaults.bluealsa.device \"" << device_identifier << "\"\n\n"
+		  << "pcm.!default {\n"
+		  << "    type plug\n"
+		  << "    slave.pcm {\n"
+		  << "        type bluealsa\n"
+		  << "        device \"" << device_identifier << "\"\n"
+		  << "        profile \"a2dp\"\n"
+		  << "        delay 0\n"
+		  << "    }\n"
+		  << "}\n"
+		  << "ctl.!default {\n"
+		  << "    type bluealsa\n"
+		  << "}\n";
+		log("Updated .asoundrc with Bluetooth device: " + device_identifier);
+	} else if (type == DEVICE_USB_AUDIO) {
+		// USB Audio configuration using ALSA card
+		f << "pcm.!default {\n"
+		  << "    type hw\n"
+		  << "    card " << device_identifier << "\n"
+		  << "}\n"
+		  << "ctl.!default {\n"
+		  << "    type hw\n"
+		  << "    card " << device_identifier << "\n"
+		  << "}\n";
+		log("Updated .asoundrc with USB audio device: " + device_identifier);
+	}
+
+	f.flush(); // flush C++ stream buffer
+
+	// Ensure it's flushed to disk
+	int fd = ::open(AUDIO_FILE, O_WRONLY);
+	if (fd >= 0) {
+		fsync(fd);
+		close(fd);
+	}
 }
 
-void clearAudioFile() {
-    if (unlink(AUDIO_FILE) == 0) {
-        log("Removed audio config");
-        // Ensure it's flushed to disk
-        int dfd = open("/mnt/SDCARD/.userdata/tg5040", O_DIRECTORY);
-        fsync(dfd); // sync the directory entry removal
-        close(dfd);
-    } else {
-        log("Audio config file not present or failed to remove");
-    }
+void clearAudioFile()
+{
+	if (unlink(AUDIO_FILE) == 0) {
+		log("Removed audio config");
+		// Ensure it's flushed to disk
+		int dfd = open("/mnt/SDCARD/.userdata/tg5040", O_DIRECTORY);
+		fsync(dfd); // sync the directory entry removal
+		close(dfd);
+	} else {
+		log("Audio config file not present or failed to remove");
+	}
 }
 
-std::string pathToMac(const std::string& path) {
-    auto pos = path.find("dev_");
-    if (pos == std::string::npos) return "";
-    std::string mac = path.substr(pos + 4);
-    for (auto& c : mac) if (c == '_') c = ':';
-    return mac;
+std::string pathToMac(const std::string &path)
+{
+	auto pos = path.find("dev_");
+	if (pos == std::string::npos)
+		return "";
+	std::string mac = path.substr(pos + 4);
+	for (auto &c : mac)
+		if (c == '_')
+			c = ':';
+	return mac;
 }
 
-std::string getUsbAudioCardNumber(struct udev_device* dev) {
-    // Look for the card number in the device path or properties
-    const char* devnode = udev_device_get_devnode(dev);
-    if (!devnode) return "";
-    
-    // Extract card number from device node like /dev/snd/controlC1
-    std::string devnode_str(devnode);
-    auto pos = devnode_str.find("controlC");
-    if (pos != std::string::npos) {
-        return devnode_str.substr(pos + 8); // Extract number after "controlC"
-    }
-    
-    // Alternative: check ALSA card property
-    const char* card = udev_device_get_property_value(dev, "SOUND_CARD");
-    if (card) return std::string(card);
-    
-    return "";
+std::string getUsbAudioCardNumber(struct udev_device *dev)
+{
+	// Look for the card number in the device path or properties
+	const char *devnode = udev_device_get_devnode(dev);
+	if (!devnode)
+		return "";
+
+	// Extract card number from device node like /dev/snd/controlC1
+	std::string devnode_str(devnode);
+	auto pos = devnode_str.find("controlC");
+	if (pos != std::string::npos) {
+		return devnode_str.substr(pos + 8); // Extract number after "controlC"
+	}
+
+	// Alternative: check ALSA card property
+	const char *card = udev_device_get_property_value(dev, "SOUND_CARD");
+	if (card)
+		return std::string(card);
+
+	return "";
 }
 
-bool isUsbAudioDevice(struct udev_device* dev) {
-    const char* subsystem = udev_device_get_subsystem(dev);
-    const char* devnode = udev_device_get_devnode(dev);
-    const char* devpath = udev_device_get_devpath(dev);
-    
-    if (!subsystem || strcmp(subsystem, "sound") != 0) {
-        return false;
-    }
-    
-    if (!devnode) {
-        return false;
-    }
-    
-    // Check if it's a control device (indicates audio capability)
-    std::string devnode_str(devnode);
-    if (devnode_str.find("controlC") == std::string::npos) {
-        return false;
-    }
-    
-    // Check if it's USB-connected by looking at the device path
-    if (devpath && strstr(devpath, "usb")) {
-        return true;
-    }
-    
-    return false;
+bool isUsbAudioDevice(struct udev_device *dev)
+{
+	const char *subsystem = udev_device_get_subsystem(dev);
+	const char *devnode = udev_device_get_devnode(dev);
+	const char *devpath = udev_device_get_devpath(dev);
+
+	if (!subsystem || strcmp(subsystem, "sound") != 0) {
+		return false;
+	}
+
+	if (!devnode) {
+		return false;
+	}
+
+	// Check if it's a control device (indicates audio capability)
+	std::string devnode_str(devnode);
+	if (devnode_str.find("controlC") == std::string::npos) {
+		return false;
+	}
+
+	// Check if it's USB-connected by looking at the device path
+	if (devpath && strstr(devpath, "usb")) {
+		return true;
+	}
+
+	return false;
 }
 
-bool hasUUID(DBusConnection* conn, const std::string& path, const std::string& uuid) {
-    DBusMessage* msg = dbus_message_new_method_call("org.bluez", path.c_str(), "org.freedesktop.DBus.Properties", "Get");
-    if (!msg) return false;
-
-    const char* iface = "org.bluez.Device1";
-    const char* prop = "UUIDs";
-
-    dbus_message_append_args(msg,
-        DBUS_TYPE_STRING, &iface,
-        DBUS_TYPE_STRING, &prop,
-        DBUS_TYPE_INVALID);
-
-    DBusMessage* reply = dbus_connection_send_with_reply_and_block(conn, msg, 1000, nullptr);
-    dbus_message_unref(msg);
-    if (!reply) return false;
-
-    DBusMessageIter iter;
-    dbus_message_iter_init(reply, &iter);
-    DBusMessageIter variant;
-    dbus_message_iter_recurse(&iter, &variant);
-
-    if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_ARRAY) {
-        dbus_message_unref(reply);
-        return false;
-    }
-
-    DBusMessageIter array;
-    dbus_message_iter_recurse(&variant, &array);
-
-    while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_STRING) {
-        const char* val;
-        dbus_message_iter_get_basic(&array, &val);
-        if (uuid == val) {
-            dbus_message_unref(reply);
-            return true;
-        }
-        dbus_message_iter_next(&array);
-    }
-
-    dbus_message_unref(reply);
-    return false;
+bool hasUUID(DBusConnection *conn, const std::string &path, const std::string &uuid)
+{
+	DBusMessage *msg =
+		dbus_message_new_method_call("org.bluez", path.c_str(), "org.freedesktop.DBus.Properties", "Get");
+	if (!msg)
+		return false;
+
+	const char *iface = "org.bluez.Device1";
+	const char *prop = "UUIDs";
+
+	dbus_message_append_args(msg, DBUS_TYPE_STRING, &iface, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
+
+	DBusMessage *reply = dbus_connection_send_with_reply_and_block(conn, msg, 1000, nullptr);
+	dbus_message_unref(msg);
+	if (!reply)
+		return false;
+
+	DBusMessageIter iter;
+	dbus_message_iter_init(reply, &iter);
+	DBusMessageIter variant;
+	dbus_message_iter_recurse(&iter, &variant);
+
+	if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_ARRAY) {
+		dbus_message_unref(reply);
+		return false;
+	}
+
+	DBusMessageIter array;
+	dbus_message_iter_recurse(&variant, &array);
+
+	while (dbus_message_iter_get_arg_type(&array) == DBUS_TYPE_STRING) {
+		const char *val;
+		dbus_message_iter_get_basic(&array, &val);
+		if (uuid == val) {
+			dbus_message_unref(reply);
+			return true;
+		}
+		dbus_message_iter_next(&array);
+	}
+
+	dbus_message_unref(reply);
+	return false;
 }
 
-void handleDeviceConnected(DBusConnection* conn, const std::string& path) {
-    std::string mac = pathToMac(path);
-    if (hasUUID(conn, path, UUID_A2DP)) {
-        log("Audio device connected: " + mac);
-        writeAudioFile(mac, DEVICE_BLUETOOTH);
-        SetAudioSink(AUDIO_SINK_BLUETOOTH);
-    } else {
-        log("Non-audio device connected: " + mac);
-    }
+void handleDeviceConnected(DBusConnection *conn, const std::string &path)
+{
+	std::string mac = pathToMac(path);
+	if (hasUUID(conn, path, UUID_A2DP)) {
+		log("Audio device connected: " + mac);
+		writeAudioFile(mac, DEVICE_BLUETOOTH);
+		SetAudioSink(AUDIO_SINK_BLUETOOTH);
+	} else {
+		log("Non-audio device connected: " + mac);
+	}
 }
 
-void handleDeviceDisconnected(DBusConnection* conn, const std::string& path) {
-    std::string mac = pathToMac(path);
-    if (hasUUID(conn, path, UUID_A2DP)) {
-        log("Audio device disconnected: " + mac);
-        clearAudioFile();
-        // TODO: we could maintain a stack here, if USBC was connected before and restore that instead
-        SetAudioSink(AUDIO_SINK_DEFAULT);
-    }
+void handleDeviceDisconnected(DBusConnection *conn, const std::string &path)
+{
+	std::string mac = pathToMac(path);
+	if (hasUUID(conn, path, UUID_A2DP)) {
+		log("Audio device disconnected: " + mac);
+		clearAudioFile();
+		// TODO: we could maintain a stack here, if USBC was connected before and restore that instead
+		SetAudioSink(AUDIO_SINK_DEFAULT);
+	}
 }
 
-void handleUsbAudioConnected(struct udev_device* dev) {
-    std::string card = getUsbAudioCardNumber(dev);
-    if (!card.empty()) {
-        log("USB audio device connected: card " + card);
-        writeAudioFile(card, DEVICE_USB_AUDIO);
-        SetAudioSink(AUDIO_SINK_USBDAC);
-    }
+void handleUsbAudioConnected(struct udev_device *dev)
+{
+	std::string card = getUsbAudioCardNumber(dev);
+	if (!card.empty()) {
+		log("USB audio device connected: card " + card);
+		writeAudioFile(card, DEVICE_USB_AUDIO);
+		SetAudioSink(AUDIO_SINK_USBDAC);
+	}
 }
 
-void handleUsbAudioDisconnected(struct udev_device* dev) {
-    std::string card = getUsbAudioCardNumber(dev);
-    if (!card.empty()) {
-        log("USB audio device disconnected: card " + card);
-        clearAudioFile();
-        // TODO: we could maintain a stack here, if BT was connected before and restore that instead
-        SetAudioSink(AUDIO_SINK_DEFAULT);
-    }
+void handleUsbAudioDisconnected(struct udev_device *dev)
+{
+	std::string card = getUsbAudioCardNumber(dev);
+	if (!card.empty()) {
+		log("USB audio device disconnected: card " + card);
+		clearAudioFile();
+		// TODO: we could maintain a stack here, if BT was connected before and restore that instead
+		SetAudioSink(AUDIO_SINK_DEFAULT);
+	}
 }
 
-void signalHandler(int sig) {
-    running = false;
+void signalHandler(int sig)
+{
+	running = false;
 }
 
-void scanExistingUsbAudioDevices(struct udev* udev) {
-    log("Scanning for existing USB audio devices...");
-    
-    struct udev_enumerate* enumerate = udev_enumerate_new(udev);
-    if (!enumerate) {
-        log("Failed to create udev enumerator");
-        return;
-    }
-    
-    // Filter for sound subsystem
-    udev_enumerate_add_match_subsystem(enumerate, "sound");
-    udev_enumerate_scan_devices(enumerate);
-    
-    struct udev_list_entry* devices = udev_enumerate_get_list_entry(enumerate);
-    struct udev_list_entry* entry;
-    
-    udev_list_entry_foreach(entry, devices) {
-        const char* path = udev_list_entry_get_name(entry);
-        struct udev_device* dev = udev_device_new_from_syspath(udev, path);
-        
-        if (dev) {
-            if (isUsbAudioDevice(dev)) {
-                log("Found existing USB audio device at startup");
-                handleUsbAudioConnected(dev);
-            }
-            udev_device_unref(dev);
-        }
-    }
-    
-    udev_enumerate_unref(enumerate);
-    log("Finished scanning for existing USB audio devices");
+void scanExistingUsbAudioDevices(struct udev *udev)
+{
+	log("Scanning for existing USB audio devices...");
+
+	struct udev_enumerate *enumerate = udev_enumerate_new(udev);
+	if (!enumerate) {
+		log("Failed to create udev enumerator");
+		return;
+	}
+
+	// Filter for sound subsystem
+	udev_enumerate_add_match_subsystem(enumerate, "sound");
+	udev_enumerate_scan_devices(enumerate);
+
+	struct udev_list_entry *devices = udev_enumerate_get_list_entry(enumerate);
+	struct udev_list_entry *entry;
+
+	udev_list_entry_foreach(entry, devices)
+	{
+		const char *path = udev_list_entry_get_name(entry);
+		struct udev_device *dev = udev_device_new_from_syspath(udev, path);
+
+		if (dev) {
+			if (isUsbAudioDevice(dev)) {
+				log("Found existing USB audio device at startup");
+				handleUsbAudioConnected(dev);
+			}
+			udev_device_unref(dev);
+		}
+	}
+
+	udev_enumerate_unref(enumerate);
+	log("Finished scanning for existing USB audio devices");
 }
 
-int main(int argc, char* argv[]) {
-    if (argc > 1 && std::string(argv[1]) == "-s") {
-        use_syslog = true;
-        openlog("audiomon", LOG_PID | LOG_CONS, LOG_USER);
-    }
-
-    InitSettings();
-    // This will be updated as soon as something connects
-    SetAudioSink(AUDIO_SINK_DEFAULT);
-
-    signal(SIGINT, signalHandler);
-    signal(SIGTERM, signalHandler);
-
-    // Initialize D-Bus
-    DBusError err;
-    dbus_error_init(&err);
-
-    DBusConnection* conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
-    if (!conn) {
-        log("Failed to connect to system D-Bus");
-        return 1;
-    }
-    log("Connected to system D-Bus");
-
-    dbus_bus_add_match(conn,
-        "type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'",
-        nullptr);
-    dbus_connection_flush(conn);
-
-    // Initialize udev
-    struct udev* udev = udev_new();
-    if (!udev) {
-        log("Failed to create udev context");
-        return 1;
-    }
-
-    // Try both kernel and udev events
-    struct udev_monitor* mon = udev_monitor_new_from_netlink(udev, "kernel");
-    if (!mon) {
-        log("Failed to create kernel udev monitor, trying udev monitor");
-        mon = udev_monitor_new_from_netlink(udev, "udev");
-        if (!mon) {
-            log("Failed to create udev monitor");
-            udev_unref(udev);
-            return 1;
-        }
-    }
-
-    // Don't filter initially - let's see all events
-    // udev_monitor_filter_add_match_subsystem_devtype(mon, "sound", NULL);
-    udev_monitor_enable_receiving(mon);
-    
-    // Scan for existing USB audio devices before starting event monitoring
-    scanExistingUsbAudioDevices(udev);
-    
-    int udev_fd = udev_monitor_get_fd(mon);
-    int dbus_fd = -1;
-    
-    // Try to get D-Bus file descriptor
-    if (!dbus_connection_get_unix_fd(conn, &dbus_fd)) {
-        log("Warning: Could not get D-Bus file descriptor, will use polling");
-        dbus_fd = -1;
-    }
-    
-    log("Monitoring for Bluetooth and USB audio device events");
-
-    while (running) {
-        fd_set readfds;
-        FD_ZERO(&readfds);
-        
-        // Add D-Bus file descriptor
-        if (dbus_fd >= 0) {
-            FD_SET(dbus_fd, &readfds);
-        }
-        
-        // Add udev file descriptor
-        FD_SET(udev_fd, &readfds);
-        
-        int max_fd = (dbus_fd > udev_fd) ? dbus_fd : udev_fd;
-        
-        struct timeval timeout;
-        timeout.tv_sec = 1;
-        timeout.tv_usec = 0;
-        
-        int ret = select(max_fd + 1, &readfds, NULL, NULL, &timeout);
-        
-        if (ret < 0) {
-            if (errno == EINTR) continue;
-            log("select() error");
-            break;
-        }
-        
-        // Handle D-Bus events
-        if (dbus_fd >= 0 && FD_ISSET(dbus_fd, &readfds)) {
-            dbus_connection_read_write(conn, 0);
-            DBusMessage* msg = dbus_connection_pop_message(conn);
-            if (msg) {
-                if (dbus_message_is_signal(msg, "org.freedesktop.DBus.Properties", "PropertiesChanged")) {
-                    const char* path = dbus_message_get_path(msg);
-                    if (path && std::string(path).find("dev_") != std::string::npos) {
-
-                        DBusMessageIter args;
-                        dbus_message_iter_init(msg, &args);
-
-                        const char* iface = nullptr;
-                        dbus_message_iter_get_basic(&args, &iface);
-                        if (iface && std::string(iface) == "org.bluez.Device1") {
-
-                            dbus_message_iter_next(&args);
-                            if (dbus_message_iter_get_arg_type(&args) == DBUS_TYPE_ARRAY) {
-                                DBusMessageIter changed;
-                                dbus_message_iter_recurse(&args, &changed);
-
-                                while (dbus_message_iter_get_arg_type(&changed) == DBUS_TYPE_DICT_ENTRY) {
-                                    DBusMessageIter dict;
-                                    dbus_message_iter_recurse(&changed, &dict);
-
-                                    const char* key;
-                                    dbus_message_iter_get_basic(&dict, &key);
-
-                                    if (std::string(key) == "Connected") {
-                                        dbus_message_iter_next(&dict);
-                                        DBusMessageIter variant;
-                                        dbus_message_iter_recurse(&dict, &variant);
-                                        dbus_bool_t connected;
-                                        dbus_message_iter_get_basic(&variant, &connected);
-
-                                        if (connected)
-                                            handleDeviceConnected(conn, path);
-                                        else
-                                            handleDeviceDisconnected(conn, path);
-                                    }
-
-                                    dbus_message_iter_next(&changed);
-                                }
-                            }
-                        }
-                    }
-                }
-                dbus_message_unref(msg);
-            }
-        }
-        
-        // Handle udev events
-        if (FD_ISSET(udev_fd, &readfds)) {
-            struct udev_device* dev = udev_monitor_receive_device(mon);
-            if (dev) {
-                const char* action = udev_device_get_action(dev);
-                const char* subsystem = udev_device_get_subsystem(dev);
-                
-                // Only process sound events
-                if (subsystem && strcmp(subsystem, "sound") == 0) {
-                    if (isUsbAudioDevice(dev)) {
-                        if (action) {
-                            if (strcmp(action, "add") == 0) {
-                                handleUsbAudioConnected(dev);
-                            } else if (strcmp(action, "remove") == 0) {
-                                handleUsbAudioDisconnected(dev);
-                            }
-                        }
-                    }
-                }
-                udev_device_unref(dev);
-            }
-        }
-    }
-
-    // Cleanup
-    udev_monitor_unref(mon);
-    udev_unref(udev);
-
-    if (use_syslog) closelog();
-    return 0;
+int main(int argc, char *argv[])
+{
+	if (argc > 1 && std::string(argv[1]) == "-s") {
+		use_syslog = true;
+		openlog("audiomon", LOG_PID | LOG_CONS, LOG_USER);
+	}
+
+	InitSettings();
+	// This will be updated as soon as something connects
+	SetAudioSink(AUDIO_SINK_DEFAULT);
+
+	signal(SIGINT, signalHandler);
+	signal(SIGTERM, signalHandler);
+
+	// Initialize D-Bus
+	DBusError err;
+	dbus_error_init(&err);
+
+	DBusConnection *conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+	if (!conn) {
+		log("Failed to connect to system D-Bus");
+		return 1;
+	}
+	log("Connected to system D-Bus");
+
+	dbus_bus_add_match(conn, "type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'",
+					   nullptr);
+	dbus_connection_flush(conn);
+
+	// Initialize udev
+	struct udev *udev = udev_new();
+	if (!udev) {
+		log("Failed to create udev context");
+		return 1;
+	}
+
+	// Try both kernel and udev events
+	struct udev_monitor *mon = udev_monitor_new_from_netlink(udev, "kernel");
+	if (!mon) {
+		log("Failed to create kernel udev monitor, trying udev monitor");
+		mon = udev_monitor_new_from_netlink(udev, "udev");
+		if (!mon) {
+			log("Failed to create udev monitor");
+			udev_unref(udev);
+			return 1;
+		}
+	}
+
+	// Don't filter initially - let's see all events
+	// udev_monitor_filter_add_match_subsystem_devtype(mon, "sound", NULL);
+	udev_monitor_enable_receiving(mon);
+
+	// Scan for existing USB audio devices before starting event monitoring
+	scanExistingUsbAudioDevices(udev);
+
+	int udev_fd = udev_monitor_get_fd(mon);
+	int dbus_fd = -1;
+
+	// Try to get D-Bus file descriptor
+	if (!dbus_connection_get_unix_fd(conn, &dbus_fd)) {
+		log("Warning: Could not get D-Bus file descriptor, will use polling");
+		dbus_fd = -1;
+	}
+
+	log("Monitoring for Bluetooth and USB audio device events");
+
+	while (running) {
+		fd_set readfds;
+		FD_ZERO(&readfds);
+
+		// Add D-Bus file descriptor
+		if (dbus_fd >= 0) {
+			FD_SET(dbus_fd, &readfds);
+		}
+
+		// Add udev file descriptor
+		FD_SET(udev_fd, &readfds);
+
+		int max_fd = (dbus_fd > udev_fd) ? dbus_fd : udev_fd;
+
+		struct timeval timeout;
+		timeout.tv_sec = 1;
+		timeout.tv_usec = 0;
+
+		int ret = select(max_fd + 1, &readfds, NULL, NULL, &timeout);
+
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			log("select() error");
+			break;
+		}
+
+		// Handle D-Bus events
+		if (dbus_fd >= 0 && FD_ISSET(dbus_fd, &readfds)) {
+			dbus_connection_read_write(conn, 0);
+			DBusMessage *msg = dbus_connection_pop_message(conn);
+			if (msg) {
+				if (dbus_message_is_signal(msg, "org.freedesktop.DBus.Properties", "PropertiesChanged")) {
+					const char *path = dbus_message_get_path(msg);
+					if (path && std::string(path).find("dev_") != std::string::npos) {
+						DBusMessageIter args;
+						dbus_message_iter_init(msg, &args);
+
+						const char *iface = nullptr;
+						dbus_message_iter_get_basic(&args, &iface);
+						if (iface && std::string(iface) == "org.bluez.Device1") {
+							dbus_message_iter_next(&args);
+							if (dbus_message_iter_get_arg_type(&args) == DBUS_TYPE_ARRAY) {
+								DBusMessageIter changed;
+								dbus_message_iter_recurse(&args, &changed);
+
+								while (dbus_message_iter_get_arg_type(&changed) == DBUS_TYPE_DICT_ENTRY) {
+									DBusMessageIter dict;
+									dbus_message_iter_recurse(&changed, &dict);
+
+									const char *key;
+									dbus_message_iter_get_basic(&dict, &key);
+
+									if (std::string(key) == "Connected") {
+										dbus_message_iter_next(&dict);
+										DBusMessageIter variant;
+										dbus_message_iter_recurse(&dict, &variant);
+										dbus_bool_t connected;
+										dbus_message_iter_get_basic(&variant, &connected);
+
+										if (connected)
+											handleDeviceConnected(conn, path);
+										else
+											handleDeviceDisconnected(conn, path);
+									}
+
+									dbus_message_iter_next(&changed);
+								}
+							}
+						}
+					}
+				}
+				dbus_message_unref(msg);
+			}
+		}
+
+		// Handle udev events
+		if (FD_ISSET(udev_fd, &readfds)) {
+			struct udev_device *dev = udev_monitor_receive_device(mon);
+			if (dev) {
+				const char *action = udev_device_get_action(dev);
+				const char *subsystem = udev_device_get_subsystem(dev);
+
+				// Only process sound events
+				if (subsystem && strcmp(subsystem, "sound") == 0) {
+					if (isUsbAudioDevice(dev)) {
+						if (action) {
+							if (strcmp(action, "add") == 0) {
+								handleUsbAudioConnected(dev);
+							} else if (strcmp(action, "remove") == 0) {
+								handleUsbAudioDisconnected(dev);
+							}
+						}
+					}
+				}
+				udev_device_unref(dev);
+			}
+		}
+	}
+
+	// Cleanup
+	udev_monitor_unref(mon);
+	udev_unref(udev);
+
+	if (use_syslog)
+		closelog();
+	return 0;
 }
diff --git a/workspace/tg5040/btmanager/src/include/bt_dev_list.h b/workspace/tg5040/btmanager/src/include/bt_dev_list.h
index a583f3da8..2459d8305 100644
--- a/workspace/tg5040/btmanager/src/include/bt_dev_list.h
+++ b/workspace/tg5040/btmanager/src/include/bt_dev_list.h
@@ -24,7 +24,7 @@ typedef struct dev_list_t {
 	pthread_mutex_t lock;
 } dev_list_t;
 
-int btmg_dev_list_add_device(dev_list_t *dev_list,const char *name,const char *addr);
+int btmg_dev_list_add_device(dev_list_t *dev_list, const char *name, const char *addr);
 dev_node_t *btmg_dev_list_find_device(dev_list_t *dev_list, const char *addr);
 bool btmg_dev_list_remove_device(dev_list_t *dev_list, const char *addr);
 dev_list_t *btmg_dev_list_new();
diff --git a/workspace/tg5040/btmanager/src/include/bt_log.h b/workspace/tg5040/btmanager/src/include/bt_log.h
index 1afb5fc6d..0465d78b8 100644
--- a/workspace/tg5040/btmanager/src/include/bt_log.h
+++ b/workspace/tg5040/btmanager/src/include/bt_log.h
@@ -1,37 +1,37 @@
 /*
-* btmanager - bt_log.h
-*
-* Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-*
-* Author         laumy    liumingyuan@allwinnertech.com
-* verision       0.01
-* Date           2018.3.26
-*
-* History:
-*    1. date
-*    2. Author
-*    3. modification
-*/
+ * btmanager - bt_log.h
+ *
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ *
+ * Author         laumy    liumingyuan@allwinnertech.com
+ * verision       0.01
+ * Date           2018.3.26
+ *
+ * History:
+ *    1. date
+ *    2. Author
+ *    3. modification
+ */
 
 #ifndef __BT_LOG_H
 #define __BT_LOG_H
 
 #include <stdint.h>
-#include<sys/time.h>
+#include <sys/time.h>
 
 #if __cplusplus
 extern "C" {
 #endif
 
 enum ex_debug_mask {
-	EX_DBG_RING_BUFF_WRITE         = 1 << 0,
-	EX_DBG_RING_BUFF_READ          = 1 << 1,
-	EX_DBG_A2DP_SINK_RATE          = 1 << 2,
-	EX_DBG_A2DP_SOURCE_LOW_RATE    = 1 << 3,
-	EX_DBG_A2DP_SOURCE_UP_RATE     = 1 << 4,
-	EX_DBG_A2DP_SINK_DUMP_RB       = 1 << 5,
-	EX_DBG_A2DP_SINK_DUMP_HW       = 1 << 6,
-	EX_DBG_MASK_MAX                = 1 << 7,
+	EX_DBG_RING_BUFF_WRITE = 1 << 0,
+	EX_DBG_RING_BUFF_READ = 1 << 1,
+	EX_DBG_A2DP_SINK_RATE = 1 << 2,
+	EX_DBG_A2DP_SOURCE_LOW_RATE = 1 << 3,
+	EX_DBG_A2DP_SOURCE_UP_RATE = 1 << 4,
+	EX_DBG_A2DP_SINK_DUMP_RB = 1 << 5,
+	EX_DBG_A2DP_SINK_DUMP_HW = 1 << 6,
+	EX_DBG_MASK_MAX = 1 << 7,
 };
 
 extern int btmg_ex_debug_mask;
@@ -50,24 +50,24 @@ typedef int8_t s8;
 
 typedef long sys_time_t;
 
-//struct sys_time {
+// struct sys_time {
 //	sys_time_t sec;
 //	sys_time_t usec;
-//};
+// };
 
 extern int btmg_debug_level;
 extern int btmg_debug_show_keys;
 extern int btmg_debug_timestap;
 
 #ifdef __GNUC__
-#define PRINTF_FORMAT(a,b) __attribute__ ((format (printf, (a), (b))))
-#define STRUCT_PACKED __attribute__ ((packed))
+#define PRINTF_FORMAT(a, b) __attribute__((format(printf, (a), (b))))
+#define STRUCT_PACKED __attribute__((packed))
 #else
-#define PRINTF_FORMAT(a,b)
+#define PRINTF_FORMAT(a, b)
 #define STRUCT_PACKED
 #endif
 
-//typedef enum btmg_prtk_level{
+// typedef enum btmg_prtk_level{
 //	MSG_NONE = 0,
 //	MSG_ERROR,
 //	MSG_WARNING,
@@ -75,13 +75,19 @@ extern int btmg_debug_timestap;
 //	MSG_DEBUG,
 //	MSG_MSGDUMP,
 //	MSG_EXCESSIVE
-//}btmg_prtk_level;
+// }btmg_prtk_level;
 
 #ifdef CONFIG_NO_STDOUT_DEBUG
 
-#define btmg_printf(args...) do { } while (0)
-#define btmg_debug_open_file(p) do { } while (0)
-#define btmg_debug_close_file() do { } while (0)
+#define btmg_printf(args...)                                                                                           \
+	do {                                                                                                               \
+	} while (0)
+#define btmg_debug_open_file(p)                                                                                        \
+	do {                                                                                                               \
+	} while (0)
+#define btmg_debug_close_file()                                                                                        \
+	do {                                                                                                               \
+	} while (0)
 
 #else
 int btmg_debug_open_file(const char *path);
@@ -95,41 +101,31 @@ int btmg_get_ex_debug_mask(void);
 
 
 #ifdef CONFIG_DEBUG_FUNCTION_LINE
-#define btmg_printf(level,fmt,arg...) \
-	btmg_print(level,"%s:%u: " fmt "\n",__FUNCTION__,__LINE__,##arg)
+#define btmg_printf(level, fmt, arg...) btmg_print(level, "%s:%u: " fmt "\n", __FUNCTION__, __LINE__, ##arg)
 #else
-#define btmg_printf(level,fmt,arg...) \
-	btmg_print(level,fmt "\n",##arg)
+#define btmg_printf(level, fmt, arg...) btmg_print(level, fmt "\n", ##arg)
 #endif /*CONFIG_DEBUG_FUNCTION_LINE*/
 
-#define BTMG_PRTK(level,fmt,arg...) \
-	btmg_print(level,"BTMG[%s:%u]:  " fmt "",__func__,__LINE__,##arg)
+#define BTMG_PRTK(level, fmt, arg...) btmg_print(level, "BTMG[%s:%u]:  " fmt "", __func__, __LINE__, ##arg)
 
-#define BTMG_DEBUG(fmt,arg...) \
-	btmg_print(MSG_DEBUG,"BTMG[%s:%u]:  " fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_DEBUG(fmt, arg...) btmg_print(MSG_DEBUG, "BTMG[%s:%u]:  " fmt "\n", __func__, __LINE__, ##arg)
 
-#define BTMG_INFO(fmt,arg...) \
-	btmg_print(MSG_INFO,"BTMG[%s:%u]:  " fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_INFO(fmt, arg...) btmg_print(MSG_INFO, "BTMG[%s:%u]:  " fmt "\n", __func__, __LINE__, ##arg)
 
-#define BTMG_WARNG(fmt,arg...) \
-	btmg_print(MSG_WARNING,"BTMG[%s:%u]:  " fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_WARNG(fmt, arg...) btmg_print(MSG_WARNING, "BTMG[%s:%u]:  " fmt "\n", __func__, __LINE__, ##arg)
 
-#define BTMG_ERROR(fmt,arg...) \
-	btmg_print(MSG_ERROR,"BTMG[%s:%u]:  " fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_ERROR(fmt, arg...) btmg_print(MSG_ERROR, "BTMG[%s:%u]:  " fmt "\n", __func__, __LINE__, ##arg)
 
-#define BTMG_DUMP(fmt,arg...) \
-	btmg_print(MSG_MSGDUMP,"BTMG[%s:%u]:	" fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_DUMP(fmt, arg...) btmg_print(MSG_MSGDUMP, "BTMG[%s:%u]:	" fmt "\n", __func__, __LINE__, ##arg)
 
-#define BTMG_EXCESSIVE(fmt,arg...) \
-	btmg_print(MSG_EXCESSIVE,"BTMG[%s:%u]:	" fmt "\n",__func__,__LINE__,##arg)
+#define BTMG_EXCESSIVE(fmt, arg...) btmg_print(MSG_EXCESSIVE, "BTMG[%s:%u]:	" fmt "\n", __func__, __LINE__, ##arg)
 
-void btmg_print(int level, const char *fmt, ...)
-PRINTF_FORMAT(2, 3);
+void btmg_print(int level, const char *fmt, ...) PRINTF_FORMAT(2, 3);
 
-#endif/* CONFIG_NO_STDOUT_DEBUG */
+#endif /* CONFIG_NO_STDOUT_DEBUG */
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/btmanager/src/include/bt_manager.h b/workspace/tg5040/btmanager/src/include/bt_manager.h
index 4f66c54dd..205db1ce6 100644
--- a/workspace/tg5040/btmanager/src/include/bt_manager.h
+++ b/workspace/tg5040/btmanager/src/include/bt_manager.h
@@ -1,8 +1,8 @@
 /*
-* Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-* laumy  liumingyuan@allwinnertech.com
-* Date   2018.11.26
-*/
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ * laumy  liumingyuan@allwinnertech.com
+ * Date   2018.11.26
+ */
 
 #ifndef __BT_MANAGER_H
 #define __BT_MANAGER_H
@@ -18,21 +18,21 @@ extern "C" {
 #define BTMGVERSION "Version:3.0.1.202112281120"
 
 #define BT_LAST_CONNECT_FILE "/etc/bluetooth/last_connected"
-#ifndef  CONFIG_FILE_PATH
+#ifndef CONFIG_FILE_PATH
 #define CONFIG_FILE_PATH "/etc/bluetooth/aw_bluetooth"
 #endif
 
 /*GAP*/
 #define MAX_BT_NAME_LEN 248
 #define MAX_BT_ADDR_LEN 17
-#define BTMG_A2DP_SINK_ENABLE	 (1<<0)
-#define BTMG_A2DP_SOUCE_ENABLE	 (1<<1)
-#define BTMG_AVRCP_ENABLE     	 (1<<2)
-#define BTMG_HFP_HF_ENABLE    	 (1<<3)
-#define BTMG_HFP_AG_ENABLE    	 (1<<4)
-#define BTMG_GATT_SERVER_ENABLE  (1<<5)
-#define BTMG_GATT_CLIENT_ENABLE  (1<<6)
-#define BTMG_SPP_ENABLE          (1<<7)
+#define BTMG_A2DP_SINK_ENABLE (1 << 0)
+#define BTMG_A2DP_SOUCE_ENABLE (1 << 1)
+#define BTMG_AVRCP_ENABLE (1 << 2)
+#define BTMG_HFP_HF_ENABLE (1 << 3)
+#define BTMG_HFP_AG_ENABLE (1 << 4)
+#define BTMG_GATT_SERVER_ENABLE (1 << 5)
+#define BTMG_GATT_CLIENT_ENABLE (1 << 6)
+#define BTMG_SPP_ENABLE (1 << 7)
 typedef enum {
 	BTMG_A2DP_SINK = 0,
 	BTMG_A2DP_SOURCE,
@@ -46,22 +46,22 @@ typedef enum {
 	BTMG_PROFILE_MAX,
 } btmg_profile_t;
 typedef struct {
-    bool is_bt_enable_default;
-    bool is_a2dp_sink_enabled;
-    bool is_avrcp_enabled;
-    bool is_a2dp_source_enabled;
-    bool is_hfp_client_enabled;
-    bool is_hfp_ag_enabled;
-    bool is_pan_enable_default;
-    bool is_gatts_enabled;
-    bool is_gattc_enabled;
-    bool is_sppc_enabled;
-    bool is_spps_enabled;
-    bool is_hid_enable_default;
+	bool is_bt_enable_default;
+	bool is_a2dp_sink_enabled;
+	bool is_avrcp_enabled;
+	bool is_a2dp_source_enabled;
+	bool is_hfp_client_enabled;
+	bool is_hfp_ag_enabled;
+	bool is_pan_enable_default;
+	bool is_gatts_enabled;
+	bool is_gattc_enabled;
+	bool is_sppc_enabled;
+	bool is_spps_enabled;
+	bool is_hid_enable_default;
 #ifdef USE_BT_OBEX
-    bool is_obex_enabled;
-    bool is_pbap_client_enabled;
-    bool is_opp_enabled;
+	bool is_obex_enabled;
+	bool is_pbap_client_enabled;
+	bool is_opp_enabled;
 #endif
 } btmg_profile_info_t;
 typedef enum {
@@ -76,21 +76,21 @@ typedef struct {
 	btmg_scan_type_t type;
 } btmg_scan_filter_t;
 typedef enum {
-    BTMG_STATE_OFF,
-    BTMG_STATE_ON,
-    BTMG_STATE_TURNING_ON,
-    BTMG_STATE_TURNING_OFF,
+	BTMG_STATE_OFF,
+	BTMG_STATE_ON,
+	BTMG_STATE_TURNING_ON,
+	BTMG_STATE_TURNING_OFF,
 } btmg_state_t;
 typedef enum {
-    BTMG_DISC_STARTED,
-    BTMG_DISC_STOPPED_AUTO,
-    BTMG_DISC_START_FAILED,
-    BTMG_DISC_STOPPED_BY_USER,
+	BTMG_DISC_STARTED,
+	BTMG_DISC_STOPPED_AUTO,
+	BTMG_DISC_START_FAILED,
+	BTMG_DISC_STOPPED_BY_USER,
 } btmg_discovery_state_t;
 typedef enum {
-    BTMG_SCAN_MODE_NONE,
-    BTMG_SCAN_MODE_CONNECTABLE,
-    BTMG_SCAN_MODE_CONNECTABLE_DISCOVERABLE,
+	BTMG_SCAN_MODE_NONE,
+	BTMG_SCAN_MODE_CONNECTABLE,
+	BTMG_SCAN_MODE_CONNECTABLE_DISCOVERABLE,
 } btmg_discovery_mode_t;
 typedef enum {
 	BTMG_IO_CAP_KEYBOARDDISPLAY = 0,
@@ -100,28 +100,25 @@ typedef enum {
 	BTMG_IO_CAP_NOINPUTNOOUTPUT,
 } btmg_io_capability_t;
 typedef enum {
-    BTMG_BOND_STATE_NONE,
-    BTMG_BOND_STATE_BONDING,
-    BTMG_BOND_STATE_BONDED,
+	BTMG_BOND_STATE_NONE,
+	BTMG_BOND_STATE_BONDING,
+	BTMG_BOND_STATE_BONDED,
 } btmg_bond_state_t;
 typedef struct {
 	char *uuid;
 	char *uuid_name;
 } bt_dev_uuid_t;
 struct paired_dev {
-	 char *remote_address;
-	 char *remote_name;
-	 int16_t rssi;
-	 bool is_bonded;
-	 bool is_connected;
-	 int uuid_length;
-	 bt_dev_uuid_t *uuid_list;
-	 struct paired_dev *next;
+	char *remote_address;
+	char *remote_name;
+	int16_t rssi;
+	bool is_bonded;
+	bool is_connected;
+	int uuid_length;
+	bt_dev_uuid_t *uuid_list;
+	struct paired_dev *next;
 };
-typedef enum {
-	BT_PAIR_REQUEST_REJECTED,
-	BT_PAIR_REQUEST_CANCELED
-} btmg_pair_request_error_t;
+typedef enum { BT_PAIR_REQUEST_REJECTED, BT_PAIR_REQUEST_CANCELED } btmg_pair_request_error_t;
 typedef struct {
 	char *remote_address;
 	char *address_type;
@@ -137,7 +134,7 @@ typedef struct {
 	int16_t rssi;
 	char *icon;
 	bool services_resolved;
-}btmg_bt_device_t;
+} btmg_bt_device_t;
 typedef enum {
 	BTMG_BDADDR_BREDR = 0x00,
 	BTMG_BDADDR_LE_PUBLIC = 0x01,
@@ -147,7 +144,8 @@ typedef enum {
 #define BTMG_LE_ADV_CHANNEL_37 0x01
 #define BTMG_LE_ADV_CHANNEL_38 (0x01 << 1)
 #define BTMG_LE_ADV_CHANNEL_39 (0x01 << 2)
-#define BTMG_LE_ADV_CHANNEL_ALL (BTMG_LE_ADV_CHANNEL_NONE | BTMG_LE_ADV_CHANNEL_37 | BTMG_LE_ADV_CHANNEL_38 | BTMG_LE_ADV_CHANNEL_39)
+#define BTMG_LE_ADV_CHANNEL_ALL                                                                                        \
+	(BTMG_LE_ADV_CHANNEL_NONE | BTMG_LE_ADV_CHANNEL_37 | BTMG_LE_ADV_CHANNEL_38 | BTMG_LE_ADV_CHANNEL_39)
 #ifdef DBUS_LE_ADV
 typedef enum {
 	ADV_BROADCAST,
@@ -157,7 +155,7 @@ typedef struct {
 	btmg_adv_type_t type;
 	const char **service_uuid;
 	int service_uuid_len;
-	uint16_t manu_id; //Keys are the Manufacturer ID
+	uint16_t manu_id; // Keys are the Manufacturer ID
 	uint8_t *manu_data;
 	int manu_data_len;
 	const char *service_id;
@@ -184,16 +182,18 @@ typedef enum {
 	BTMG_LE_IRK_OR_RANDOM_ADDRESS = 0x03,
 } btmg_le_addr_type_t;
 typedef enum {
-	BTMG_LE_ADV_IND = 0x00, /*connectable and scannable undirected advertising*/
+	BTMG_LE_ADV_IND = 0x00,				/*connectable and scannable undirected advertising*/
 	BTMG_LE_ADV_DIRECT_HIGH_IND = 0x01, /*connectable high duty cycle directed advertising*/
-	BTMG_LE_ADV_SCAN_IND = 0x02, /*scannable undirected advertising*/
-	BTMG_LE_ADV_NONCONN_IND = 0x03, /*non connectable undirected advertising*/
-	BTMG_LE_ADV_DIRECT_LOW_IND = 0x04, /*connectable low duty cycle directed advertising*/
+	BTMG_LE_ADV_SCAN_IND = 0x02,		/*scannable undirected advertising*/
+	BTMG_LE_ADV_NONCONN_IND = 0x03,		/*non connectable undirected advertising*/
+	BTMG_LE_ADV_DIRECT_LOW_IND = 0x04,	/*connectable low duty cycle directed advertising*/
 } btmg_le_advertising_type_t;
 typedef enum {
 	BTMG_LE_PROCESS_ALL_REQ = 0x00, /*process scan and connection requests from all devices*/
-	BTMG_LE_PROCESS_CONN_REQ = 0x01, /*process connection request from all devices and scan request only from white list*/
-	BTMG_LE_PROCESS_SCAN_REQ = 0x02, /*process scan request from all devices and connection request only from white list*/
+	BTMG_LE_PROCESS_CONN_REQ =
+		0x01, /*process connection request from all devices and scan request only from white list*/
+	BTMG_LE_PROCESS_SCAN_REQ =
+		0x02, /*process scan request from all devices and connection request only from white list*/
 	BTMG_LE_PROCESS_WHITE_LIST_REQ = 0x03, /*process requests only from white list*/
 } btmg_le_advertising_filter_policy_t;
 typedef enum {
@@ -201,40 +201,40 @@ typedef enum {
 	BTMG_LE_PEER_RANDOM_ADDRESS = 0x01, /*random device address(default) or random indentiy address*/
 } btmg_le_peer_addr_type_t;
 typedef struct {
-	uint16_t	min_interval;
-	uint16_t	max_interval;
-	btmg_le_advertising_type_t	adv_type;
-	btmg_le_addr_type_t		own_addr_type;
-	btmg_le_peer_addr_type_t	peer_addr_type;
-	char		peer_addr[18];
-	uint8_t		chan_map;
-	btmg_le_advertising_filter_policy_t	filter;
+	uint16_t min_interval;
+	uint16_t max_interval;
+	btmg_le_advertising_type_t adv_type;
+	btmg_le_addr_type_t own_addr_type;
+	btmg_le_peer_addr_type_t peer_addr_type;
+	char peer_addr[18];
+	uint8_t chan_map;
+	btmg_le_advertising_filter_policy_t filter;
 } btmg_le_advertising_parameters_t;
 typedef struct {
-    uint16_t scan_interval;                   // Range: 0x0004 to 0x4000 Time = N * 0.625 msec Time Range: 2.5 msec to 10.24 sec
-    uint16_t scan_window;                     // Range: 0x0004 to 0x4000 Time = N * 0.625 msec Time Range: 2.5 msec to 10.24 seconds
-    uint16_t timeout;                         // Scan timeout between 0x0001 and 0xFFFF in seconds, 0x0000 disables timeout.
+	uint16_t scan_interval; // Range: 0x0004 to 0x4000 Time = N * 0.625 msec Time Range: 2.5 msec to 10.24 sec
+	uint16_t scan_window;	// Range: 0x0004 to 0x4000 Time = N * 0.625 msec Time Range: 2.5 msec to 10.24 seconds
+	uint16_t timeout;		// Scan timeout between 0x0001 and 0xFFFF in seconds, 0x0000 disables timeout.
 } btmg_le_scan_param_t;
 typedef enum {
-    LE_SCAN_TYPE_PASSIVE = 0x00,  // passive scanning
-    LE_SCAN_TYPE_ACTIVE,   // active scanning
+	LE_SCAN_TYPE_PASSIVE = 0x00, // passive scanning
+	LE_SCAN_TYPE_ACTIVE,		 // active scanning
 } btmg_le_scan_type_t;
 typedef enum {
 	LE_ADV_DATA,
 	LE_SCAN_RSP_DATA,
 } btmg_adv_data_type_t;
 typedef struct {
-    uint8_t peer_addr[6];
-    btmg_bdaddr_type_t addr_type;
+	uint8_t peer_addr[6];
+	btmg_bdaddr_type_t addr_type;
 	btmg_adv_data_type_t adv_type;
-    int8_t rssi;
+	int8_t rssi;
 	btmg_adv_rsp_data_t report;
 } btmg_le_scan_report_t;
 typedef struct {
-    uint16_t min_conn_interval;// Range: 0x0006 to 0x0C80, Time = N * 1.25 msec, Time Range: 7.5 msec to 4 seconds.
-    uint16_t max_conn_interval;// Range: 0x0006 to 0x0C80, Time = N * 1.25 msec, Time Range: 7.5 msec to 4 seconds.
-    uint16_t slave_latency;    // Range: 0x0000 to 0x01F3
-    uint16_t conn_sup_timeout; // Range: 0x000A to 0x0C80, Time = N * 10 msec, Time Range: 100 msec to 32 seconds
+	uint16_t min_conn_interval; // Range: 0x0006 to 0x0C80, Time = N * 1.25 msec, Time Range: 7.5 msec to 4 seconds.
+	uint16_t max_conn_interval; // Range: 0x0006 to 0x0C80, Time = N * 1.25 msec, Time Range: 7.5 msec to 4 seconds.
+	uint16_t slave_latency;		// Range: 0x0000 to 0x01F3
+	uint16_t conn_sup_timeout;	// Range: 0x000A to 0x0C80, Time = N * 10 msec, Time Range: 100 msec to 32 seconds
 } btmg_le_conn_param_t;
 
 typedef struct paired_dev bt_paried_device;
@@ -244,23 +244,23 @@ typedef void (*bt_gap_dev_device_add_cb)(btmg_bt_device_t *device);
 typedef void (*bt_gap_dev_device_remove_cb)(btmg_bt_device_t *device);
 typedef void (*bt_gap_le_scan_report_cb)(btmg_le_scan_report_t *data);
 typedef void (*bt_gap_update_rssi_cb)(const char *address, int rssi);
-typedef void (*bt_gap_bond_state_cb)(btmg_bond_state_t state,const char *bd_addr,const char *name);
+typedef void (*bt_gap_bond_state_cb)(btmg_bond_state_t state, const char *bd_addr, const char *name);
 typedef void (*bt_gap_connected_changed)(btmg_bt_device_t *device);
-typedef void (*bt_gap_request_pincode)(void *handle,char *device);
-typedef void (*bt_gap_display_pin_code)(char *device,char *pincode);
-typedef void (*bt_gap_request_passkey)(void *handle,char *device);
-typedef void (*bt_gap_display_passkey)(char *device,unsigned int passkey,unsigned int entered);
-typedef void (*bt_gap_confirm_passkey)(void *handle,char *device,unsigned int passkey);
-typedef void (*bt_gap_authorize)(void *handle,char *device);
-typedef void (*bt_gap_authorize_service)(void *handle,char *device,char *uuid);
-typedef struct {
-    bt_gap_status_cb gap_status_cb; /*used for return results of bt_manager_enable and status of BT*/
-    bt_gap_discovery_status_cb gap_disc_status_cb; /*used for return discovery status of BT*/
-    bt_gap_dev_device_add_cb gap_device_add_cb; /*used for device found event*/
-    bt_gap_dev_device_remove_cb gap_device_remove_cb; /*used for device found event*/
-    bt_gap_le_scan_report_cb gap_le_scan_report_cb;
+typedef void (*bt_gap_request_pincode)(void *handle, char *device);
+typedef void (*bt_gap_display_pin_code)(char *device, char *pincode);
+typedef void (*bt_gap_request_passkey)(void *handle, char *device);
+typedef void (*bt_gap_display_passkey)(char *device, unsigned int passkey, unsigned int entered);
+typedef void (*bt_gap_confirm_passkey)(void *handle, char *device, unsigned int passkey);
+typedef void (*bt_gap_authorize)(void *handle, char *device);
+typedef void (*bt_gap_authorize_service)(void *handle, char *device, char *uuid);
+typedef struct {
+	bt_gap_status_cb gap_status_cb;					  /*used for return results of bt_manager_enable and status of BT*/
+	bt_gap_discovery_status_cb gap_disc_status_cb;	  /*used for return discovery status of BT*/
+	bt_gap_dev_device_add_cb gap_device_add_cb;		  /*used for device found event*/
+	bt_gap_dev_device_remove_cb gap_device_remove_cb; /*used for device found event*/
+	bt_gap_le_scan_report_cb gap_le_scan_report_cb;
 	bt_gap_update_rssi_cb gap_update_rssi_cb; /*update rssi for discovered and bonded devices*/
-    bt_gap_bond_state_cb gap_bond_state_cb; /*used for bond state event*/
+	bt_gap_bond_state_cb gap_bond_state_cb;	  /*used for bond state event*/
 	bt_gap_connected_changed gap_connect_changed;
 	bt_gap_request_pincode gap_request_pincode;
 	bt_gap_display_pin_code gap_display_pin_code;
@@ -276,7 +276,7 @@ int bt_manager_cancel_discovery(void);
 bool bt_manager_is_discovering();
 int bt_manager_pair(char *addr);
 int bt_manager_unpair(char *addr);
-int bt_manager_get_paired_devices(bt_paried_device **dev_list,int *count);
+int bt_manager_get_paired_devices(bt_paried_device **dev_list, int *count);
 int bt_manager_free_paired_devices(bt_paried_device *dev_list);
 int bt_manager_remove_device(const char *addr);
 btmg_state_t bt_manager_get_state();
@@ -284,18 +284,17 @@ int bt_manager_get_name(char *name, int size);
 int bt_manager_set_name(const char *name);
 int bt_manager_get_remote_name(char *name);
 int bt_manager_get_address(char *addr, int size);
-int bt_manager_profile_connect(char *addr,btmg_profile_t profile);
-int bt_manager_profile_disconnect(char *addr,btmg_profile_t profile);
+int bt_manager_profile_connect(char *addr, btmg_profile_t profile);
+int bt_manager_profile_disconnect(char *addr, btmg_profile_t profile);
 int bt_manager_connect(const char *addr);
 int bt_manager_disconnect(const char *addr);
 int bt_manager_bt_is_connected(const char *addr);
 int bt_manager_get_connection_state(void);
-int bt_manager_set_page_timeout(int slots); //realtime = timeout * 0.625ms
+int bt_manager_set_page_timeout(int slots); // realtime = timeout * 0.625ms
 int bt_manager_gap_set_io_capability(btmg_io_capability_t io_cap);
-int bt_manager_gap_send_pincode(void *handle,char *pincode);
-int bt_manager_gap_send_passkey(void *handle,unsigned int passkey);
-int bt_manager_gap_send_pair_error(void *handle,btmg_pair_request_error_t e,
-		const char *err_msg);
+int bt_manager_gap_send_pincode(void *handle, char *pincode);
+int bt_manager_gap_send_passkey(void *handle, unsigned int passkey);
+int bt_manager_gap_send_pair_error(void *handle, btmg_pair_request_error_t e, const char *err_msg);
 int bt_manager_gap_pair_send_empty_response(void *handle);
 #ifdef DBUS_LE_ADV
 int bt_manager_register_advertisement(btmg_adv_t *adv);
@@ -307,37 +306,37 @@ int bt_manager_le_enable_adv(bool enable);
 #endif
 int bt_manager_le_set_random_address(void);
 int bt_manager_set_adv_param(btmg_le_advertising_parameters_t *adv_param);
-int bt_manager_le_scan_start(int dev_id,btmg_le_scan_type_t scan_type,
-		btmg_le_scan_param_t *scan_param,void **scan_handle);
-int bt_manager_le_scan_stop(int dev_id,void *scan_handle);
+int bt_manager_le_scan_start(int dev_id, btmg_le_scan_type_t scan_type, btmg_le_scan_param_t *scan_param,
+							 void **scan_handle);
+int bt_manager_le_scan_stop(int dev_id, void *scan_handle);
 int bt_manager_le_disconnect(void);
-int bt_manager_le_set_scan_parameters(int dev_id, btmg_le_scan_type_t scan_type,
-		btmg_le_scan_param_t *scan_param, uint8_t own_type, uint8_t filter_policy);
+int bt_manager_le_set_scan_parameters(int dev_id, btmg_le_scan_type_t scan_type, btmg_le_scan_param_t *scan_param,
+									  uint8_t own_type, uint8_t filter_policy);
 int bt_manager_le_update_conn_params(int dev_id, btmg_le_conn_param_t *conn_params);
 int bt_manager_test_cmd(void);
 
 
 /*AVRCP*/
 typedef enum {
-    BTMG_AVRCP_PLAYSTATE_STOPPED,
-    BTMG_AVRCP_PLAYSTATE_PLAYING,
-    BTMG_AVRCP_PLAYSTATE_PAUSED,
-    BTMG_AVRCP_PLAYSTATE_FWD_SEEK,
-    BTMG_AVRCP_PLAYSTATE_REV_SEEK,
-    BTMG_AVRCP_PLAYSTATE_FORWARD,
-    BTMG_AVRCP_PLAYSTATE_BACKWARD,
-    BTMG_AVRCP_PLAYSTATE_ERROR,
+	BTMG_AVRCP_PLAYSTATE_STOPPED,
+	BTMG_AVRCP_PLAYSTATE_PLAYING,
+	BTMG_AVRCP_PLAYSTATE_PAUSED,
+	BTMG_AVRCP_PLAYSTATE_FWD_SEEK,
+	BTMG_AVRCP_PLAYSTATE_REV_SEEK,
+	BTMG_AVRCP_PLAYSTATE_FORWARD,
+	BTMG_AVRCP_PLAYSTATE_BACKWARD,
+	BTMG_AVRCP_PLAYSTATE_ERROR,
 } btmg_avrcp_play_state_t;
 typedef enum {
-    BTMG_AVRCP_PLAY = 0,
-    BTMG_AVRCP_PAUSE,
-    BTMG_AVRCP_STOP,
-    BTMG_AVRCP_FASTFORWARD,
-    BTMG_AVRCP_REWIND,
-    BTMG_AVRCP_FORWARD,
-    BTMG_AVRCP_BACKWARD,
-    BTMG_AVRCP_VOL_UP,
-    BTMG_AVRCP_VOL_DOWN,
+	BTMG_AVRCP_PLAY = 0,
+	BTMG_AVRCP_PAUSE,
+	BTMG_AVRCP_STOP,
+	BTMG_AVRCP_FASTFORWARD,
+	BTMG_AVRCP_REWIND,
+	BTMG_AVRCP_FORWARD,
+	BTMG_AVRCP_BACKWARD,
+	BTMG_AVRCP_VOL_UP,
+	BTMG_AVRCP_VOL_DOWN,
 } btmg_avrcp_command_t;
 typedef struct btmg_track_info_t {
 	char title[256];
@@ -348,15 +347,18 @@ typedef struct btmg_track_info_t {
 	char genre[256];
 	char playing_time[256];
 } btmg_track_info_t;
-typedef void (*bt_avrcp_play_state_cb)(const char *bd_addr, btmg_avrcp_play_state_t state); /*used to report play state of avrcp, recommended*/
-typedef void (*bt_avrcp_track_changed_cb)(const char *bd_addr, btmg_track_info_t track_info); /*used to report track information*/
-typedef void (*bt_avrcp_play_position_cb)(const char *bd_addr, int song_len, int song_pos);/*used to report the progress of playing music*/
+typedef void (*bt_avrcp_play_state_cb)(
+	const char *bd_addr, btmg_avrcp_play_state_t state); /*used to report play state of avrcp, recommended*/
+typedef void (*bt_avrcp_track_changed_cb)(const char *bd_addr,
+										  btmg_track_info_t track_info); /*used to report track information*/
+typedef void (*bt_avrcp_play_position_cb)(const char *bd_addr, int song_len,
+										  int song_pos); /*used to report the progress of playing music*/
 typedef void (*bt_avrcp_audio_volume_cb)(const char *bd_addr, unsigned int volume);
 typedef struct btmg_avrcp_callback_t {
-    bt_avrcp_play_state_cb avrcp_play_state_cb;
-    bt_avrcp_track_changed_cb avrcp_track_changed_cb;
-    bt_avrcp_play_position_cb avrcp_play_position_cb;
-    bt_avrcp_audio_volume_cb avrcp_audio_volume_cb;/*used to report the avrcp volume, range: 0~16*/
+	bt_avrcp_play_state_cb avrcp_play_state_cb;
+	bt_avrcp_track_changed_cb avrcp_track_changed_cb;
+	bt_avrcp_play_position_cb avrcp_play_position_cb;
+	bt_avrcp_audio_volume_cb avrcp_audio_volume_cb; /*used to report the avrcp volume, range: 0~16*/
 } btmg_avrcp_callback_t;
 int bt_manager_avrcp_command(char *addr, btmg_avrcp_command_t command);
 int bt_manager_vol_changed_noti(int vol_value);
@@ -369,76 +371,78 @@ int bt_manager_set_link_supervision_timeout(const char *addr, int slots);
 
 /*A2DP*/
 typedef enum {
-    BTMG_A2DP_SINK_DISCONNECTED,
-    BTMG_A2DP_SINK_CONNECTING,
-    BTMG_A2DP_SINK_CONNECTED,
-    BTMG_A2DP_SINK_DISCONNECTING,
-    BTMG_A2DP_SINK_CONNECT_FAILED,
-    BTMG_A2DP_SINK_DISCONNEC_FAILED,
+	BTMG_A2DP_SINK_DISCONNECTED,
+	BTMG_A2DP_SINK_CONNECTING,
+	BTMG_A2DP_SINK_CONNECTED,
+	BTMG_A2DP_SINK_DISCONNECTING,
+	BTMG_A2DP_SINK_CONNECT_FAILED,
+	BTMG_A2DP_SINK_DISCONNEC_FAILED,
 } btmg_a2dp_sink_connection_state_t;
 typedef enum {
-    BTMG_A2DP_SINK_AUDIO_SUSPENDED,
-    BTMG_A2DP_SINK_AUDIO_STOPPED,
-    BTMG_A2DP_SINK_AUDIO_STARTED,
+	BTMG_A2DP_SINK_AUDIO_SUSPENDED,
+	BTMG_A2DP_SINK_AUDIO_STOPPED,
+	BTMG_A2DP_SINK_AUDIO_STARTED,
 } btmg_a2dp_sink_audio_state_t;
 typedef void (*bt_a2dp_sink_connection_state_cb)(const char *bd_addr, btmg_a2dp_sink_connection_state_t state);
 typedef void (*bt_a2dp_sink_audio_state_cb)(const char *bd_addr, btmg_a2dp_sink_audio_state_t state);
 typedef struct btmg_a2dp_sink_callback_t {
-    bt_a2dp_sink_connection_state_cb a2dp_sink_connection_state_cb;/*used to report the a2dp_sink connection state*/
-    bt_a2dp_sink_audio_state_cb a2dp_sink_audio_state_cb;/*used to report the a2dp_sink audio state, not recommended as mentioned before*/
+	bt_a2dp_sink_connection_state_cb a2dp_sink_connection_state_cb; /*used to report the a2dp_sink connection state*/
+	bt_a2dp_sink_audio_state_cb
+		a2dp_sink_audio_state_cb; /*used to report the a2dp_sink audio state, not recommended as mentioned before*/
 } btmg_a2dp_sink_callback_t;
 typedef enum {
-    BTMG_A2DP_SOURCE_DISCONNECTED,
-    BTMG_A2DP_SOURCE_CONNECTING,
-    BTMG_A2DP_SOURCE_CONNECTED,
-    BTMG_A2DP_SOURCE_DISCONNECTING,
-    BTMG_A2DP_SOURCE_CONNECT_FAILED,
-    BTMG_A2DP_SOURCE_DISCONNEC_FAILED,
+	BTMG_A2DP_SOURCE_DISCONNECTED,
+	BTMG_A2DP_SOURCE_CONNECTING,
+	BTMG_A2DP_SOURCE_CONNECTED,
+	BTMG_A2DP_SOURCE_DISCONNECTING,
+	BTMG_A2DP_SOURCE_CONNECT_FAILED,
+	BTMG_A2DP_SOURCE_DISCONNEC_FAILED,
 } btmg_a2dp_source_connection_state_t;
 typedef enum {
-    BTMG_A2DP_SOURCE_AUDIO_SUSPENDED,
-    BTMG_A2DP_SOURCE_AUDIO_STOPPED,
-    BTMG_A2DP_SOURCE_AUDIO_STARTED,
+	BTMG_A2DP_SOURCE_AUDIO_SUSPENDED,
+	BTMG_A2DP_SOURCE_AUDIO_STOPPED,
+	BTMG_A2DP_SOURCE_AUDIO_STARTED,
 } btmg_a2dp_source_audio_state_t;
 typedef void (*bt_a2dp_source_connection_state_cb)(const char *bd_addr, btmg_a2dp_source_connection_state_t state);
 typedef void (*bt_a2dp_source_audio_state_cb)(const char *bd_addr, btmg_a2dp_source_audio_state_t state);
 typedef struct btmg_a2dp_source_callback_t {
-    bt_a2dp_source_connection_state_cb a2dp_source_connection_state_cb;/*used to report the a2dp_source connection state*/
-    bt_a2dp_source_audio_state_cb a2dp_source_audio_state_cb;/*used to report the a2dp_source audio state, not recommended as mentioned before*/
+	bt_a2dp_source_connection_state_cb
+		a2dp_source_connection_state_cb; /*used to report the a2dp_source connection state*/
+	bt_a2dp_source_audio_state_cb
+		a2dp_source_audio_state_cb; /*used to report the a2dp_source audio state, not recommended as mentioned before*/
 } btmg_a2dp_source_callback_t;
 
-int bt_manager_a2dp_src_init(uint16_t channels,uint16_t sampling);
+int bt_manager_a2dp_src_init(uint16_t channels, uint16_t sampling);
 int bt_manager_a2dp_src_deinit(void);
 int bt_manager_a2dp_src_stream_start(uint32_t len);
 int bt_manager_a2dp_src_stream_stop(bool drop);
-int bt_manager_a2dp_src_stream_send(char *data,int len,bool block);
-
+int bt_manager_a2dp_src_stream_send(char *data, int len, bool block);
 
 
 /*HFP*/
 typedef enum {
 	BTMG_HFP_CONNECT,
 	BTMG_HFP_CONNECT_LOST,
-	BTMG_HFP_CIND  = 11, /* Indicator string from AG */
-	BTMG_HFP_CIEV,  /* Indicator status from AG */
-	BTMG_HFP_RING,  /* RING alert from AG */
-	BTMG_HFP_CLIP,  /* Calling subscriber information from AG */
-	BTMG_HFP_BSIR, /* In band ring tone setting */
-	BTMG_HFP_BVRA,  /* Voice recognition activation/deactivation */
-	BTMG_HFP_CCWA,  /* Call waiting notification */
-	BTMG_HFP_CHLD,  /* Call hold and multi party service in AG */
-	BTMG_HFP_VGM,   /* MIC volume setting */
-	BTMG_HFP_VGS,   /* Speaker volume setting */
-	BTMG_HFP_BINP,  /* Input data response from AG */
-	BTMG_HFP_BTRH,  /* CCAP incoming call hold */
-	BTMG_HFP_CNUM,  /* Subscriber number */
-	BTMG_HFP_COPS,  /* Operator selection info from AG */
-	BTMG_HFP_CMEE,  /* Enhanced error result from AG */
-	BTMG_HFP_CLCC,  /* Current active call list info */
-	BTMG_HFP_UNAT,  /* AT command response fro AG which is not specified in HFP or HSP */
-	BTMG_HFP_OK,    /* OK response */
-	BTMG_HFP_ERROR, /* ERROR response */
-	BTMG_HFP_BCS   /* Codec selection from AG */
+	BTMG_HFP_CIND = 11, /* Indicator string from AG */
+	BTMG_HFP_CIEV,		/* Indicator status from AG */
+	BTMG_HFP_RING,		/* RING alert from AG */
+	BTMG_HFP_CLIP,		/* Calling subscriber information from AG */
+	BTMG_HFP_BSIR,		/* In band ring tone setting */
+	BTMG_HFP_BVRA,		/* Voice recognition activation/deactivation */
+	BTMG_HFP_CCWA,		/* Call waiting notification */
+	BTMG_HFP_CHLD,		/* Call hold and multi party service in AG */
+	BTMG_HFP_VGM,		/* MIC volume setting */
+	BTMG_HFP_VGS,		/* Speaker volume setting */
+	BTMG_HFP_BINP,		/* Input data response from AG */
+	BTMG_HFP_BTRH,		/* CCAP incoming call hold */
+	BTMG_HFP_CNUM,		/* Subscriber number */
+	BTMG_HFP_COPS,		/* Operator selection info from AG */
+	BTMG_HFP_CMEE,		/* Enhanced error result from AG */
+	BTMG_HFP_CLCC,		/* Current active call list info */
+	BTMG_HFP_UNAT,		/* AT command response fro AG which is not specified in HFP or HSP */
+	BTMG_HFP_OK,		/* OK response */
+	BTMG_HFP_ERROR,		/* ERROR response */
+	BTMG_HFP_BCS		/* Codec selection from AG */
 } btmg_hfp_even_t;
 typedef enum {
 	BTMG_HFP_VOLUE_TYPE_SPK = 0,
@@ -481,7 +485,7 @@ int bt_manager_hfp_client_send_at_ata(void);
 int bt_manager_hfp_client_send_at_chup(void);
 int bt_manager_hfp_client_send_at_atd(char *number);
 int bt_manager_hfp_client_send_at_bldn(void);
-int bt_manager_hfp_client_send_at_btrh(bool query,uint32_t val);
+int bt_manager_hfp_client_send_at_btrh(bool query, uint32_t val);
 int bt_manager_hfp_client_send_at_bts(char code);
 int bt_manager_hfp_client_send_at_bcc(void);
 int bt_manager_hfp_client_send_at_cnum(void);
@@ -492,20 +496,20 @@ int bt_manager_hfp_client_send_at_bvra(bool enable);
 int bt_manager_hfp_client_send_at_cmd(char *cmd);
 /*SPP SERVER*/
 typedef enum {
-    BTMG_SPP_SERVER_DISCONNECTED,
-    BTMG_SPP_SERVER_CONNECTING,
-    BTMG_SPP_SERVER_CONNECTED,
-    BTMG_SPP_SERVER_DISCONNECTING,
-    BTMG_SPP_SERVER_CONNECT_FAILED,
-    BTMG_SPP_SERVER_DISCONNEC_FAILED,
+	BTMG_SPP_SERVER_DISCONNECTED,
+	BTMG_SPP_SERVER_CONNECTING,
+	BTMG_SPP_SERVER_CONNECTED,
+	BTMG_SPP_SERVER_DISCONNECTING,
+	BTMG_SPP_SERVER_CONNECT_FAILED,
+	BTMG_SPP_SERVER_DISCONNEC_FAILED,
 } btmg_spp_server_connection_state_t;
 
 typedef void (*bt_spp_server_connection_state_cb)(const char *bd_addr, btmg_spp_server_connection_state_t state);
 typedef void (*bt_spp_server_accept_cb)(const char *bd_addr, char *data, int data_len);
 
 typedef struct btmg_spp_server_callback_t {
-    bt_spp_server_connection_state_cb spp_server_connection_state_cb;
-    bt_spp_server_accept_cb spp_server_accept_cb;
+	bt_spp_server_connection_state_cb spp_server_connection_state_cb;
+	bt_spp_server_accept_cb spp_server_accept_cb;
 } btmg_spp_server_callback_t;
 
 int bt_manager_spp_service_accept(void);
@@ -515,20 +519,20 @@ int bt_manager_spp_service_disconnect(const char *dst);
 
 /*SPP CLIENT*/
 typedef enum {
-    BTMG_SPP_CLIENT_DISCONNECTED,
-    BTMG_SPP_CLIENT_CONNECTING,
-    BTMG_SPP_CLIENT_CONNECTED,
-    BTMG_SPP_CLIENT_DISCONNECTING,
-    BTMG_SPP_CLIENT_CONNECT_FAILED,
-    BTMG_SPP_CLIENT_DISCONNEC_FAILED,
+	BTMG_SPP_CLIENT_DISCONNECTED,
+	BTMG_SPP_CLIENT_CONNECTING,
+	BTMG_SPP_CLIENT_CONNECTED,
+	BTMG_SPP_CLIENT_DISCONNECTING,
+	BTMG_SPP_CLIENT_CONNECT_FAILED,
+	BTMG_SPP_CLIENT_DISCONNEC_FAILED,
 } btmg_spp_client_connection_state_t;
 
 typedef void (*bt_spp_client_connection_state_cb)(const char *bd_addr, btmg_spp_client_connection_state_t state);
 typedef void (*bt_spp_client_recvdata_cb)(const char *bd_addr, char *data, int data_len);
 
 typedef struct btmg_spp_client_callback_t {
-    bt_spp_client_connection_state_cb spp_client_connection_state_cb;
-    bt_spp_client_recvdata_cb spp_client_recvdata_cb;
+	bt_spp_client_connection_state_cb spp_client_connection_state_cb;
+	bt_spp_client_recvdata_cb spp_client_recvdata_cb;
 } btmg_spp_client_callback_t;
 
 int bt_manager_spp_client_connect(const char *dst);
@@ -570,28 +574,28 @@ typedef enum {
 } gatt_permissions_t;
 
 typedef enum {
-	BT_GATT_SUCCESS  = 0x00,
-	BT_GATT_ERROR_INVALID_HANDLE   = 0x01, /*Invalid Handle*/
-	BT_GATT_ERROR_READ_NOT_PERMITTED = 0x02, /*Read not Permitted*/
-	BT_GATT_ERROR_WRITE_NOT_PERMITTED = 0x03, /*Writed Not Permitted*/
-	BT_GATT_ERROR_INVALID_PDU = 0x04, /*Invalid PDU*/
-	BT_GATT_ERROR_AUTHENTICATION  = 0x05, /*Insufficient Authentication*/
-	BT_GATT_ERROR_REQUEST_NOT_SUPPORTED  = 0x06, /*Request Not Supported*/
-	BT_GATT_ERROR_INVALID_OFFSET  = 0x07, /*Invalid Offset*/
-	BT_GATT_ERROR_AUTHORIZATION   = 0x08, /*Insufficient Authorization*/
-	BT_GATT_ERROR_PREPARE_QUEUE_FULL  = 0x09, /*Prepare Queue Full*/
-	BT_GATT_ERROR_ATTRIBUTE_NOT_FOUND  = 0x0A, /*Attribute Not Found*/
-	BT_GATT_ERROR_ATTRIBUTE_NOT_LONG  = 0x0B, /*Attribute Not Long*/
+	BT_GATT_SUCCESS = 0x00,
+	BT_GATT_ERROR_INVALID_HANDLE = 0x01,				   /*Invalid Handle*/
+	BT_GATT_ERROR_READ_NOT_PERMITTED = 0x02,			   /*Read not Permitted*/
+	BT_GATT_ERROR_WRITE_NOT_PERMITTED = 0x03,			   /*Writed Not Permitted*/
+	BT_GATT_ERROR_INVALID_PDU = 0x04,					   /*Invalid PDU*/
+	BT_GATT_ERROR_AUTHENTICATION = 0x05,				   /*Insufficient Authentication*/
+	BT_GATT_ERROR_REQUEST_NOT_SUPPORTED = 0x06,			   /*Request Not Supported*/
+	BT_GATT_ERROR_INVALID_OFFSET = 0x07,				   /*Invalid Offset*/
+	BT_GATT_ERROR_AUTHORIZATION = 0x08,					   /*Insufficient Authorization*/
+	BT_GATT_ERROR_PREPARE_QUEUE_FULL = 0x09,			   /*Prepare Queue Full*/
+	BT_GATT_ERROR_ATTRIBUTE_NOT_FOUND = 0x0A,			   /*Attribute Not Found*/
+	BT_GATT_ERROR_ATTRIBUTE_NOT_LONG = 0x0B,			   /*Attribute Not Long*/
 	BT_GATT_ERROR_INSUFFICIENT_ENCRYPTION_KEY_SIZE = 0x0C, /*Insufficient Encryption Key Size*/
-	BT_GATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN  = 0x0D, /*Invalid Attribute Value Length*/
-	BT_GATT_ERROR_UNLIKELY  = 0x0E, /*Unlikely Error*/
-	BT_GATT_ERROR_INSUFFICIENT_ENCRYPTION  = 0x0F, /*Insufficient Encryption*/
-	BT_GATT_ERROR_UNSUPPORTED_GROUP_TYPE  = 0x10, /*Unsupported Group Type*/
-	BT_GATT_ERROR_INSUFFICIENT_RESOURCES  = 0x11, /*Insufficient Resources*/
-	BT_GATT_ERROR_DB_OUT_OF_SYNC  = 0x12, /*Database Out of Sync*/
-	BT_GATT_ERROR_VALUE_NOT_ALLOWED  = 0x13 /*Value Not Allowed*/
-	/*0x80-0x9F Application Error*/
-	/*0xE0-0xFF Common Profile and Service Error Codes*/
+	BT_GATT_ERROR_INVALID_ATTRIBUTE_VALUE_LEN = 0x0D,	   /*Invalid Attribute Value Length*/
+	BT_GATT_ERROR_UNLIKELY = 0x0E,						   /*Unlikely Error*/
+	BT_GATT_ERROR_INSUFFICIENT_ENCRYPTION = 0x0F,		   /*Insufficient Encryption*/
+	BT_GATT_ERROR_UNSUPPORTED_GROUP_TYPE = 0x10,		   /*Unsupported Group Type*/
+	BT_GATT_ERROR_INSUFFICIENT_RESOURCES = 0x11,		   /*Insufficient Resources*/
+	BT_GATT_ERROR_DB_OUT_OF_SYNC = 0x12,				   /*Database Out of Sync*/
+	BT_GATT_ERROR_VALUE_NOT_ALLOWED = 0x13				   /*Value Not Allowed*/
+														   /*0x80-0x9F Application Error*/
+														   /*0xE0-0xFF Common Profile and Service Error Codes*/
 } gatt_attr_res_code_t;
 
 #define AG_GATT_MAX_ATTR_LEN 600
@@ -647,7 +651,6 @@ typedef struct {
 } gatt_desc_write_req_t;
 
 typedef struct {
-
 } gatt_send_indication_t;
 
 typedef void (*bt_gatt_add_service_cb)(gatt_add_svc_msg_t *pData);
@@ -665,22 +668,22 @@ typedef void (*bt_gatt_desc_write_req_cb)(gatt_desc_write_req_t *desc_write);
 
 typedef void (*bt_gatt_send_indication_cb)(gatt_send_indication_t *send_ind);
 typedef struct {
-/*gatt add ... callback*/
+	/*gatt add ... callback*/
 	bt_gatt_add_service_cb gatt_add_svc_cb;
 	bt_gatt_add_char_cb gatt_add_char_cb;
 	bt_gatt_add_desc_cb gatt_add_desc_cb;
 
-/*gatt event callback*/
+	/*gatt event callback*/
 	bt_gatt_connection_event_cb gatt_connection_event_cb;
 
 	bt_gatt_sevice_ready_cb gatt_service_ready_cb;
 
-/*gatt characteristic request callback*/
+	/*gatt characteristic request callback*/
 	bt_gatt_char_read_req_cb gatt_char_read_req_cb;
 	bt_gatt_char_write_req_cb gatt_char_write_req_cb;
 	bt_gatt_char_notify_req_cb gatt_char_notify_req_cb;
 
-/*gatt descriptor request callback*/
+	/*gatt descriptor request callback*/
 	bt_gatt_desc_read_req_cb gatt_desc_read_req_cb;
 	bt_gatt_desc_write_req_cb gatt_desc_write_req_cb;
 
@@ -688,19 +691,19 @@ typedef struct {
 } btmg_gatt_server_cb_t;
 
 typedef struct {
-	char *uuid;      /*128-bit service UUID*/
-	bool primary;    /* If true, this GATT service is a primary service */
+	char *uuid;	  /*128-bit service UUID*/
+	bool primary; /* If true, this GATT service is a primary service */
 	int number;
 } gatt_add_svc_t;
 typedef struct {
-	char *uuid;      /*128-bit characteristic UUID*/
-	int properties;        /*The GATT characteristic properties*/
-	int permissions;       /*The GATT characteristic permissions*/
-	int svc_handle;          /*the service atr handle*/
+	char *uuid;		 /*128-bit characteristic UUID*/
+	int properties;	 /*The GATT characteristic properties*/
+	int permissions; /*The GATT characteristic permissions*/
+	int svc_handle;	 /*the service atr handle*/
 } gatt_add_char_t;
 typedef struct {
-	char *uuid;     /*128-bit descriptor UUID*/
-	int permissions;      /*he GATT descriptor  permissions*/
+	char *uuid;		 /*128-bit descriptor UUID*/
+	int permissions; /*he GATT descriptor  permissions*/
 	int svc_handle;
 } gatt_add_desc_t;
 typedef struct {
@@ -807,7 +810,7 @@ typedef struct {
 		uint16_t u16;
 		uint32_t u32;
 		uint8_t u128[16];
-	}value;
+	} value;
 } btmg_uuid_t;
 typedef struct {
 	uint16_t start_handle;
@@ -851,26 +854,24 @@ typedef struct {
 	bt_gattc_dis_desc_cb gattc_dis_desc_cb;
 } btmg_gatt_client_cb_t;
 
-int bt_manager_gatt_client_connect(int dev_id,uint8_t *addr,
-		btmg_bdaddr_type_t dst_type,uint16_t mtu,btmg_security_level_t sec);
+int bt_manager_gatt_client_connect(int dev_id, uint8_t *addr, btmg_bdaddr_type_t dst_type, uint16_t mtu,
+								   btmg_security_level_t sec);
 int bt_manager_gatt_client_disconnect(int dev_id, uint8_t *addr);
-int bt_manager_gatt_client_set_security(void *cn_handle,int sec_level);
+int bt_manager_gatt_client_set_security(void *cn_handle, int sec_level);
 int bt_manager_gatt_client_get_security(void *cn_handle);
-int bt_manager_gatt_client_register_notify(void *cn_handle,int char_handle);
-int bt_manager_gatt_client_unregister_notify(void *cn_handle,int id);
-int bt_manager_gatt_client_write_request(void *cn_handle,int char_handle,
-		uint8_t *value,uint16_t len);
-int bt_manager_gatt_client_write_command(void *cn_handle,int char_handle,
-		bool signed_write,uint8_t *value,uint16_t len);
-int bt_manager_gatt_client_read_long_request(void *cn_handle,int char_handle,int offset);
-int bt_manager_gatt_client_read_request(void *cn_handle,int char_handle);
+int bt_manager_gatt_client_register_notify(void *cn_handle, int char_handle);
+int bt_manager_gatt_client_unregister_notify(void *cn_handle, int id);
+int bt_manager_gatt_client_write_request(void *cn_handle, int char_handle, uint8_t *value, uint16_t len);
+int bt_manager_gatt_client_write_command(void *cn_handle, int char_handle, bool signed_write, uint8_t *value,
+										 uint16_t len);
+int bt_manager_gatt_client_read_long_request(void *cn_handle, int char_handle, int offset);
+int bt_manager_gatt_client_read_request(void *cn_handle, int char_handle);
 const char *bt_manager_gatt_client_ecode_to_string(uint8_t ecode);
 void bt_manager_uuid_to_uuid128(const btmg_uuid_t *src, btmg_uuid_t *dst);
 int bt_manager_uuid_to_string(const btmg_uuid_t *uuid, char *str, size_t n);
-int bt_manager_gatt_client_discover_all_primary_services(void *cn_handle,
-		uint16_t start_handle,uint16_t end_handle);
-int bt_manager_gatt_client_discover_primary_services_by_uuid(void *cn_handle,const char *uuid,
-		uint16_t start_handle,uint16_t end_handle);
+int bt_manager_gatt_client_discover_all_primary_services(void *cn_handle, uint16_t start_handle, uint16_t end_handle);
+int bt_manager_gatt_client_discover_primary_services_by_uuid(void *cn_handle, const char *uuid, uint16_t start_handle,
+															 uint16_t end_handle);
 int bt_manager_gatt_client_discover_service_all_char(void *svc_handle);
 int bt_manager_gatt_client_discover_char_all_descriptor(void *char_handle);
 int bt_manager_gatt_client_get_mtu(void *cn_handle);
@@ -878,7 +879,6 @@ int bt_manager_gatt_client_init(void);
 int bt_manager_gatt_client_deinit(void);
 
 
-
 /*Debug Control*/
 typedef enum {
 	BTMG_LOG_LEVEL_NONE = 0,
@@ -893,36 +893,35 @@ int bt_manager_set_loglevel(btmg_log_level_t log_level);
 btmg_log_level_t bt_manager_get_loglevel(void);
 
 
-
 /*Common init*/
 typedef enum {
-    BTMG_ADAPTER_TURN_ON_SUCCESSED,
-    BTMG_ADAPTER_TURN_ON_FAILED,
-    BTMG_ADAPTER_TURN_OFF_SUCCESSED,
-    BTMG_ADAPTER_TURN_OFF_FAILED,
+	BTMG_ADAPTER_TURN_ON_SUCCESSED,
+	BTMG_ADAPTER_TURN_ON_FAILED,
+	BTMG_ADAPTER_TURN_OFF_SUCCESSED,
+	BTMG_ADAPTER_TURN_OFF_FAILED,
 } btmg_adapter_power_state_t;
 typedef void (*bt_manager_cb)(int event);
 typedef void (*bt_adapter_power_state_cb)(btmg_adapter_power_state_t state);
 typedef struct btmg_manager_callback_t {
-    bt_manager_cb bt_mg_cb;
+	bt_manager_cb bt_mg_cb;
 } btmg_manager_callback_t;
 typedef struct btmg_adapter_callback_t {
-    bt_adapter_power_state_cb adapter_power_state_cb;
+	bt_adapter_power_state_cb adapter_power_state_cb;
 } btmg_adapter_callback_t;
 
 typedef struct btmg_callback_t {
-    btmg_manager_callback_t btmg_manager_cb;
-    btmg_adapter_callback_t btmg_adapter_cb;
-    btmg_gap_callback_t btmg_gap_cb;
-    btmg_a2dp_sink_callback_t btmg_a2dp_sink_cb;
-    btmg_a2dp_source_callback_t btmg_a2dp_source_cb;
-    btmg_avrcp_callback_t btmg_avrcp_cb;
-    btmg_hfp_callback_t btmg_hfp_cb;
-    btmg_spp_server_callback_t btmg_spp_server_cb;
-    btmg_spp_client_callback_t btmg_spp_client_cb;
-    btmg_gatt_server_cb_t btmg_gatt_server_cb;
-    btmg_gatt_client_cb_t btmg_gatt_client_cb;
-}btmg_callback_t;
+	btmg_manager_callback_t btmg_manager_cb;
+	btmg_adapter_callback_t btmg_adapter_cb;
+	btmg_gap_callback_t btmg_gap_cb;
+	btmg_a2dp_sink_callback_t btmg_a2dp_sink_cb;
+	btmg_a2dp_source_callback_t btmg_a2dp_source_cb;
+	btmg_avrcp_callback_t btmg_avrcp_cb;
+	btmg_hfp_callback_t btmg_hfp_cb;
+	btmg_spp_server_callback_t btmg_spp_server_cb;
+	btmg_spp_client_callback_t btmg_spp_client_cb;
+	btmg_gatt_server_cb_t btmg_gatt_server_cb;
+	btmg_gatt_client_cb_t btmg_gatt_client_cb;
+} btmg_callback_t;
 int bt_manager_preinit(btmg_callback_t **btmg_cb);
 int bt_manager_deinit(btmg_callback_t *btmg_cb);
 int bt_manager_init(btmg_callback_t *btmg_cb);
@@ -934,7 +933,7 @@ bool bt_manager_is_enabled(void);
 void bt_manager_hex_dump(char *pref, int width, unsigned char *buf, int len);
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/keymon/keymon.c b/workspace/tg5040/keymon/keymon.c
index 8a9056445..965f3115b 100644
--- a/workspace/tg5040/keymon/keymon.c
+++ b/workspace/tg5040/keymon/keymon.c
@@ -17,27 +17,27 @@
 
 // #include "defines.h"
 
-#define VOLUME_MIN 		0
-#define VOLUME_MAX 		20
-#define BRIGHTNESS_MIN 	0
-#define BRIGHTNESS_MAX 	10
-#define COLORTEMP_MIN 	0
-#define COLORTEMP_MAX 	40
-
-#define CODE_MENU0		314
-#define CODE_MENU1		315
-#define CODE_MENU2		316
-#define CODE_PLUS		115
-#define CODE_MINUS		114
-#define CODE_MUTE		1
-#define CODE_JACK		2
+#define VOLUME_MIN 0
+#define VOLUME_MAX 20
+#define BRIGHTNESS_MIN 0
+#define BRIGHTNESS_MAX 10
+#define COLORTEMP_MIN 0
+#define COLORTEMP_MAX 40
+
+#define CODE_MENU0 314
+#define CODE_MENU1 315
+#define CODE_MENU2 316
+#define CODE_PLUS 115
+#define CODE_MINUS 114
+#define CODE_MUTE 1
+#define CODE_JACK 2
 
 // keymon and api might need different codes
 
 //	for ev.value
-#define RELEASED	0
-#define PRESSED		1
-#define REPEAT		2
+#define RELEASED 0
+#define PRESSED 1
+#define REPEAT 2
 
 #define MUTE_STATE_PATH "/sys/class/gpio/gpio243/value"
 
@@ -46,12 +46,16 @@ static int inputs[INPUT_COUNT] = {};
 static struct input_event ev;
 
 static volatile int quit = 0;
-static void on_term(int sig) { quit = 1; }
+static void on_term(int sig)
+{
+	quit = 1;
+}
 
-static int getInt(char* path) {
+static int getInt(char *path)
+{
 	int i = 0;
 	FILE *file = fopen(path, "r");
-	if (file!=NULL) {
+	if (file != NULL) {
 		fscanf(file, "%i", &i);
 		fclose(file);
 	}
@@ -59,18 +63,19 @@ static int getInt(char* path) {
 }
 
 static pthread_t mute_pt;
-static void* watchMute(void *arg) {
-	int is_muted,was_muted;
-	
+static void *watchMute(void *arg)
+{
+	int is_muted, was_muted;
+
 	is_muted = was_muted = getInt(MUTE_STATE_PATH);
 	SetMute(is_muted);
-	
-	while(!quit) {
+
+	while (!quit) {
 		usleep(200000); // 5 times per second
-		
+
 		is_muted = getInt(MUTE_STATE_PATH);
 		// swallow mute val -1 on shutdown
-		if (is_muted >= 0 && was_muted!=is_muted) {
+		if (is_muted >= 0 && was_muted != is_muted) {
 			was_muted = is_muted;
 			SetMute(is_muted);
 			if (GetMute()) {
@@ -86,11 +91,12 @@ static void* watchMute(void *arg) {
 			}
 		}
 	}
-	
+
 	return NULL;
 }
 
-int main (int argc, char *argv[]) {
+int main(int argc, char *argv[])
+{
 	struct sigaction sa = {0};
 	sa.sa_handler = on_term;
 	sigaction(SIGTERM, &sa, NULL);
@@ -99,73 +105,78 @@ int main (int argc, char *argv[]) {
 	pthread_create(&mute_pt, NULL, &watchMute, NULL);
 
 	char path[32];
-	for (int i=0; i<INPUT_COUNT; i++) {
+	for (int i = 0; i < INPUT_COUNT; i++) {
 		sprintf(path, "/dev/input/event%i", i);
 		inputs[i] = open(path, O_RDONLY | O_NONBLOCK | O_CLOEXEC);
 	}
-	
+
 	uint32_t input;
 	uint32_t val;
 	uint32_t menu_pressed = 0;
 	uint32_t menu2_pressed = 0;
-	
+
 	uint32_t up_pressed = 0;
 	uint32_t up_just_pressed = 0;
 	uint32_t up_repeat_at = 0;
-	
+
 	uint32_t down_pressed = 0;
 	uint32_t down_just_pressed = 0;
 	uint32_t down_repeat_at = 0;
-	
+
 	uint8_t ignore;
 	uint32_t then;
 	uint32_t now;
 	struct timeval tod;
-	
+
 	gettimeofday(&tod, NULL);
 	then = tod.tv_sec * 1000 + tod.tv_usec / 1000; // essential SDL_GetTicks()
 	ignore = 0;
-	
+
 	while (!quit) {
 		gettimeofday(&tod, NULL);
 		now = tod.tv_sec * 1000 + tod.tv_usec / 1000;
-		if (now-then>1000) ignore = 1; // ignore input that arrived during sleep
-		
-		for (int i=0; i<INPUT_COUNT; i++) {
+		if (now - then > 1000)
+			ignore = 1; // ignore input that arrived during sleep
+
+		for (int i = 0; i < INPUT_COUNT; i++) {
 			input = inputs[i];
-			while(read(input, &ev, sizeof(ev))==sizeof(ev)) {
-				if (ignore) continue;
+			while (read(input, &ev, sizeof(ev)) == sizeof(ev)) {
+				if (ignore)
+					continue;
 				val = ev.value;
-				if (ev.type==EV_SW) {
-					//printf("switch: %i\n", ev.code);
-					if (ev.code==CODE_JACK) {
-						//printf("jack: %i\n", val);
+				if (ev.type == EV_SW) {
+					// printf("switch: %i\n", ev.code);
+					if (ev.code == CODE_JACK) {
+						// printf("jack: %i\n", val);
 						SetJack(val);
 					}
 				}
-				if (( ev.type != EV_KEY ) || ( val > REPEAT )) continue;
-				//printf("code: %i (%i)\n", ev.code, val); fflush(stdout);
+				if ((ev.type != EV_KEY) || (val > REPEAT))
+					continue;
+				// printf("code: %i (%i)\n", ev.code, val); fflush(stdout);
 				switch (ev.code) {
-					case CODE_MENU2:
-						menu_pressed = val;
+				case CODE_MENU2:
+					menu_pressed = val;
 					break;
-					case CODE_MENU0:
-						menu2_pressed = val;
+				case CODE_MENU0:
+					menu2_pressed = val;
 					break;
-					case CODE_PLUS:
-						up_pressed = up_just_pressed = val;
-						if (val) up_repeat_at = now + 300;
+				case CODE_PLUS:
+					up_pressed = up_just_pressed = val;
+					if (val)
+						up_repeat_at = now + 300;
 					break;
-					case CODE_MINUS:
-						down_pressed = down_just_pressed = val;
-						if (val) down_repeat_at = now + 300;
+				case CODE_MINUS:
+					down_pressed = down_just_pressed = val;
+					if (val)
+						down_repeat_at = now + 300;
 					break;
-					default:
+				default:
 					break;
 				}
 			}
 		}
-		
+
 		if (ignore) {
 			menu_pressed = 0;
 			menu2_pressed = 0;
@@ -174,56 +185,60 @@ int main (int argc, char *argv[]) {
 			up_repeat_at = 0;
 			down_repeat_at = 0;
 		}
-		
-		if (up_just_pressed || (up_pressed && now>=up_repeat_at)) {
+
+		if (up_just_pressed || (up_pressed && now >= up_repeat_at)) {
 			if (menu_pressed) {
 				val = GetBrightness();
-				if (val<BRIGHTNESS_MAX) SetBrightness(++val);
-			}
-			else if (menu2_pressed) {
+				if (val < BRIGHTNESS_MAX)
+					SetBrightness(++val);
+			} else if (menu2_pressed) {
 				val = GetColortemp();
-				if (val<COLORTEMP_MAX) {
+				if (val < COLORTEMP_MAX) {
 					SetColortemp(++val);
 				}
-			}
-			else {
+			} else {
 				val = GetVolume();
-				if (val<VOLUME_MAX) SetVolume(++val);
+				if (val < VOLUME_MAX)
+					SetVolume(++val);
 			}
-			
-			if (up_just_pressed) up_just_pressed = 0;
-			else up_repeat_at += 100;
+
+			if (up_just_pressed)
+				up_just_pressed = 0;
+			else
+				up_repeat_at += 100;
 		}
-		
-		if (down_just_pressed || (down_pressed && now>=down_repeat_at)) {
+
+		if (down_just_pressed || (down_pressed && now >= down_repeat_at)) {
 			if (menu_pressed) {
 				val = GetBrightness();
-				if (val>BRIGHTNESS_MIN) SetBrightness(--val);
-			}
-			else if (menu2_pressed) {
+				if (val > BRIGHTNESS_MIN)
+					SetBrightness(--val);
+			} else if (menu2_pressed) {
 				val = GetColortemp();
-				if (val>COLORTEMP_MIN) {
+				if (val > COLORTEMP_MIN) {
 					SetColortemp(--val);
 				}
-			}
-			else {
+			} else {
 				val = GetVolume();
-				if (val>VOLUME_MIN) SetVolume(--val);
+				if (val > VOLUME_MIN)
+					SetVolume(--val);
 			}
-			
-			if (down_just_pressed) down_just_pressed = 0;
-			else down_repeat_at += 100;
+
+			if (down_just_pressed)
+				down_just_pressed = 0;
+			else
+				down_repeat_at += 100;
 		}
-		
+
 		then = now;
 		ignore = 0;
-		
+
 		usleep(16666); // 60fps
 	}
 
-	for (int i=0; i<INPUT_COUNT; i++)
+	for (int i = 0; i < INPUT_COUNT; i++)
 		close(inputs[i]);
-	
+
 	pthread_cancel(mute_pt);
 	pthread_join(mute_pt, NULL);
 }
diff --git a/workspace/tg5040/libmsettings/msettings.c b/workspace/tg5040/libmsettings/msettings.c
index dcafe7317..c603ab384 100644
--- a/workspace/tg5040/libmsettings/msettings.c
+++ b/workspace/tg5040/libmsettings/msettings.c
@@ -36,7 +36,7 @@ typedef struct SettingsV4 {
 	int speaker;
 	int mute;
 	int unused[2];
-	int jack; 
+	int jack;
 } SettingsV4;
 
 // Second NextUI settings format
@@ -49,7 +49,7 @@ typedef struct SettingsV5 {
 	int mute;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV5;
 
 // Third NextUI settings format
@@ -65,7 +65,7 @@ typedef struct SettingsV6 {
 	int exposure;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV6;
 
 typedef struct SettingsV7 {
@@ -85,7 +85,7 @@ typedef struct SettingsV7 {
 	int mutedexposure;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV7;
 
 typedef struct SettingsV8 {
@@ -106,7 +106,7 @@ typedef struct SettingsV8 {
 	int toggled_volume;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV8;
 
 typedef struct SettingsV9 {
@@ -137,7 +137,7 @@ typedef struct SettingsV9 {
 	int turbo_r2;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 } SettingsV9;
 
 typedef struct SettingsV10 {
@@ -168,7 +168,7 @@ typedef struct SettingsV10 {
 	int turbo_r2;
 	int unused[2]; // for future use
 	// NOTE: doesn't really need to be persisted but still needs to be shared
-	int jack; 
+	int jack;
 	int audiosink; // was bluetooth true/false before
 } SettingsV10;
 
@@ -205,7 +205,7 @@ static Settings DefaultSettings = {
 	.jack = 0,
 	.audiosink = AUDIO_SINK_DEFAULT,
 };
-static Settings* settings;
+static Settings *settings;
 
 #define SHM_KEY "/SharedSettings"
 static char SettingsPath[256];
@@ -231,39 +231,47 @@ void turboL2(int);
 void turboR1(int);
 void turboR2(int);
 
-int getInt(char* path) {
+int getInt(char *path)
+{
 	int i = 0;
 	FILE *file = fopen(path, "r");
-	if (file!=NULL) {
+	if (file != NULL) {
 		fscanf(file, "%i", &i);
 		fclose(file);
 	}
 	return i;
 }
-void putFile(char* path, char* contents) {
-	FILE* file = fopen(path, "w");
+void putFile(char *path, char *contents)
+{
+	FILE *file = fopen(path, "w");
 	if (file) {
 		fputs(contents, file);
 		fclose(file);
 	}
 }
-void putInt(char* path, int value) {
+void putInt(char *path, int value)
+{
 	char buffer[8];
 	sprintf(buffer, "%d", value);
 	putFile(path, buffer);
 }
 
-void touch(char* path) {
-	close(open(path, O_RDWR|O_CREAT, 0777));
+void touch(char *path)
+{
+	close(open(path, O_RDWR | O_CREAT, 0777));
 }
-int exactMatch(char* str1, char* str2) {
-	if (!str1 || !str2) return 0; // NULL isn't safe here
+int exactMatch(char *str1, char *str2)
+{
+	if (!str1 || !str2)
+		return 0; // NULL isn't safe here
 	int len1 = strlen(str1);
-	if (len1!=strlen(str2)) return 0;
-	return (strncmp(str1,str2,len1)==0);
+	if (len1 != strlen(str2))
+		return 0;
+	return (strncmp(str1, str2, len1) == 0);
 }
 
-int peekVersion(const char *filename) {
+int peekVersion(const char *filename)
+{
 	int version = 0;
 	FILE *file = fopen(filename, "r");
 	if (file) {
@@ -275,19 +283,19 @@ int peekVersion(const char *filename) {
 
 static int is_brick = 0;
 
-void InitSettings(void) {	
-	char* device = getenv("DEVICE");
+void InitSettings(void)
+{
+	char *device = getenv("DEVICE");
 	is_brick = exactMatch("brick", device);
-	
+
 	sprintf(SettingsPath, "%s/msettings.bin", getenv("USERDATA_PATH"));
-	
+
 	shm_fd = shm_open(SHM_KEY, O_RDWR | O_CREAT | O_EXCL, 0644); // see if it exists
-	if (shm_fd==-1 && errno==EEXIST) { // already exists
+	if (shm_fd == -1 && errno == EEXIST) {						 // already exists
 		// puts("Settings client");
 		shm_fd = shm_open(SHM_KEY, O_RDWR, 0644);
 		settings = mmap(NULL, shm_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0);
-	}
-	else { // host
+	} else { // host
 		// puts("Settings host"); // keymon
 		is_host = 1;
 		// we created it so set initial size and populate
@@ -296,32 +304,31 @@ void InitSettings(void) {
 
 		// peek the first int from fd, it's the version
 		int version = peekVersion(SettingsPath);
-		if(version > 0) {
+		if (version > 0) {
 			int fd = open(SettingsPath, O_RDONLY);
-			if (fd>=0) {
+			if (fd >= 0) {
 				if (version == SETTINGS_VERSION) {
 					read(fd, settings, shm_size);
-				}
-				else {
+				} else {
 					// initialize with defaults
 					memcpy(settings, &DefaultSettings, shm_size);
 
 					// overwrite with migrated data
-					if(version==9) {
+					if (version == 9) {
 						printf("Found settings v9.\n");
 						SettingsV9 old;
 						read(fd, &old, sizeof(SettingsV9));
 
-						settings-> disable_dpad_on_mute = old.disable_dpad_on_mute;
-						settings-> emulate_joystick_on_mute = old.emulate_joystick_on_mute;
-						settings-> turbo_a = old.turbo_a;
-						settings-> turbo_b = old.turbo_b;
-						settings-> turbo_x = old.turbo_x;
-						settings-> turbo_y = old.turbo_y;
-						settings-> turbo_l1 = old.turbo_l1;
-						settings-> turbo_l2 = old.turbo_l2;
-						settings-> turbo_r1 = old.turbo_r1;
-						settings-> turbo_r2 = old.turbo_r2;
+						settings->disable_dpad_on_mute = old.disable_dpad_on_mute;
+						settings->emulate_joystick_on_mute = old.emulate_joystick_on_mute;
+						settings->turbo_a = old.turbo_a;
+						settings->turbo_b = old.turbo_b;
+						settings->turbo_x = old.turbo_x;
+						settings->turbo_y = old.turbo_y;
+						settings->turbo_l1 = old.turbo_l1;
+						settings->turbo_l2 = old.turbo_l2;
+						settings->turbo_r1 = old.turbo_r1;
+						settings->turbo_r2 = old.turbo_r2;
 
 						settings->toggled_volume = old.toggled_volume;
 
@@ -342,8 +349,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==8) {
+					} else if (version == 8) {
 						printf("Found settings v8.\n");
 						SettingsV8 old;
 						read(fd, &old, sizeof(SettingsV8));
@@ -367,8 +373,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==7) {
+					} else if (version == 7) {
 						printf("Found settings v7.\n");
 						SettingsV7 old;
 						read(fd, &old, sizeof(SettingsV7));
@@ -391,8 +396,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==6) {
+					} else if (version == 6) {
 						printf("Found settings v6.\n");
 						SettingsV6 old;
 						read(fd, &old, sizeof(SettingsV6));
@@ -408,8 +412,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==5) {
+					} else if (version == 5) {
 						printf("Found settings v5.\n");
 						SettingsV5 old;
 						read(fd, &old, sizeof(SettingsV5));
@@ -421,8 +424,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==4) {
+					} else if (version == 4) {
 						printf("Found settings v4.\n");
 						SettingsV4 old;
 						read(fd, &old, sizeof(SettingsV4));
@@ -435,8 +437,7 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else if(version==3) {
+					} else if (version == 3) {
 						printf("Found settings v3.\n");
 						SettingsV3 old;
 						read(fd, &old, sizeof(SettingsV3));
@@ -446,24 +447,21 @@ void InitSettings(void) {
 						settings->speaker = old.speaker;
 						settings->mute = old.mute;
 						settings->jack = old.jack;
-					}
-					else {
+					} else {
 						printf("Found unsupported settings version: %i.\n", version);
 					}
 				}
-				
+
 				close(fd);
-			}
-			else {
+			} else {
 				// load defaults
 				memcpy(settings, &DefaultSettings, shm_size);
 			}
-		}
-		else {
+		} else {
 			// load defaults
 			memcpy(settings, &DefaultSettings, shm_size);
 		}
-		
+
 		// these shouldn't be persisted
 		// settings->jack = 0;
 		settings->mute = 0;
@@ -472,25 +470,29 @@ void InitSettings(void) {
 	system("amixer");
 
 	// make sure all these volume-influencing controls are set to defaults, we will set volume with 'digital volume'
-	if(GetAudioSink() == AUDIO_SINK_DEFAULT) {
+	if (GetAudioSink() == AUDIO_SINK_DEFAULT) {
 		system("amixer sset 'Headphone' 0");	  // 100%
 		system("amixer sset 'digital volume' 0"); // 100%
-		system("amixer sset 'DAC Swap' Off"); // Fix L/R channels
+		system("amixer sset 'DAC Swap' Off");	  // Fix L/R channels
 	}
 
 	// This will implicitly update all other settings based on FN switch state
 	SetMute(settings->mute);
 }
-int InitializedSettings(void) {
+int InitializedSettings(void)
+{
 	return (settings != NULL);
 }
-void QuitSettings(void) {
+void QuitSettings(void)
+{
 	munmap(settings, shm_size);
-	if (is_host) shm_unlink(SHM_KEY);
+	if (is_host)
+		shm_unlink(SHM_KEY);
 }
-static inline void SaveSettings(void) {
-	int fd = open(SettingsPath, O_CREAT|O_WRONLY, 0644);
-	if (fd>=0) {
+static inline void SaveSettings(void)
+{
+	int fd = open(SettingsPath, O_CREAT | O_WRONLY, 0644);
+	if (fd >= 0) {
 		write(fd, settings, shm_size);
 		close(fd);
 		sync();
@@ -499,35 +501,42 @@ static inline void SaveSettings(void) {
 
 ///////// Getters exposed in public API
 
-int GetBrightness(void) { // 0-10
+int GetBrightness(void)
+{ // 0-10
 	return settings->brightness;
 }
-int GetColortemp(void) { // 0-10
+int GetColortemp(void)
+{ // 0-10
 	return settings->colortemperature;
 }
-int GetVolume(void) { // 0-20
+int GetVolume(void)
+{ // 0-20
 	if (settings->mute && GetMutedVolume() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 		return GetMutedVolume();
-	
-	if(settings->jack || settings->audiosink != AUDIO_SINK_DEFAULT)
+
+	if (settings->jack || settings->audiosink != AUDIO_SINK_DEFAULT)
 		return settings->headphones;
 
 	return settings->speaker;
 }
 // monitored and set by thread in keymon
-int GetJack(void) {
+int GetJack(void)
+{
 	return settings->jack;
 }
 // monitored and set by thread in audiomon
-int GetAudioSink(void) {
+int GetAudioSink(void)
+{
 	return settings->audiosink;
 }
 
-int GetHDMI(void) { 
+int GetHDMI(void)
+{
 	return 0;
 };
 
-int GetMute(void) {
+int GetMute(void)
+{
 	return settings->mute;
 }
 int GetContrast(void)
@@ -609,20 +618,23 @@ int GetMuteTurboR2(void)
 
 ///////// Setters exposed in public API
 
-void SetBrightness(int value) {
+void SetBrightness(int value)
+{
 	SetRawBrightness(scaleBrightness(value));
 	settings->brightness = value;
 	SaveSettings();
 }
-void SetColortemp(int value) {
+void SetColortemp(int value)
+{
 	SetRawColortemp(scaleColortemp(value));
 	settings->colortemperature = value;
 	SaveSettings();
 }
-void SetVolume(int value) { // 0-20
-	if (settings->mute) 
+void SetVolume(int value)
+{ // 0-20
+	if (settings->mute)
 		return SetRawVolume(scaleVolume(GetMutedVolume()));
-	
+
 	if (settings->jack || settings->audiosink != AUDIO_SINK_DEFAULT)
 		settings->headphones = value;
 	else
@@ -632,87 +644,91 @@ void SetVolume(int value) { // 0-20
 	SaveSettings();
 }
 // monitored and set by thread in keymon
-void SetJack(int value) {
-	printf("SetJack(%i)\n", value); fflush(stdout);
-	
+void SetJack(int value)
+{
+	printf("SetJack(%i)\n", value);
+	fflush(stdout);
+
 	settings->jack = value;
 	SetVolume(GetVolume());
 }
 // monitored and set by thread in audiomon
-void SetAudioSink(int value) {
-	printf("SetAudioSink(%i)\n", value); fflush(stdout);
-	
+void SetAudioSink(int value)
+{
+	printf("SetAudioSink(%i)\n", value);
+	fflush(stdout);
+
 	settings->audiosink = value;
 	SetVolume(GetVolume());
 }
 
-void SetHDMI(int value){};
+void SetHDMI(int value) {};
 
-void SetMute(int value) {
+void SetMute(int value)
+{
 	settings->mute = value;
 	if (settings->mute) {
 		if (GetMutedVolume() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawVolume(scaleVolume(GetMutedVolume()));
 		// custom mute mode display settings
-		if(GetMutedBrightness() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
+		if (GetMutedBrightness() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawBrightness(scaleBrightness(GetMutedBrightness()));
-		if(GetMutedColortemp() != SETTINGS_DEFAULT_MUTE_NO_CHANGE) 
+		if (GetMutedColortemp() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawColortemp(scaleColortemp(GetMutedColortemp()));
-		if(GetMutedContrast() != SETTINGS_DEFAULT_MUTE_NO_CHANGE) 
+		if (GetMutedContrast() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawContrast(scaleContrast(GetMutedContrast()));
-		if(GetMutedSaturation() != SETTINGS_DEFAULT_MUTE_NO_CHANGE) 
+		if (GetMutedSaturation() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawSaturation(scaleSaturation(GetMutedSaturation()));
-		if(GetMutedExposure() != SETTINGS_DEFAULT_MUTE_NO_CHANGE) 
+		if (GetMutedExposure() != SETTINGS_DEFAULT_MUTE_NO_CHANGE)
 			SetRawExposure(scaleExposure(GetMutedExposure()));
-		if(is_brick && GetMuteDisablesDpad())
+		if (is_brick && GetMuteDisablesDpad())
 			disableDpad(1);
-		if(is_brick && GetMuteEmulatesJoystick())
+		if (is_brick && GetMuteEmulatesJoystick())
 			emulateJoystick(1);
-		if(GetMuteTurboA())
+		if (GetMuteTurboA())
 			turboA(1);
-		if(GetMuteTurboB())
+		if (GetMuteTurboB())
 			turboB(1);
-		if(GetMuteTurboX())
+		if (GetMuteTurboX())
 			turboX(1);
-		if(GetMuteTurboY())
+		if (GetMuteTurboY())
 			turboY(1);
-		if(GetMuteTurboL1())
+		if (GetMuteTurboL1())
 			turboL1(1);
-		if(GetMuteTurboL2())
+		if (GetMuteTurboL2())
 			turboL2(1);
-		if(GetMuteTurboR1())
+		if (GetMuteTurboR1())
 			turboR1(1);
-		if(GetMuteTurboR2())
+		if (GetMuteTurboR2())
 			turboR2(1);
-	}
-	else {
+	} else {
 		SetVolume(GetVolume());
 		SetBrightness(GetBrightness());
 		SetColortemp(GetColortemp());
 		SetContrast(GetContrast());
 		SetSaturation(GetSaturation());
 		SetExposure(GetExposure());
-		if(is_brick) {
-			if(GetMuteDisablesDpad())
+		if (is_brick) {
+			if (GetMuteDisablesDpad())
 				disableDpad(0);
-			if(GetMuteEmulatesJoystick())
+			if (GetMuteEmulatesJoystick())
 				emulateJoystick(0);
 		}
-		if(GetMuteTurboA())
+		if (GetMuteTurboA())
 			turboA(0);
-		if(GetMuteTurboB())
+		if (GetMuteTurboB())
 			turboB(0);
-		if(GetMuteTurboX())
+		if (GetMuteTurboX())
 			turboX(0);
-		if(GetMuteTurboY())
+		if (GetMuteTurboY())
 			turboY(0);
-		if(GetMuteTurboL1())
+		if (GetMuteTurboL1())
 			turboL1(0);
-		if(GetMuteTurboL2())
+		if (GetMuteTurboL2())
 			turboL2(0);
-		if(GetMuteTurboR1())
+		if (GetMuteTurboR1())
 			turboR1(0);
-		if(GetMuteTurboR2())
+		if (GetMuteTurboR2())
 			turboR2(0);
 	}
 }
@@ -844,257 +860,454 @@ void SetMuteTurboR2(int value)
 #define INPUTD_TURBO_R1_PATH "/tmp/trimui_inputd/turbo_r"
 #define INPUTD_TURBO_R2_PATH "/tmp/trimui_inputd/turbo_r2"
 
-void disableDpad(int value) {
-	if(value) {
+void disableDpad(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_DPAD_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_DPAD_PATH);
 	}
 }
 
-void emulateJoystick(int value) {
-	if(value) {
+void emulateJoystick(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_JOYSTICK_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_JOYSTICK_PATH);
 	}
 }
 
-void turboA(int value) {
-	if(value) {
+void turboA(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_A_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_A_PATH);
 	}
 }
-void turboB(int value) {
-	if(value) {
+void turboB(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_B_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_B_PATH);
 	}
 }
-void turboX(int value) {
-	if(value) {
+void turboX(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_X_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_X_PATH);
 	}
 }
-void turboY(int value) {
-	if(value) {
+void turboY(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_Y_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_Y_PATH);
 	}
 }
-void turboL1(int value) {
-	if(value) {
+void turboL1(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_L1_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_L1_PATH);
 	}
 }
-void turboL2(int value) {
-	if(value) {
+void turboL2(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_L2_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_L2_PATH);
 	}
 }
-void turboR1(int value) {
-	if(value) {
+void turboR1(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_R1_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_R1_PATH);
 	}
 }
-void turboR2(int value) {
-	if(value) {
+void turboR2(int value)
+{
+	if (value) {
 		mkdir(INPUTD_PATH, 0755);
 		touch(INPUTD_TURBO_R2_PATH);
-	}
-	else {
+	} else {
 		unlink(INPUTD_TURBO_R2_PATH);
 	}
 }
 
 ///////// Platform specific scaling
 
-int scaleVolume(int value) {
+int scaleVolume(int value)
+{
 	return value * 5; // scale 0-20 to 0-100
 }
 
-int scaleBrightness(int value) {
+int scaleBrightness(int value)
+{
 	int raw;
 	if (is_brick) {
 		switch (value) {
-			case 0: raw=1; break; 		// 0
-			case 1: raw=8; break; 		// 8
-			case 2: raw=16; break; 		// 8
-			case 3: raw=32; break; 		// 16
-			case 4: raw=48; break;		// 16
-			case 5: raw=72; break;		// 24
-			case 6: raw=96; break;		// 24
-			case 7: raw=128; break;		// 32
-			case 8: raw=160; break;		// 32
-			case 9: raw=192; break;		// 32
-			case 10: raw=255; break;	// 64
+		case 0:
+			raw = 1;
+			break; // 0
+		case 1:
+			raw = 8;
+			break; // 8
+		case 2:
+			raw = 16;
+			break; // 8
+		case 3:
+			raw = 32;
+			break; // 16
+		case 4:
+			raw = 48;
+			break; // 16
+		case 5:
+			raw = 72;
+			break; // 24
+		case 6:
+			raw = 96;
+			break; // 24
+		case 7:
+			raw = 128;
+			break; // 32
+		case 8:
+			raw = 160;
+			break; // 32
+		case 9:
+			raw = 192;
+			break; // 32
+		case 10:
+			raw = 255;
+			break; // 64
 		}
-	}
-	else {
+	} else {
 		switch (value) {
-			case 0: raw=4; break; 		//  0
-			case 1: raw=6; break; 		//  2
-			case 2: raw=10; break; 		//  4
-			case 3: raw=16; break; 		//  6
-			case 4: raw=32; break;		// 16
-			case 5: raw=48; break;		// 16
-			case 6: raw=64; break;		// 16
-			case 7: raw=96; break;		// 32
-			case 8: raw=128; break;		// 32
-			case 9: raw=192; break;		// 64
-			case 10: raw=255; break;	// 64
+		case 0:
+			raw = 4;
+			break; //  0
+		case 1:
+			raw = 6;
+			break; //  2
+		case 2:
+			raw = 10;
+			break; //  4
+		case 3:
+			raw = 16;
+			break; //  6
+		case 4:
+			raw = 32;
+			break; // 16
+		case 5:
+			raw = 48;
+			break; // 16
+		case 6:
+			raw = 64;
+			break; // 16
+		case 7:
+			raw = 96;
+			break; // 32
+		case 8:
+			raw = 128;
+			break; // 32
+		case 9:
+			raw = 192;
+			break; // 64
+		case 10:
+			raw = 255;
+			break; // 64
 		}
 	}
 	return raw;
 }
-int scaleColortemp(int value) {
+int scaleColortemp(int value)
+{
 	int raw;
-	
+
 	switch (value) {
-		case 0: raw=-200; break; 		// 8
-		case 1: raw=-190; break; 		// 8
-		case 2: raw=-180; break; 		// 16
-		case 3: raw=-170; break;		// 16
-		case 4: raw=-160; break;		// 24
-		case 5: raw=-150; break;		// 24
-		case 6: raw=-140; break;		// 32
-		case 7: raw=-130; break;		// 32
-		case 8: raw=-120; break;		// 32
-		case 9: raw=-110; break;	// 64
-		case 10: raw=-100; break; 		// 0
-		case 11: raw=-90; break; 		// 8
-		case 12: raw=-80; break; 		// 8
-		case 13: raw=-70; break; 		// 16
-		case 14: raw=-60; break;		// 16
-		case 15: raw=-50; break;		// 24
-		case 16: raw=-40; break;		// 24
-		case 17: raw=-30; break;		// 32
-		case 18: raw=-20; break;		// 32
-		case 19: raw=-10; break;		// 32
-		case 20: raw=0; break;	// 64
-		case 21: raw=10; break; 		// 0
-		case 22: raw=20; break; 		// 8
-		case 23: raw=30; break; 		// 8
-		case 24: raw=40; break; 		// 16
-		case 25: raw=50; break;		// 16
-		case 26: raw=60; break;		// 24
-		case 27: raw=70; break;		// 24
-		case 28: raw=80; break;		// 32
-		case 29: raw=90; break;		// 32
-		case 30: raw=100; break;		// 32
-		case 31: raw=110; break;	// 64
-		case 32: raw=120; break; 		// 0
-		case 33: raw=130; break; 		// 8
-		case 34: raw=140; break; 		// 8
-		case 35: raw=150; break; 		// 16
-		case 36: raw=160; break;		// 16
-		case 37: raw=170; break;		// 24
-		case 38: raw=180; break;		// 24
-		case 39: raw=190; break;		// 32
-		case 40: raw=200; break;		// 32
+	case 0:
+		raw = -200;
+		break; // 8
+	case 1:
+		raw = -190;
+		break; // 8
+	case 2:
+		raw = -180;
+		break; // 16
+	case 3:
+		raw = -170;
+		break; // 16
+	case 4:
+		raw = -160;
+		break; // 24
+	case 5:
+		raw = -150;
+		break; // 24
+	case 6:
+		raw = -140;
+		break; // 32
+	case 7:
+		raw = -130;
+		break; // 32
+	case 8:
+		raw = -120;
+		break; // 32
+	case 9:
+		raw = -110;
+		break; // 64
+	case 10:
+		raw = -100;
+		break; // 0
+	case 11:
+		raw = -90;
+		break; // 8
+	case 12:
+		raw = -80;
+		break; // 8
+	case 13:
+		raw = -70;
+		break; // 16
+	case 14:
+		raw = -60;
+		break; // 16
+	case 15:
+		raw = -50;
+		break; // 24
+	case 16:
+		raw = -40;
+		break; // 24
+	case 17:
+		raw = -30;
+		break; // 32
+	case 18:
+		raw = -20;
+		break; // 32
+	case 19:
+		raw = -10;
+		break; // 32
+	case 20:
+		raw = 0;
+		break; // 64
+	case 21:
+		raw = 10;
+		break; // 0
+	case 22:
+		raw = 20;
+		break; // 8
+	case 23:
+		raw = 30;
+		break; // 8
+	case 24:
+		raw = 40;
+		break; // 16
+	case 25:
+		raw = 50;
+		break; // 16
+	case 26:
+		raw = 60;
+		break; // 24
+	case 27:
+		raw = 70;
+		break; // 24
+	case 28:
+		raw = 80;
+		break; // 32
+	case 29:
+		raw = 90;
+		break; // 32
+	case 30:
+		raw = 100;
+		break; // 32
+	case 31:
+		raw = 110;
+		break; // 64
+	case 32:
+		raw = 120;
+		break; // 0
+	case 33:
+		raw = 130;
+		break; // 8
+	case 34:
+		raw = 140;
+		break; // 8
+	case 35:
+		raw = 150;
+		break; // 16
+	case 36:
+		raw = 160;
+		break; // 16
+	case 37:
+		raw = 170;
+		break; // 24
+	case 38:
+		raw = 180;
+		break; // 24
+	case 39:
+		raw = 190;
+		break; // 32
+	case 40:
+		raw = 200;
+		break; // 32
 	}
 	return raw;
 }
-int scaleContrast(int value) {
+int scaleContrast(int value)
+{
 	int raw;
-	
+
 	switch (value) {
-		// dont offer -5/ raw 0, looks like it might turn off the display completely?
-		case -4: raw=10; break;
-		case -3: raw=20; break;
-		case -2: raw=30; break;
-		case -1: raw=40; break;
-		case 0: raw=50; break;
-		case 1: raw=60; break;
-		case 2: raw=70; break;
-		case 3: raw=80; break;
-		case 4: raw=90; break;
-		case 5: raw=100; break;
+	// dont offer -5/ raw 0, looks like it might turn off the display completely?
+	case -4:
+		raw = 10;
+		break;
+	case -3:
+		raw = 20;
+		break;
+	case -2:
+		raw = 30;
+		break;
+	case -1:
+		raw = 40;
+		break;
+	case 0:
+		raw = 50;
+		break;
+	case 1:
+		raw = 60;
+		break;
+	case 2:
+		raw = 70;
+		break;
+	case 3:
+		raw = 80;
+		break;
+	case 4:
+		raw = 90;
+		break;
+	case 5:
+		raw = 100;
+		break;
 	}
 	return raw;
 }
-int scaleSaturation(int value) {
+int scaleSaturation(int value)
+{
 	int raw;
-	
+
 	switch (value) {
-		case -5: raw=0; break;
-		case -4: raw=10; break;
-		case -3: raw=20; break;
-		case -2: raw=30; break;
-		case -1: raw=40; break;
-		case 0: raw=50; break;
-		case 1: raw=60; break;
-		case 2: raw=70; break;
-		case 3: raw=80; break;
-		case 4: raw=90; break;
-		case 5: raw=100; break;
+	case -5:
+		raw = 0;
+		break;
+	case -4:
+		raw = 10;
+		break;
+	case -3:
+		raw = 20;
+		break;
+	case -2:
+		raw = 30;
+		break;
+	case -1:
+		raw = 40;
+		break;
+	case 0:
+		raw = 50;
+		break;
+	case 1:
+		raw = 60;
+		break;
+	case 2:
+		raw = 70;
+		break;
+	case 3:
+		raw = 80;
+		break;
+	case 4:
+		raw = 90;
+		break;
+	case 5:
+		raw = 100;
+		break;
 	}
 	return raw;
 }
-int scaleExposure(int value) {
+int scaleExposure(int value)
+{
 	int raw;
-	
+
 	switch (value) {
-		// stock OS also avoids setting anything lower, so we do the same here.
-		case -4: raw=10; break;
-		case -3: raw=20; break;
-		case -2: raw=30; break;
-		case -1: raw=40; break;
-		case 0: raw=50; break;
-		case 1: raw=60; break;
-		case 2: raw=70; break;
-		case 3: raw=80; break;
-		case 4: raw=90; break;
-		case 5: raw=100; break;
+	// stock OS also avoids setting anything lower, so we do the same here.
+	case -4:
+		raw = 10;
+		break;
+	case -3:
+		raw = 20;
+		break;
+	case -2:
+		raw = 30;
+		break;
+	case -1:
+		raw = 40;
+		break;
+	case 0:
+		raw = 50;
+		break;
+	case 1:
+		raw = 60;
+		break;
+	case 2:
+		raw = 70;
+		break;
+	case 3:
+		raw = 80;
+		break;
+	case 4:
+		raw = 90;
+		break;
+	case 5:
+		raw = 100;
+		break;
 	}
 	return raw;
 }
 
 ///////// Platform specific, unscaled accessors
 
-#define DISP_LCD_SET_BRIGHTNESS  0x102
-void SetRawBrightness(int val) { // 0 - 255
-	printf("SetRawBrightness(%i)\n", val); fflush(stdout);
+#define DISP_LCD_SET_BRIGHTNESS 0x102
+void SetRawBrightness(int val)
+{ // 0 - 255
+	printf("SetRawBrightness(%i)\n", val);
+	fflush(stdout);
 
-    int fd = open("/dev/disp", O_RDWR);
+	int fd = open("/dev/disp", O_RDWR);
 	if (fd) {
-	    unsigned long param[4]={0,val,0,0};
+		unsigned long param[4] = {0, val, 0, 0};
 		ioctl(fd, DISP_LCD_SET_BRIGHTNESS, &param);
 		close(fd);
 	}
 }
-void SetRawColortemp(int val) { // 0 - 255
-	printf("SetRawColortemp(%i)\n", val); fflush(stdout);
+void SetRawColortemp(int val)
+{ // 0 - 255
+	printf("SetRawColortemp(%i)\n", val);
+	fflush(stdout);
 
 	FILE *fd = fopen("/sys/class/disp/disp/attr/color_temperature", "w");
 	if (fd) {
@@ -1104,26 +1317,28 @@ void SetRawColortemp(int val) { // 0 - 255
 }
 
 // Find the first A2DP playback volume control via amixer
-static int get_a2dp_simple_control_name(char *buf, size_t buflen) {
-    FILE *fp = popen("amixer scontrols", "r");
-    if (!fp) return 0;
-
-    char line[256];
-    while (fgets(line, sizeof(line), fp)) {
-        char *start = strchr(line, '\'');
-        char *end = strrchr(line, '\'');
-        if (start && end && end > start) {
-            size_t len = end - start - 1;
-            if (len < buflen) {
-                strncpy(buf, start + 1, len);
-                buf[len] = '\0';
-                if (strstr(buf, "A2DP")) { // first A2DP simple control
-                    pclose(fp);
+static int get_a2dp_simple_control_name(char *buf, size_t buflen)
+{
+	FILE *fp = popen("amixer scontrols", "r");
+	if (!fp)
+		return 0;
+
+	char line[256];
+	while (fgets(line, sizeof(line), fp)) {
+		char *start = strchr(line, '\'');
+		char *end = strrchr(line, '\'');
+		if (start && end && end > start) {
+			size_t len = end - start - 1;
+			if (len < buflen) {
+				strncpy(buf, start + 1, len);
+				buf[len] = '\0';
+				if (strstr(buf, "A2DP")) { // first A2DP simple control
+					pclose(fp);
 					char esc_buf[128];
 					char *src = buf;
 					char *dst = esc_buf;
-					while(*src && (dst - esc_buf) < (sizeof(esc_buf) - 4)) {
-						if(*src == '\"') {
+					while (*src && (dst - esc_buf) < (sizeof(esc_buf) - 4)) {
+						if (*src == '\"') {
 							*dst++ = '\\';
 							*dst++ = '\"';
 						} else {
@@ -1135,79 +1350,81 @@ static int get_a2dp_simple_control_name(char *buf, size_t buflen) {
 					strncpy(buf, esc_buf, buflen);
 					buf[buflen - 1] = '\0';
 					return 1;
-                }
-            }
-        }
-    }
+				}
+			}
+		}
+	}
 
-    pclose(fp);
-    return 0;
+	pclose(fp);
+	return 0;
 }
 
-void SetRawVolume(int val) { // in: 0-100
-	if (settings->mute) 
+void SetRawVolume(int val)
+{ // in: 0-100
+	if (settings->mute)
 		val = scaleVolume(GetMutedVolume());
 
-    if (GetAudioSink() == AUDIO_SINK_BLUETOOTH) {
-        // bluealsa is a mixer plugin, not exposed as a separate card
-        char ctl_name[128] = {0};
-        if (get_a2dp_simple_control_name(ctl_name, sizeof(ctl_name))) {
+	if (GetAudioSink() == AUDIO_SINK_BLUETOOTH) {
+		// bluealsa is a mixer plugin, not exposed as a separate card
+		char ctl_name[128] = {0};
+		if (get_a2dp_simple_control_name(ctl_name, sizeof(ctl_name))) {
 			char cmd[256];
-            // Update volume on the device
-            snprintf(cmd, sizeof(cmd), "amixer sset \"%s\" -M %d%% &> /dev/null", ctl_name, val);
-            system(cmd);
-			//printf("Set '%s' to %d%%\n", ctl_name, val); fflush(stdout);
-        }
-    } 
-	else if (GetAudioSink() == AUDIO_SINK_USBDAC) {
+			// Update volume on the device
+			snprintf(cmd, sizeof(cmd), "amixer sset \"%s\" -M %d%% &> /dev/null", ctl_name, val);
+			system(cmd);
+			// printf("Set '%s' to %d%%\n", ctl_name, val); fflush(stdout);
+		}
+	} else if (GetAudioSink() == AUDIO_SINK_USBDAC) {
 		// USB DAC path: use card 1
 		struct mixer *mixer = mixer_open(1);
 		if (!mixer) {
-			printf("Failed to open mixer\n"); fflush(stdout);
+			printf("Failed to open mixer\n");
+			fflush(stdout);
 			return;
 		}
 
-        const unsigned int num_controls = mixer_get_num_ctls(mixer);
-        for (unsigned int i = 0; i < num_controls; i++) {
-            struct mixer_ctl *ctl = mixer_get_ctl(mixer, i);
-            const char *name = mixer_ctl_get_name(ctl);
-            if (!name) continue;
-
-            if (strstr(name, "PCM") && (strstr(name, "Volume") || strstr(name, "volume"))) {
-                if (mixer_ctl_get_type(ctl) == MIXER_CTL_TYPE_INT) {
-                    int min = mixer_ctl_get_range_min(ctl);
-                    int max = mixer_ctl_get_range_max(ctl);
-                    int volume = min + (val * (max - min)) / 100;
+		const unsigned int num_controls = mixer_get_num_ctls(mixer);
+		for (unsigned int i = 0; i < num_controls; i++) {
+			struct mixer_ctl *ctl = mixer_get_ctl(mixer, i);
+			const char *name = mixer_ctl_get_name(ctl);
+			if (!name)
+				continue;
+
+			if (strstr(name, "PCM") && (strstr(name, "Volume") || strstr(name, "volume"))) {
+				if (mixer_ctl_get_type(ctl) == MIXER_CTL_TYPE_INT) {
+					int min = mixer_ctl_get_range_min(ctl);
+					int max = mixer_ctl_get_range_max(ctl);
+					int volume = min + (val * (max - min)) / 100;
 					unsigned int num_values = mixer_ctl_get_num_values(ctl);
 					for (unsigned int i = 0; i < num_values; i++)
 						mixer_ctl_set_value(ctl, i, volume);
-                }
-                break;
-            }
-        }
-	}
-	else {
-        // Speaker path: use direct lookup by name
+				}
+				break;
+			}
+		}
+	} else {
+		// Speaker path: use direct lookup by name
 		struct mixer *mixer = mixer_open(0);
-        if (!mixer) {
-            printf("Failed to open mixer\n"); fflush(stdout);
-            return;
-        }
+		if (!mixer) {
+			printf("Failed to open mixer\n");
+			fflush(stdout);
+			return;
+		}
 
-        struct mixer_ctl *digital = mixer_get_ctl_by_name(mixer, "digital volume");
-        if (digital) {
+		struct mixer_ctl *digital = mixer_get_ctl_by_name(mixer, "digital volume");
+		if (digital) {
 			mixer_ctl_set_percent(digital, 0, 100 - val); // reversed mapping
-			//printf("Set 'digital volume' to %d%%\n", val); fflush(stdout);
+			// printf("Set 'digital volume' to %d%%\n", val); fflush(stdout);
 		}
-		
+
 		// Digital volume does not quite go to 0, so also mute the DAC volume
-		struct mixer_ctl *dac     = mixer_get_ctl_by_name(mixer, "DAC volume");
-        if (dac) {
-            int dac_val = (val == 0 ? 0 : 160);
-            unsigned int num_values = mixer_ctl_get_num_values(dac);
-            for (unsigned int i = 0; i < num_values; i++)
-                mixer_ctl_set_value(dac, i, dac_val);
-			//printf("Set 'DAC volume' to %d\n", dac_val); fflush(stdout);
+		struct mixer_ctl *dac = mixer_get_ctl_by_name(mixer, "DAC volume");
+		if (dac) {
+			int dac_val = (val == 0 ? 0 : 160);
+			unsigned int num_values = mixer_ctl_get_num_values(dac);
+			for (unsigned int i = 0; i < num_values; i++)
+				mixer_ctl_set_value(dac, i, dac_val);
+			// printf("Set 'DAC volume' to %d\n", dac_val); fflush(stdout);
 		}
 		mixer_close(mixer);
 
@@ -1216,8 +1433,10 @@ void SetRawVolume(int val) { // in: 0-100
 	}
 }
 
-void SetRawContrast(int val){
-	printf("SetRawContrast(%i)\n", val); fflush(stdout);
+void SetRawContrast(int val)
+{
+	printf("SetRawContrast(%i)\n", val);
+	fflush(stdout);
 
 	FILE *fd = fopen("/sys/class/disp/disp/attr/enhance_contrast", "w");
 	if (fd) {
@@ -1225,8 +1444,10 @@ void SetRawContrast(int val){
 		fclose(fd);
 	}
 }
-void SetRawSaturation(int val){
-	printf("SetRawSaturation(%i)\n", val); fflush(stdout);
+void SetRawSaturation(int val)
+{
+	printf("SetRawSaturation(%i)\n", val);
+	fflush(stdout);
 
 	FILE *fd = fopen("/sys/class/disp/disp/attr/enhance_saturation", "w");
 	if (fd) {
@@ -1234,8 +1455,10 @@ void SetRawSaturation(int val){
 		fclose(fd);
 	}
 }
-void SetRawExposure(int val){
-	printf("SetRawExposure(%i)\n", val); fflush(stdout);
+void SetRawExposure(int val)
+{
+	printf("SetRawExposure(%i)\n", val);
+	fflush(stdout);
 
 	FILE *fd = fopen("/sys/class/disp/disp/attr/enhance_bright", "w");
 	if (fd) {
diff --git a/workspace/tg5040/libmsettings/msettings.h b/workspace/tg5040/libmsettings/msettings.h
index 5eb98820f..b361bdea3 100644
--- a/workspace/tg5040/libmsettings/msettings.h
+++ b/workspace/tg5040/libmsettings/msettings.h
@@ -23,25 +23,25 @@ int GetExposure(void);
 int GetVolume(void);
 
 void SetRawBrightness(int value); // 0-255
-void SetRawColortemp(int value); // 0-255
-void SetRawContrast(int value); // 0-100
+void SetRawColortemp(int value);  // 0-255
+void SetRawContrast(int value);	  // 0-100
 void SetRawSaturation(int value); // 0-100
-void SetRawExposure(int value); // 0-100
-void SetRawVolume(int value); // 0-100
+void SetRawExposure(int value);	  // 0-100
+void SetRawVolume(int value);	  // 0-100
 
 void SetBrightness(int value); // 0-10
-void SetColortemp(int value); // 0-40
-void SetContrast(int value); // -4-5
+void SetColortemp(int value);  // 0-40
+void SetContrast(int value);   // -4-5
 void SetSaturation(int value); // -5-5
-void SetExposure(int value); // -4-5
-void SetVolume(int value); // 0-20
+void SetExposure(int value);   // -4-5
+void SetVolume(int value);	   // 0-20
 
 int GetJack(void);
 void SetJack(int value); // 0-1
 
-#define AUDIO_SINK_DEFAULT 0 // use system default, usually speaker (or jack if plugged in)
+#define AUDIO_SINK_DEFAULT 0   // use system default, usually speaker (or jack if plugged in)
 #define AUDIO_SINK_BLUETOOTH 1 // software control via bluealsa, not a separate card
-#define AUDIO_SINK_USBDAC 2 // assumes being exposed as card 1 to alsa
+#define AUDIO_SINK_USBDAC 2	   // assumes being exposed as card 1 to alsa
 int GetAudioSink(void);
 void SetAudioSink(int value);
 
@@ -87,4 +87,4 @@ void SetMuteTurboL2(int);
 void SetMuteTurboR1(int);
 void SetMuteTurboR2(int);
 
-#endif  // __msettings_h__
+#endif // __msettings_h__
diff --git a/workspace/tg5040/platform/platform.c b/workspace/tg5040/platform/platform.c
index 077c04bda..d6ea078d3 100644
--- a/workspace/tg5040/platform/platform.c
+++ b/workspace/tg5040/platform/platform.c
@@ -24,7 +24,7 @@
 
 #include <dirent.h>
 
-static int finalScaleFilter=GL_LINEAR;
+static int finalScaleFilter = GL_LINEAR;
 static int reloadShaderTextures = 1;
 
 // shader stuff
@@ -50,8 +50,8 @@ typedef struct Shader {
 	GLint OrigInputSize;
 	GLint texLocation;
 	GLint texelSizeLocation;
-	ShaderParam *pragmas;  // Dynamic array of parsed pragma parameters
-	int num_pragmas;       // Count of valid pragma parameters
+	ShaderParam *pragmas; // Dynamic array of parsed pragma parameters
+	int num_pragmas;	  // Count of valid pragma parameters
 
 } Shader;
 
@@ -59,111 +59,136 @@ GLuint g_shader_default = 0;
 GLuint g_shader_overlay = 0;
 GLuint g_noshader = 0;
 
-Shader* shaders[MAXSHADERS] = {
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
-    &(Shader){ .shader_p = 0, .scale = 1, .filter = GL_LINEAR, .scaletype = 1, .srctype = 0, .filename ="stock.glsl", .texture = 0, .updated = 1 },
+Shader *shaders[MAXSHADERS] = {
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
+	&(Shader){.shader_p = 0,
+			  .scale = 1,
+			  .filter = GL_LINEAR,
+			  .scaletype = 1,
+			  .srctype = 0,
+			  .filename = "stock.glsl",
+			  .texture = 0,
+			  .updated = 1},
 };
 
-static int nrofshaders = 0; // choose between 1 and 3 pipelines, > pipelines = more cpu usage, but more shader options and shader upscaling stuff
+static int nrofshaders = 0; // choose between 1 and 3 pipelines, > pipelines = more cpu usage, but more shader options
+							// and shader upscaling stuff
 ///////////////////////////////
 
 int is_brick = 0;
 
 static SDL_Joystick **joysticks = NULL;
 static int num_joysticks = 0;
-void PLAT_initInput(void) {
-	char* device = getenv("DEVICE");
+void PLAT_initInput(void)
+{
+	char *device = getenv("DEVICE");
 	is_brick = exactMatch("brick", device);
-	if(SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
+	if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
 		LOG_error("Failed initializing joysticks: %s\n", SDL_GetError());
 	num_joysticks = SDL_NumJoysticks();
-    if (num_joysticks > 0) {
-        joysticks = (SDL_Joystick **)malloc(sizeof(SDL_Joystick *) * num_joysticks);
-        for (int i = 0; i < num_joysticks; i++) {
+	if (num_joysticks > 0) {
+		joysticks = (SDL_Joystick **)malloc(sizeof(SDL_Joystick *) * num_joysticks);
+		for (int i = 0; i < num_joysticks; i++) {
 			joysticks[i] = SDL_JoystickOpen(i);
 			LOG_info("Opening joystick %d: %s\n", i, SDL_JoystickName(joysticks[i]));
-        }
-    }
+		}
+	}
 }
 
-void PLAT_quitInput(void) {
+void PLAT_quitInput(void)
+{
 	if (joysticks) {
-        for (int i = 0; i < num_joysticks; i++) {
-            if (SDL_JoystickGetAttached(joysticks[i])) {
+		for (int i = 0; i < num_joysticks; i++) {
+			if (SDL_JoystickGetAttached(joysticks[i])) {
 				LOG_info("Closing joystick %d: %s\n", i, SDL_JoystickName(joysticks[i]));
 				SDL_JoystickClose(joysticks[i]);
 			}
-        }
-        free(joysticks);
-        joysticks = NULL;
-        num_joysticks = 0;
-    }
+		}
+		free(joysticks);
+		joysticks = NULL;
+		num_joysticks = 0;
+	}
 	SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
 }
 
-void PLAT_updateInput(const SDL_Event *event) {
+void PLAT_updateInput(const SDL_Event *event)
+{
 	switch (event->type) {
-    case SDL_JOYDEVICEADDED: {
-        int device_index = event->jdevice.which;
-        SDL_Joystick *new_joy = SDL_JoystickOpen(device_index);
-        if (new_joy) {
-            joysticks = realloc(joysticks, sizeof(SDL_Joystick *) * (num_joysticks + 1));
-            joysticks[num_joysticks++] = new_joy;
-            LOG_info("Joystick added at index %d: %s\n", device_index, SDL_JoystickName(new_joy));
-        } else {
-            LOG_error("Failed to open added joystick at index %d: %s\n", device_index, SDL_GetError());
-        }
-        break;
-    }
-
-    case SDL_JOYDEVICEREMOVED: {
-        SDL_JoystickID removed_id = event->jdevice.which;
-        for (int i = 0; i < num_joysticks; ++i) {
-            if (SDL_JoystickInstanceID(joysticks[i]) == removed_id) {
-                LOG_info("Joystick removed: %s\n", SDL_JoystickName(joysticks[i]));
-                SDL_JoystickClose(joysticks[i]);
-
-                // Shift down the remaining entries
-                for (int j = i; j < num_joysticks - 1; ++j)
-                    joysticks[j] = joysticks[j + 1];
-                num_joysticks--;
-
-                if (num_joysticks == 0) {
-                    free(joysticks);
-                    joysticks = NULL;
-                } else {
-                    joysticks = realloc(joysticks, sizeof(SDL_Joystick *) * num_joysticks);
-                }
-                break;
-            }
-        }
-        break;
-    }
-
-    default:
-        break;
-    }
+	case SDL_JOYDEVICEADDED: {
+		int device_index = event->jdevice.which;
+		SDL_Joystick *new_joy = SDL_JoystickOpen(device_index);
+		if (new_joy) {
+			joysticks = realloc(joysticks, sizeof(SDL_Joystick *) * (num_joysticks + 1));
+			joysticks[num_joysticks++] = new_joy;
+			LOG_info("Joystick added at index %d: %s\n", device_index, SDL_JoystickName(new_joy));
+		} else {
+			LOG_error("Failed to open added joystick at index %d: %s\n", device_index, SDL_GetError());
+		}
+		break;
+	}
+
+	case SDL_JOYDEVICEREMOVED: {
+		SDL_JoystickID removed_id = event->jdevice.which;
+		for (int i = 0; i < num_joysticks; ++i) {
+			if (SDL_JoystickInstanceID(joysticks[i]) == removed_id) {
+				LOG_info("Joystick removed: %s\n", SDL_JoystickName(joysticks[i]));
+				SDL_JoystickClose(joysticks[i]);
+
+				// Shift down the remaining entries
+				for (int j = i; j < num_joysticks - 1; ++j)
+					joysticks[j] = joysticks[j + 1];
+				num_joysticks--;
+
+				if (num_joysticks == 0) {
+					free(joysticks);
+					joysticks = NULL;
+				} else {
+					joysticks = realloc(joysticks, sizeof(SDL_Joystick *) * num_joysticks);
+				}
+				break;
+			}
+		}
+		break;
+	}
+
+	default:
+		break;
+	}
 }
 
 ///////////////////////////////
 
 static struct VID_Context {
-	SDL_Window* window;
-	SDL_Renderer* renderer;
-	SDL_Texture* target_layer1;
-	SDL_Texture* target_layer2;
-	SDL_Texture* stream_layer1;
-	SDL_Texture* target_layer3;
-	SDL_Texture* target_layer4;
-	SDL_Texture* target_layer5;
-	SDL_Texture* target;
-	SDL_Texture* effect;
-	SDL_Texture* overlay;
-	SDL_Surface* screen;
+	SDL_Window *window;
+	SDL_Renderer *renderer;
+	SDL_Texture *target_layer1;
+	SDL_Texture *target_layer2;
+	SDL_Texture *stream_layer1;
+	SDL_Texture *target_layer3;
+	SDL_Texture *target_layer4;
+	SDL_Texture *target_layer5;
+	SDL_Texture *target;
+	SDL_Texture *effect;
+	SDL_Texture *overlay;
+	SDL_Surface *screen;
 	SDL_GLContext gl_context;
-	
-	GFX_Renderer* blit; // yeesh
+
+	GFX_Renderer *blit; // yeesh
 	int width;
 	int height;
 	int pitch;
@@ -177,332 +202,334 @@ static uint32_t SDL_transparentBlack = 0;
 
 #define OVERLAYS_FOLDER SDCARD_PATH "/Overlays"
 
-static char* overlay_path = NULL;
+static char *overlay_path = NULL;
 
 
 #define MAX_SHADERLINE_LENGTH 512
-int extractPragmaParameters(const char *shaderSource, ShaderParam *params, int maxParams) {
-    const char *pragmaPrefix = "#pragma parameter";
-    char line[MAX_SHADERLINE_LENGTH];
-    int paramCount = 0;
-
-    const char *currentPos = shaderSource;
-
-    while (*currentPos && paramCount < maxParams) {
-        int i = 0;
-
-        // Read a line
-        while (*currentPos && *currentPos != '\n' && i < MAX_SHADERLINE_LENGTH - 1) {
-            line[i++] = *currentPos++;
-        }
-        line[i] = '\0';
-        if (*currentPos == '\n') currentPos++;
-
-        // Check if it's a #pragma parameter line
-        if (strncmp(line, pragmaPrefix, strlen(pragmaPrefix)) == 0) {
-            const char *start = line + strlen(pragmaPrefix);
-            while (*start == ' ') start++;
-
-            ShaderParam *p = &params[paramCount];
-
-            // Try to parse
-            if (sscanf(start, "%127s \"%127[^\"]\" %f %f %f %f",
-                       p->name, p->label, &p->def, &p->min, &p->max, &p->step) == 6) {
-                paramCount++;
-            } else {
-                fprintf(stderr, "Failed to parse line:\n%s\n", line);
-            }
-        }
-    }
-
-    return paramCount; // number of parameters found
-}
-
-GLuint link_program(GLuint vertex_shader, GLuint fragment_shader, const char* cache_key) {
-    char cache_path[512];
-    snprintf(cache_path, sizeof(cache_path), "/mnt/SDCARD/.shadercache/%s.bin", cache_key);
-
-    GLuint program = glCreateProgram();
-    GLint success;
-
-    // Try to load cached binary first
-    FILE *f = fopen(cache_path, "rb");
-    if (f) {
-        GLint binaryFormat;
-        fread(&binaryFormat, sizeof(GLint), 1, f);
-        fseek(f, 0, SEEK_END);
-        size_t length = ftell(f) - sizeof(GLint);
-        fseek(f, sizeof(GLint), SEEK_SET);
-        void *binary = malloc(length);
-        fread(binary, 1, length, f);
-        fclose(f);
-
-        glProgramBinary(program, binaryFormat, binary, length);
-        free(binary);
-
-        glGetProgramiv(program, GL_LINK_STATUS, &success);
-        if (success) {
-            LOG_info("Loaded shader program from cache: %s\n", cache_key);
-            return program;
-        } else {
-            LOG_info("Cache load failed, falling back to compile.\n");
-            glDeleteProgram(program);
-            program = glCreateProgram();
-        }
-    }
-
-    // Compile and link if cache failed
-    glAttachShader(program, vertex_shader);
-    glAttachShader(program, fragment_shader);
-    glProgramParameteri(program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
-    glLinkProgram(program);
-    glGetProgramiv(program, GL_LINK_STATUS, &success);
-
-    if (!success) {
-        GLint logLength;
-        glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
-        char* log = (char*)malloc(logLength);
-        glGetProgramInfoLog(program, logLength, &logLength, log);
-        printf("Program link error: %s\n", log);
-        free(log);
-        return program;
-    }
-
-    GLint binaryLength;
-    GLenum binaryFormat;
-    glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
-    void* binary = malloc(binaryLength);
-    glGetProgramBinary(program, binaryLength, NULL, &binaryFormat, binary);
-
-    mkdir("/mnt/SDCARD/.shadercache", 0755); 
-    f = fopen(cache_path, "wb");
-    if (f) {
-        fwrite(&binaryFormat, sizeof(GLenum), 1, f);
-        fwrite(binary, 1, binaryLength, f);
-        fclose(f);
-        LOG_info("Saved shader program to cache: %s\n", cache_key);
-    }
-    free(binary);
-
-    LOG_info("Program linked and cached\n");
-    return program;
-}
-
-char* load_shader_source(const char* filename) {
+int extractPragmaParameters(const char *shaderSource, ShaderParam *params, int maxParams)
+{
+	const char *pragmaPrefix = "#pragma parameter";
+	char line[MAX_SHADERLINE_LENGTH];
+	int paramCount = 0;
+
+	const char *currentPos = shaderSource;
+
+	while (*currentPos && paramCount < maxParams) {
+		int i = 0;
+
+		// Read a line
+		while (*currentPos && *currentPos != '\n' && i < MAX_SHADERLINE_LENGTH - 1) {
+			line[i++] = *currentPos++;
+		}
+		line[i] = '\0';
+		if (*currentPos == '\n')
+			currentPos++;
+
+		// Check if it's a #pragma parameter line
+		if (strncmp(line, pragmaPrefix, strlen(pragmaPrefix)) == 0) {
+			const char *start = line + strlen(pragmaPrefix);
+			while (*start == ' ')
+				start++;
+
+			ShaderParam *p = &params[paramCount];
+
+			// Try to parse
+			if (sscanf(start, "%127s \"%127[^\"]\" %f %f %f %f", p->name, p->label, &p->def, &p->min, &p->max,
+					   &p->step) == 6) {
+				paramCount++;
+			} else {
+				fprintf(stderr, "Failed to parse line:\n%s\n", line);
+			}
+		}
+	}
+
+	return paramCount; // number of parameters found
+}
+
+GLuint link_program(GLuint vertex_shader, GLuint fragment_shader, const char *cache_key)
+{
+	char cache_path[512];
+	snprintf(cache_path, sizeof(cache_path), "/mnt/SDCARD/.shadercache/%s.bin", cache_key);
+
+	GLuint program = glCreateProgram();
+	GLint success;
+
+	// Try to load cached binary first
+	FILE *f = fopen(cache_path, "rb");
+	if (f) {
+		GLint binaryFormat;
+		fread(&binaryFormat, sizeof(GLint), 1, f);
+		fseek(f, 0, SEEK_END);
+		size_t length = ftell(f) - sizeof(GLint);
+		fseek(f, sizeof(GLint), SEEK_SET);
+		void *binary = malloc(length);
+		fread(binary, 1, length, f);
+		fclose(f);
+
+		glProgramBinary(program, binaryFormat, binary, length);
+		free(binary);
+
+		glGetProgramiv(program, GL_LINK_STATUS, &success);
+		if (success) {
+			LOG_info("Loaded shader program from cache: %s\n", cache_key);
+			return program;
+		} else {
+			LOG_info("Cache load failed, falling back to compile.\n");
+			glDeleteProgram(program);
+			program = glCreateProgram();
+		}
+	}
+
+	// Compile and link if cache failed
+	glAttachShader(program, vertex_shader);
+	glAttachShader(program, fragment_shader);
+	glProgramParameteri(program, GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE);
+	glLinkProgram(program);
+	glGetProgramiv(program, GL_LINK_STATUS, &success);
+
+	if (!success) {
+		GLint logLength;
+		glGetProgramiv(program, GL_INFO_LOG_LENGTH, &logLength);
+		char *log = (char *)malloc(logLength);
+		glGetProgramInfoLog(program, logLength, &logLength, log);
+		printf("Program link error: %s\n", log);
+		free(log);
+		return program;
+	}
+
+	GLint binaryLength;
+	GLenum binaryFormat;
+	glGetProgramiv(program, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
+	void *binary = malloc(binaryLength);
+	glGetProgramBinary(program, binaryLength, NULL, &binaryFormat, binary);
+
+	mkdir("/mnt/SDCARD/.shadercache", 0755);
+	f = fopen(cache_path, "wb");
+	if (f) {
+		fwrite(&binaryFormat, sizeof(GLenum), 1, f);
+		fwrite(binary, 1, binaryLength, f);
+		fclose(f);
+		LOG_info("Saved shader program to cache: %s\n", cache_key);
+	}
+	free(binary);
+
+	LOG_info("Program linked and cached\n");
+	return program;
+}
+
+char *load_shader_source(const char *filename)
+{
 	char filepath[256];
 	snprintf(filepath, sizeof(filepath), "%s", filename);
-    FILE* file = fopen(filepath, "rb");
-    if (!file) {
-        fprintf(stderr, "Failed to open shader file: %s\n", filepath);
-        return NULL;
-    }
-
-    fseek(file, 0, SEEK_END);
-    long length = ftell(file);
-    rewind(file);
-
-    char* source = (char*)malloc(length + 1);
-    if (!source) {
-        fprintf(stderr, "Memory allocation failed\n");
-        fclose(file);
-        return NULL;
-    }
-
-    fread(source, 1, length, file);
-    source[length] = '\0';
-    fclose(file);
-    return source;
-}
-
-GLuint load_shader_from_file(GLenum type, const char* filename, const char* path) {
-    char filepath[256];
-    snprintf(filepath, sizeof(filepath), "%s/%s", path, filename);
-    char* source = load_shader_source(filepath);
-    if (!source) return 0;
-
-    LOG_info("load shader from file %s\n", filepath);
-
-    // Filter out lines starting with "#pragma parameter"
-    char* cleaned = malloc(strlen(source) + 1);
-    if (!cleaned) {
-        fprintf(stderr, "Out of memory\n");
-        free(source);
-        return 0;
-    }
-    cleaned[0] = '\0';
-
-    char* line = strtok(source, "\n");
-    while (line) {
-        if (strncmp(line, "#pragma parameter", 17) != 0) {
-            strcat(cleaned, line);
-            strcat(cleaned, "\n");
-        }
-        line = strtok(NULL, "\n");
-    }
-
-    const char* define = NULL;
-    const char* default_precision = NULL;
-    if (type == GL_VERTEX_SHADER) {
-        define = "#define VERTEX\n";
-    } else if (type == GL_FRAGMENT_SHADER) {
-        define = "#define FRAGMENT\n";
-        default_precision =
-            "#ifdef GL_ES\n"
-            "#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
-            "precision highp float;\n"
-            "#else\n"
-            "precision mediump float;\n"
-            "#endif\n"
-            "#endif\n"
-            "#define PARAMETER_UNIFORM\n";
-    } else {
-        fprintf(stderr, "Unsupported shader type\n");
-        free(source);
-        free(cleaned);
-        return 0;
-    }
-
-    const char* version_start = strstr(cleaned, "#version");
-    const char* version_end = version_start ? strchr(version_start, '\n') : NULL;
-
-    const char* replacement_version = "#version 300 es\n";
-    const char* fallback_version = "#version 100\n";
-
-    char* combined = NULL;
-    size_t define_len = strlen(define);
-    size_t precision_len = default_precision ? strlen(default_precision) : 0;
-    size_t source_len = strlen(cleaned);
-    size_t combined_len = 0;
-
-    int should_replace_with_300es = 0;
-    if (version_start && version_end) {
-        char version_str[32] = {0};
-        size_t len = version_end - version_start;
-        if (len < sizeof(version_str)) {
-            strncpy(version_str, version_start, len);
-            version_str[len] = '\0';
-
-            if (
-                strstr(version_str, "#version 110") ||
-                strstr(version_str, "#version 120") ||
-                strstr(version_str, "#version 130") ||
-                strstr(version_str, "#version 140") ||
-                strstr(version_str, "#version 150") ||
-                strstr(version_str, "#version 330") ||
-                strstr(version_str, "#version 400") ||
-                strstr(version_str, "#version 410") ||
-                strstr(version_str, "#version 420") ||
-                strstr(version_str, "#version 430") ||
-                strstr(version_str, "#version 440") ||
-                strstr(version_str, "#version 450")
-            ) {
-                should_replace_with_300es = 1;
-            }
-        }
-    }
-
-    if (version_start && version_end && should_replace_with_300es) {
-        size_t header_len = version_end - cleaned + 1;
-        size_t version_len = strlen(replacement_version);
-        combined_len = version_len + define_len + precision_len + (source_len - header_len) + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            free(cleaned);
-            return 0;
-        }
-
-        strcpy(combined, replacement_version);
-        strcat(combined, define);
-        if (default_precision) strcat(combined, default_precision);
-        strcat(combined, cleaned + header_len);
-    } else if (version_start && version_end) {
-        size_t header_len = version_end - cleaned + 1;
-        combined_len = header_len + define_len + precision_len + (source_len - header_len) + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            free(cleaned);
-            return 0;
-        }
-
-        memcpy(combined, cleaned, header_len);
-        memcpy(combined + header_len, define, define_len);
-        if (default_precision)
-            memcpy(combined + header_len + define_len, default_precision, precision_len);
-        strcpy(combined + header_len + define_len + precision_len, cleaned + header_len);
-    } else {
-        size_t version_len = strlen(fallback_version);
-        combined_len = version_len + define_len + precision_len + source_len + 1;
-        combined = (char*)malloc(combined_len);
-        if (!combined) {
-            fprintf(stderr, "Out of memory\n");
-            free(source);
-            free(cleaned);
-            return 0;
-        }
-
-        strcpy(combined, fallback_version);
-        strcat(combined, define);
-        if (default_precision) strcat(combined, default_precision);
-        strcat(combined, cleaned);
-    }
-
-    GLuint shader = glCreateShader(type);
-    const char* combined_ptr = combined;
-    glShaderSource(shader, 1, &combined_ptr, NULL);
-    glCompileShader(shader);
-
-    free(source);
-    free(cleaned);
-    free(combined);
-
-    GLint compiled;
-    glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-    if (!compiled) {
-        char log[512];
-        glGetShaderInfoLog(shader, sizeof(log), NULL, log);
-        fprintf(stderr, "Shader compilation failed:\n%s\n", log);
-        glDeleteShader(shader);
-        return 0;
-    }
-
-    return shader;
-}
-
-void PLAT_initShaders() {
+	FILE *file = fopen(filepath, "rb");
+	if (!file) {
+		fprintf(stderr, "Failed to open shader file: %s\n", filepath);
+		return NULL;
+	}
+
+	fseek(file, 0, SEEK_END);
+	long length = ftell(file);
+	rewind(file);
+
+	char *source = (char *)malloc(length + 1);
+	if (!source) {
+		fprintf(stderr, "Memory allocation failed\n");
+		fclose(file);
+		return NULL;
+	}
+
+	fread(source, 1, length, file);
+	source[length] = '\0';
+	fclose(file);
+	return source;
+}
+
+GLuint load_shader_from_file(GLenum type, const char *filename, const char *path)
+{
+	char filepath[256];
+	snprintf(filepath, sizeof(filepath), "%s/%s", path, filename);
+	char *source = load_shader_source(filepath);
+	if (!source)
+		return 0;
+
+	LOG_info("load shader from file %s\n", filepath);
+
+	// Filter out lines starting with "#pragma parameter"
+	char *cleaned = malloc(strlen(source) + 1);
+	if (!cleaned) {
+		fprintf(stderr, "Out of memory\n");
+		free(source);
+		return 0;
+	}
+	cleaned[0] = '\0';
+
+	char *line = strtok(source, "\n");
+	while (line) {
+		if (strncmp(line, "#pragma parameter", 17) != 0) {
+			strcat(cleaned, line);
+			strcat(cleaned, "\n");
+		}
+		line = strtok(NULL, "\n");
+	}
+
+	const char *define = NULL;
+	const char *default_precision = NULL;
+	if (type == GL_VERTEX_SHADER) {
+		define = "#define VERTEX\n";
+	} else if (type == GL_FRAGMENT_SHADER) {
+		define = "#define FRAGMENT\n";
+		default_precision = "#ifdef GL_ES\n"
+							"#ifdef GL_FRAGMENT_PRECISION_HIGH\n"
+							"precision highp float;\n"
+							"#else\n"
+							"precision mediump float;\n"
+							"#endif\n"
+							"#endif\n"
+							"#define PARAMETER_UNIFORM\n";
+	} else {
+		fprintf(stderr, "Unsupported shader type\n");
+		free(source);
+		free(cleaned);
+		return 0;
+	}
+
+	const char *version_start = strstr(cleaned, "#version");
+	const char *version_end = version_start ? strchr(version_start, '\n') : NULL;
+
+	const char *replacement_version = "#version 300 es\n";
+	const char *fallback_version = "#version 100\n";
+
+	char *combined = NULL;
+	size_t define_len = strlen(define);
+	size_t precision_len = default_precision ? strlen(default_precision) : 0;
+	size_t source_len = strlen(cleaned);
+	size_t combined_len = 0;
+
+	int should_replace_with_300es = 0;
+	if (version_start && version_end) {
+		char version_str[32] = {0};
+		size_t len = version_end - version_start;
+		if (len < sizeof(version_str)) {
+			strncpy(version_str, version_start, len);
+			version_str[len] = '\0';
+
+			if (strstr(version_str, "#version 110") || strstr(version_str, "#version 120") ||
+				strstr(version_str, "#version 130") || strstr(version_str, "#version 140") ||
+				strstr(version_str, "#version 150") || strstr(version_str, "#version 330") ||
+				strstr(version_str, "#version 400") || strstr(version_str, "#version 410") ||
+				strstr(version_str, "#version 420") || strstr(version_str, "#version 430") ||
+				strstr(version_str, "#version 440") || strstr(version_str, "#version 450")) {
+				should_replace_with_300es = 1;
+			}
+		}
+	}
+
+	if (version_start && version_end && should_replace_with_300es) {
+		size_t header_len = version_end - cleaned + 1;
+		size_t version_len = strlen(replacement_version);
+		combined_len = version_len + define_len + precision_len + (source_len - header_len) + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			free(cleaned);
+			return 0;
+		}
+
+		strcpy(combined, replacement_version);
+		strcat(combined, define);
+		if (default_precision)
+			strcat(combined, default_precision);
+		strcat(combined, cleaned + header_len);
+	} else if (version_start && version_end) {
+		size_t header_len = version_end - cleaned + 1;
+		combined_len = header_len + define_len + precision_len + (source_len - header_len) + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			free(cleaned);
+			return 0;
+		}
+
+		memcpy(combined, cleaned, header_len);
+		memcpy(combined + header_len, define, define_len);
+		if (default_precision)
+			memcpy(combined + header_len + define_len, default_precision, precision_len);
+		strcpy(combined + header_len + define_len + precision_len, cleaned + header_len);
+	} else {
+		size_t version_len = strlen(fallback_version);
+		combined_len = version_len + define_len + precision_len + source_len + 1;
+		combined = (char *)malloc(combined_len);
+		if (!combined) {
+			fprintf(stderr, "Out of memory\n");
+			free(source);
+			free(cleaned);
+			return 0;
+		}
+
+		strcpy(combined, fallback_version);
+		strcat(combined, define);
+		if (default_precision)
+			strcat(combined, default_precision);
+		strcat(combined, cleaned);
+	}
+
+	GLuint shader = glCreateShader(type);
+	const char *combined_ptr = combined;
+	glShaderSource(shader, 1, &combined_ptr, NULL);
+	glCompileShader(shader);
+
+	free(source);
+	free(cleaned);
+	free(combined);
+
+	GLint compiled;
+	glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+	if (!compiled) {
+		char log[512];
+		glGetShaderInfoLog(shader, sizeof(log), NULL, log);
+		fprintf(stderr, "Shader compilation failed:\n%s\n", log);
+		glDeleteShader(shader);
+		return 0;
+	}
+
+	return shader;
+}
+
+void PLAT_initShaders()
+{
 	SDL_GL_MakeCurrent(vid.window, vid.gl_context);
 	glViewport(0, 0, device_width, device_height);
-	
+
 	GLuint vertex;
 	GLuint fragment;
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "default.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "default.glsl",SYSSHADERS_FOLDER);
-	g_shader_default = link_program(vertex, fragment,"defaultv2.glsl");
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "default.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "default.glsl", SYSSHADERS_FOLDER);
+	g_shader_default = link_program(vertex, fragment, "defaultv2.glsl");
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "overlay.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "overlay.glsl",SYSSHADERS_FOLDER);
-	g_shader_overlay = link_program(vertex, fragment,"overlay.glsl");
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "overlay.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "overlay.glsl", SYSSHADERS_FOLDER);
+	g_shader_overlay = link_program(vertex, fragment, "overlay.glsl");
 
-	vertex = load_shader_from_file(GL_VERTEX_SHADER, "noshader.glsl",SYSSHADERS_FOLDER);
-	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "noshader.glsl",SYSSHADERS_FOLDER);
-	g_noshader = link_program(vertex, fragment,"noshader.glsl");
-	
-	LOG_info("default shaders loaded, %i\n\n",g_shader_default);
+	vertex = load_shader_from_file(GL_VERTEX_SHADER, "noshader.glsl", SYSSHADERS_FOLDER);
+	fragment = load_shader_from_file(GL_FRAGMENT_SHADER, "noshader.glsl", SYSSHADERS_FOLDER);
+	g_noshader = link_program(vertex, fragment, "noshader.glsl");
+
+	LOG_info("default shaders loaded, %i\n\n", g_shader_default);
 }
 
 
-SDL_Surface* PLAT_initVideo(void) {
-	char* device = getenv("DEVICE");
+SDL_Surface *PLAT_initVideo(void)
+{
+	char *device = getenv("DEVICE");
 	is_brick = exactMatch("brick", device);
 	// LOG_info("DEVICE: %s is_brick: %i\n", device, is_brick);
-	
+
 	SDL_InitSubSystem(SDL_INIT_VIDEO);
 	SDL_ShowCursor(0);
-	
+
 	// SDL_version compiled;
 	// SDL_version linked;
 	// SDL_VERSION(&compiled);
@@ -531,41 +558,41 @@ SDL_Surface* PLAT_initVideo(void) {
 	// }
 	// SDL_GetCurrentDisplayMode(0, &mode);
 	// LOG_info("Current display mode: %ix%i (%s)\n", mode.w,mode.h, SDL_GetPixelFormatName(mode.format));
-	
+
 	int w = FIXED_WIDTH;
 	int h = FIXED_HEIGHT;
 	int p = FIXED_PITCH;
 
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
-	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY,"1");
-	SDL_SetHint(SDL_HINT_RENDER_DRIVER,"opengl");
-	SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION,"1");
+	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1");
+	SDL_SetHint(SDL_HINT_RENDER_DRIVER, "opengl");
+	SDL_SetHint(SDL_HINT_FRAMEBUFFER_ACCELERATION, "1");
 
 	// SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE);
 	SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
-	vid.window   = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w,h, SDL_WINDOW_OPENGL|SDL_WINDOW_SHOWN);
-	vid.renderer = SDL_CreateRenderer(vid.window,-1,SDL_RENDERER_ACCELERATED|SDL_RENDERER_PRESENTVSYNC);
+	vid.window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, w, h,
+								  SDL_WINDOW_OPENGL | SDL_WINDOW_SHOWN);
+	vid.renderer = SDL_CreateRenderer(vid.window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 	SDL_SetRenderDrawBlendMode(vid.renderer, SDL_BLENDMODE_BLEND);
 	// SDL_RendererInfo info;
 	// SDL_GetRendererInfo(vid.renderer, &info);
 	// LOG_info("Current render driver: %s\n", info.name);
-	
 
 
 	vid.gl_context = SDL_GL_CreateContext(vid.window);
 	SDL_GL_MakeCurrent(vid.window, vid.gl_context);
 	glViewport(0, 0, w, h);
 
-	vid.stream_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w,h);
-	vid.target_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer2 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer3 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer4 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	vid.target_layer5 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET , w,h);
-	
-	vid.target	= NULL; // only needed for non-native sizes
-	
+	vid.stream_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w, h);
+	vid.target_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer2 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer3 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer4 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+	vid.target_layer5 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w, h);
+
+	vid.target = NULL; // only needed for non-native sizes
+
 	vid.screen = SDL_CreateRGBSurfaceWithFormat(0, w, h, 32, SDL_PIXELFORMAT_RGBA8888);
 
 	SDL_SetSurfaceBlendMode(vid.screen, SDL_BLENDMODE_BLEND);
@@ -574,73 +601,75 @@ SDL_Surface* PLAT_initVideo(void) {
 	SDL_SetTextureBlendMode(vid.target_layer3, SDL_BLENDMODE_BLEND);
 	SDL_SetTextureBlendMode(vid.target_layer4, SDL_BLENDMODE_BLEND);
 	SDL_SetTextureBlendMode(vid.target_layer5, SDL_BLENDMODE_BLEND);
-	
-	vid.width	= w;
-	vid.height	= h;
-	vid.pitch	= p;
-	
+
+	vid.width = w;
+	vid.height = h;
+	vid.pitch = p;
+
 	SDL_transparentBlack = SDL_MapRGBA(vid.screen->format, 0, 0, 0, 0);
-	
-	device_width	= w;
-	device_height	= h;
-	device_pitch	= p;
-	
+
+	device_width = w;
+	device_height = h;
+	device_pitch = p;
+
 	vid.sharpness = SHARPNESS_SOFT;
-	
+
 	return vid.screen;
 }
 
-void PLAT_resetShaders() {
-
+void PLAT_resetShaders()
+{
 }
 
-char* PLAT_findFileInDir(const char *directory, const char *filename) {
-    char *filename_copy = strdup(filename);
-    if (!filename_copy) {
-        perror("strdup");
-        return NULL;
-    }
-
-    // Strip extension from filename
-    char *dot_pos = strrchr(filename_copy, '.');
-    if (dot_pos) {
-        *dot_pos = '\0';
-    }
+char *PLAT_findFileInDir(const char *directory, const char *filename)
+{
+	char *filename_copy = strdup(filename);
+	if (!filename_copy) {
+		perror("strdup");
+		return NULL;
+	}
 
-    DIR *dir = opendir(directory);
-    if (!dir) {
-        perror("opendir");
-        free(filename_copy);
-        return NULL;
-    }
+	// Strip extension from filename
+	char *dot_pos = strrchr(filename_copy, '.');
+	if (dot_pos) {
+		*dot_pos = '\0';
+	}
 
-    struct dirent *entry;
-    char *full_path = NULL;
+	DIR *dir = opendir(directory);
+	if (!dir) {
+		perror("opendir");
+		free(filename_copy);
+		return NULL;
+	}
 
-    while ((entry = readdir(dir)) != NULL) {
-        if (strstr(entry->d_name, filename_copy) == entry->d_name) {
-            full_path = (char *)malloc(strlen(directory) + strlen(entry->d_name) + 2); // +1 for slash, +1 for '\0'
-            if (!full_path) {
-                perror("malloc");
-                closedir(dir);
-                free(filename_copy);
-                return NULL;
-            }
+	struct dirent *entry;
+	char *full_path = NULL;
+
+	while ((entry = readdir(dir)) != NULL) {
+		if (strstr(entry->d_name, filename_copy) == entry->d_name) {
+			full_path = (char *)malloc(strlen(directory) + strlen(entry->d_name) + 2); // +1 for slash, +1 for '\0'
+			if (!full_path) {
+				perror("malloc");
+				closedir(dir);
+				free(filename_copy);
+				return NULL;
+			}
 
-            snprintf(full_path, strlen(directory) + strlen(entry->d_name) + 2, "%s/%s", directory, entry->d_name);
-            closedir(dir);
-            free(filename_copy);
-            return full_path;
-        }
-    }
+			snprintf(full_path, strlen(directory) + strlen(entry->d_name) + 2, "%s/%s", directory, entry->d_name);
+			closedir(dir);
+			free(filename_copy);
+			return full_path;
+		}
+	}
 
-    closedir(dir);
-    free(filename_copy);
-    return NULL;
+	closedir(dir);
+	free(filename_copy);
+	return NULL;
 }
 
 #define MAX_SHADER_PRAGMAS 32
-void loadShaderPragmas(Shader *shader, const char *shaderSource) {
+void loadShaderPragmas(Shader *shader, const char *shaderSource)
+{
 	shader->pragmas = calloc(MAX_SHADER_PRAGMAS, sizeof(ShaderParam));
 	if (!shader->pragmas) {
 		fprintf(stderr, "Out of memory allocating pragmas for %s\n", shader->filename);
@@ -649,156 +678,154 @@ void loadShaderPragmas(Shader *shader, const char *shaderSource) {
 	shader->num_pragmas = extractPragmaParameters(shaderSource, shader->pragmas, MAX_SHADER_PRAGMAS);
 }
 
-ShaderParam* PLAT_getShaderPragmas(int i) {
-    return shaders[i]->pragmas;
+ShaderParam *PLAT_getShaderPragmas(int i)
+{
+	return shaders[i]->pragmas;
 }
 
-void PLAT_updateShader(int i, const char *filename, int *scale, int *filter, int *scaletype, int *srctype) {
-
-    if (i < 0 || i >= nrofshaders) {
-        return;
-    }
-    Shader* shader = shaders[i];
+void PLAT_updateShader(int i, const char *filename, int *scale, int *filter, int *scaletype, int *srctype)
+{
+	if (i < 0 || i >= nrofshaders) {
+		return;
+	}
+	Shader *shader = shaders[i];
 
-    if (filename != NULL) {
-        SDL_GL_MakeCurrent(vid.window, vid.gl_context);
-        LOG_info("loading shader \n");
+	if (filename != NULL) {
+		SDL_GL_MakeCurrent(vid.window, vid.gl_context);
+		LOG_info("loading shader \n");
 
 		char filepath[512];
-		snprintf(filepath, sizeof(filepath), SHADERS_FOLDER "/glsl/%s",filename);
-		const char *shaderSource  = load_shader_source(filepath);
-		loadShaderPragmas(shader,shaderSource);
-
-		GLuint vertex_shader1 = load_shader_from_file(GL_VERTEX_SHADER, filename,SHADERS_FOLDER "/glsl");
-		GLuint fragment_shader1 = load_shader_from_file(GL_FRAGMENT_SHADER, filename,SHADERS_FOLDER "/glsl");
-			
-        // Link the shader program
+		snprintf(filepath, sizeof(filepath), SHADERS_FOLDER "/glsl/%s", filename);
+		const char *shaderSource = load_shader_source(filepath);
+		loadShaderPragmas(shader, shaderSource);
+
+		GLuint vertex_shader1 = load_shader_from_file(GL_VERTEX_SHADER, filename, SHADERS_FOLDER "/glsl");
+		GLuint fragment_shader1 = load_shader_from_file(GL_FRAGMENT_SHADER, filename, SHADERS_FOLDER "/glsl");
+
+		// Link the shader program
 		if (shader->shader_p != 0) {
-			LOG_info("Deleting previous shader %i\n",shader->shader_p);
+			LOG_info("Deleting previous shader %i\n", shader->shader_p);
 			glDeleteProgram(shader->shader_p);
 		}
-        shader->shader_p = link_program(vertex_shader1, fragment_shader1,filename);
-        
-		shader->u_FrameDirection = glGetUniformLocation( shader->shader_p, "FrameDirection");
-		shader->u_FrameCount = glGetUniformLocation( shader->shader_p, "FrameCount");
-		shader->u_OutputSize = glGetUniformLocation( shader->shader_p, "OutputSize");
-		shader->u_TextureSize = glGetUniformLocation( shader->shader_p, "TextureSize");
-		shader->u_InputSize = glGetUniformLocation( shader->shader_p, "InputSize");
-		shader->OrigInputSize = glGetUniformLocation( shader->shader_p, "OrigInputSize");
+		shader->shader_p = link_program(vertex_shader1, fragment_shader1, filename);
+
+		shader->u_FrameDirection = glGetUniformLocation(shader->shader_p, "FrameDirection");
+		shader->u_FrameCount = glGetUniformLocation(shader->shader_p, "FrameCount");
+		shader->u_OutputSize = glGetUniformLocation(shader->shader_p, "OutputSize");
+		shader->u_TextureSize = glGetUniformLocation(shader->shader_p, "TextureSize");
+		shader->u_InputSize = glGetUniformLocation(shader->shader_p, "InputSize");
+		shader->OrigInputSize = glGetUniformLocation(shader->shader_p, "OrigInputSize");
 		shader->texLocation = glGetUniformLocation(shader->shader_p, "Texture");
 		shader->texelSizeLocation = glGetUniformLocation(shader->shader_p, "texelSize");
 		for (int i = 0; i < shader->num_pragmas; ++i) {
 			shader->pragmas[i].uniformLocation = glGetUniformLocation(shader->shader_p, shader->pragmas[i].name);
 			shader->pragmas[i].value = shader->pragmas[i].def;
 
-			printf("Param: %s = %f (min: %f, max: %f, step: %f)\n",
-				shader->pragmas[i].name,
-				shader->pragmas[i].def,
-				shader->pragmas[i].min,
-				shader->pragmas[i].max,
-				shader->pragmas[i].step);
+			printf("Param: %s = %f (min: %f, max: %f, step: %f)\n", shader->pragmas[i].name, shader->pragmas[i].def,
+				   shader->pragmas[i].min, shader->pragmas[i].max, shader->pragmas[i].step);
+		}
+
+		if (shader->shader_p == 0) {
+			LOG_info("Shader linking failed for %s\n", filename);
 		}
 
-        if (shader->shader_p == 0) {
-            LOG_info("Shader linking failed for %s\n", filename);
-        }
-
-        GLint success = 0;
-        glGetProgramiv(shader->shader_p, GL_LINK_STATUS, &success);
-        if (!success) {
-            char infoLog[512];
-            glGetProgramInfoLog(shader->shader_p, 512, NULL, infoLog);
-            LOG_info("Shader Program Linking Failed: %s\n", infoLog);
-        } else {
-			LOG_info("Shader Program Linking Success %s shader ID is %i\n", filename,shader->shader_p);
+		GLint success = 0;
+		glGetProgramiv(shader->shader_p, GL_LINK_STATUS, &success);
+		if (!success) {
+			char infoLog[512];
+			glGetProgramInfoLog(shader->shader_p, 512, NULL, infoLog);
+			LOG_info("Shader Program Linking Failed: %s\n", infoLog);
+		} else {
+			LOG_info("Shader Program Linking Success %s shader ID is %i\n", filename, shader->shader_p);
 		}
 		shader->filename = strdup(filename);
-    }
-    if (scale != NULL) {
-        shader->scale = *scale +1;
+	}
+	if (scale != NULL) {
+		shader->scale = *scale + 1;
 		reloadShaderTextures = 1;
-    }
-    if (scaletype != NULL) {
-        shader->scaletype = *scaletype;
-    }
-    if (srctype != NULL) {
-        shader->srctype = *srctype;
-    }
-    if (filter != NULL) {
-        shader->filter = (*filter == 1) ? GL_LINEAR : GL_NEAREST;
+	}
+	if (scaletype != NULL) {
+		shader->scaletype = *scaletype;
+	}
+	if (srctype != NULL) {
+		shader->srctype = *srctype;
+	}
+	if (filter != NULL) {
+		shader->filter = (*filter == 1) ? GL_LINEAR : GL_NEAREST;
 		reloadShaderTextures = 1;
-    }
+	}
 	shader->updated = 1;
-
 }
 
-void PLAT_setShaders(int nr) {
-	LOG_info("set nr of shaders to %i\n",nr);
+void PLAT_setShaders(int nr)
+{
+	LOG_info("set nr of shaders to %i\n", nr);
 	nrofshaders = nr;
 	reloadShaderTextures = 1;
 }
 
 
-uint32_t PLAT_get_dominant_color() {
-    if (!vid.screen) {
-        fprintf(stderr, "Error: vid.screen is NULL.\n");
-        return 0;
-    }
+uint32_t PLAT_get_dominant_color()
+{
+	if (!vid.screen) {
+		fprintf(stderr, "Error: vid.screen is NULL.\n");
+		return 0;
+	}
 
-    if (vid.screen->format->format != SDL_PIXELFORMAT_RGBA8888) {
-        fprintf(stderr, "Error: Surface is not in RGBA8888 format.\n");
-        return 0;
-    }
+	if (vid.screen->format->format != SDL_PIXELFORMAT_RGBA8888) {
+		fprintf(stderr, "Error: Surface is not in RGBA8888 format.\n");
+		return 0;
+	}
 
-    uint32_t *pixels = (uint32_t *)vid.screen->pixels;
-    if (!pixels) {
-        fprintf(stderr, "Error: Unable to access pixel data.\n");
-        return 0;
-    }
+	uint32_t *pixels = (uint32_t *)vid.screen->pixels;
+	if (!pixels) {
+		fprintf(stderr, "Error: Unable to access pixel data.\n");
+		return 0;
+	}
 
-    int width = vid.screen->w;
-    int height = vid.screen->h;
-    int pixel_count = width * height;
+	int width = vid.screen->w;
+	int height = vid.screen->h;
+	int pixel_count = width * height;
 
-    // Use dynamic memory allocation for the histogram
-    uint32_t *color_histogram = (uint32_t *)calloc(256 * 256 * 256, sizeof(uint32_t));
-    if (!color_histogram) {
-        fprintf(stderr, "Error: Memory allocation failed.\n");
-        return 0;
-    }
+	// Use dynamic memory allocation for the histogram
+	uint32_t *color_histogram = (uint32_t *)calloc(256 * 256 * 256, sizeof(uint32_t));
+	if (!color_histogram) {
+		fprintf(stderr, "Error: Memory allocation failed.\n");
+		return 0;
+	}
 
-    for (int i = 0; i < pixel_count; i++) {
-        uint32_t pixel = pixels[i];
+	for (int i = 0; i < pixel_count; i++) {
+		uint32_t pixel = pixels[i];
 
-        // Extract R, G, B from RGBA8888
-        uint8_t r = (pixel >> 24) & 0xFF;
-        uint8_t g = (pixel >> 16) & 0xFF;
-        uint8_t b = (pixel >> 8) & 0xFF;
+		// Extract R, G, B from RGBA8888
+		uint8_t r = (pixel >> 24) & 0xFF;
+		uint8_t g = (pixel >> 16) & 0xFF;
+		uint8_t b = (pixel >> 8) & 0xFF;
 
-        uint32_t rgb = (r << 16) | (g << 8) | b;
-        color_histogram[rgb]++;
-    }
+		uint32_t rgb = (r << 16) | (g << 8) | b;
+		color_histogram[rgb]++;
+	}
 
-    // Find the most frequent color
-    uint32_t dominant_color = 0;
-    uint32_t max_count = 0;
-    for (int i = 0; i < 256 * 256 * 256; i++) {
-        if (color_histogram[i] > max_count) {
-            max_count = color_histogram[i];
-            dominant_color = i;
-        }
-    }
+	// Find the most frequent color
+	uint32_t dominant_color = 0;
+	uint32_t max_count = 0;
+	for (int i = 0; i < 256 * 256 * 256; i++) {
+		if (color_histogram[i] > max_count) {
+			max_count = color_histogram[i];
+			dominant_color = i;
+		}
+	}
 
-    free(color_histogram);
+	free(color_histogram);
 
-    // Return as RGBA8888 with full alpha
-    return (dominant_color << 8) | 0xFF;
+	// Return as RGBA8888 with full alpha
+	return (dominant_color << 8) | 0xFF;
 }
 
 
-
-static void clearVideo(void) {
-	for (int i=0; i<3; i++) {
+static void clearVideo(void)
+{
+	for (int i = 0; i < 3; i++) {
 		SDL_RenderClear(vid.renderer);
 		SDL_FillRect(vid.screen, NULL, SDL_transparentBlack);
 		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
@@ -806,7 +833,8 @@ static void clearVideo(void) {
 	}
 }
 
-void PLAT_quitVideo(void) {
+void PLAT_quitVideo(void)
+{
 	clearVideo();
 
 
@@ -814,15 +842,24 @@ void PLAT_quitVideo(void) {
 	SDL_GL_DeleteContext(vid.gl_context);
 	SDL_FreeSurface(vid.screen);
 
-	if (vid.target) SDL_DestroyTexture(vid.target);
-	if (vid.effect) SDL_DestroyTexture(vid.effect);
-	if (vid.overlay) SDL_DestroyTexture(vid.overlay);
-	if (vid.target_layer3) SDL_DestroyTexture(vid.target_layer3);
-	if (vid.target_layer1) SDL_DestroyTexture(vid.target_layer1);
-	if (vid.target_layer2) SDL_DestroyTexture(vid.target_layer2);
-	if (vid.target_layer4) SDL_DestroyTexture(vid.target_layer4);
-	if (vid.target_layer5) SDL_DestroyTexture(vid.target_layer5);
-	if (overlay_path) free(overlay_path);
+	if (vid.target)
+		SDL_DestroyTexture(vid.target);
+	if (vid.effect)
+		SDL_DestroyTexture(vid.effect);
+	if (vid.overlay)
+		SDL_DestroyTexture(vid.overlay);
+	if (vid.target_layer3)
+		SDL_DestroyTexture(vid.target_layer3);
+	if (vid.target_layer1)
+		SDL_DestroyTexture(vid.target_layer1);
+	if (vid.target_layer2)
+		SDL_DestroyTexture(vid.target_layer2);
+	if (vid.target_layer4)
+		SDL_DestroyTexture(vid.target_layer4);
+	if (vid.target_layer5)
+		SDL_DestroyTexture(vid.target_layer5);
+	if (overlay_path)
+		free(overlay_path);
 	SDL_DestroyTexture(vid.stream_layer1);
 	SDL_DestroyRenderer(vid.renderer);
 	SDL_DestroyWindow(vid.window);
@@ -831,74 +868,82 @@ void PLAT_quitVideo(void) {
 	system("cat /dev/zero > /dev/fb0 2>/dev/null");
 }
 
-void PLAT_clearVideo(SDL_Surface* screen) {
+void PLAT_clearVideo(SDL_Surface *screen)
+{
 	// SDL_FillRect(screen, NULL, 0); // TODO: revisit
 	SDL_FillRect(screen, NULL, SDL_transparentBlack);
 }
-void PLAT_clearAll(void) {
-	// ok honestely mixing SDL and OpenGL is really bad, but hey it works just got to sometimes clear gpu stuff and pull context back to SDL 
-	// so yeah clear all layers and pull a flip() to make it switch back to SDL before clearing
+void PLAT_clearAll(void)
+{
+	// ok honestely mixing SDL and OpenGL is really bad, but hey it works just got to sometimes clear gpu stuff and pull
+	// context back to SDL so yeah clear all layers and pull a flip() to make it switch back to SDL before clearing
 	PLAT_clearLayers(0);
-	PLAT_flip(vid.screen,0);
+	PLAT_flip(vid.screen, 0);
 	PLAT_clearLayers(0);
-	PLAT_flip(vid.screen,0);
+	PLAT_flip(vid.screen, 0);
 
 	// then do normal SDL clearing stuff
-	PLAT_clearVideo(vid.screen); 
-	SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0); 
+	PLAT_clearVideo(vid.screen);
+	SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 	SDL_RenderClear(vid.renderer);
 }
 
-void PLAT_setVsync(int vsync) {
-	
+void PLAT_setVsync(int vsync)
+{
 }
 
 static int hard_scale = 4; // TODO: base src size, eg. 160x144 can be 4
 
-static void resizeVideo(int w, int h, int p) {
-	if (w==vid.width && h==vid.height && p==vid.pitch) return;
-	
+static void resizeVideo(int w, int h, int p)
+{
+	if (w == vid.width && h == vid.height && p == vid.pitch)
+		return;
+
 	// TODO: minarch disables crisp (and nn upscale before linear downscale) when native, is this true?
-	
-	if (w>=device_width && h>=device_height) hard_scale = 1;
+
+	if (w >= device_width && h >= device_height)
+		hard_scale = 1;
 	// else if (h>=160) hard_scale = 2; // limits gba and up to 2x (seems sufficient for 640x480)
-	else hard_scale = 4;
+	else
+		hard_scale = 4;
 
 	// LOG_info("resizeVideo(%i,%i,%i) hard_scale: %i crisp: %i\n",w,h,p, hard_scale,vid.sharpness==SHARPNESS_CRISP);
 
 	SDL_DestroyTexture(vid.stream_layer1);
-	if (vid.target) SDL_DestroyTexture(vid.target);
-	
+	if (vid.target)
+		SDL_DestroyTexture(vid.target);
+
 	// SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, vid.sharpness==SHARPNESS_SOFT?"1":"0", SDL_HINT_OVERRIDE);
-	vid.stream_layer1 = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w,h);
+	vid.stream_layer1 = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING, w, h);
 	SDL_SetTextureBlendMode(vid.stream_layer1, SDL_BLENDMODE_BLEND);
-	
-	if (vid.sharpness==SHARPNESS_CRISP) {
+
+	if (vid.sharpness == SHARPNESS_CRISP) {
 		// SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, "1", SDL_HINT_OVERRIDE);
-		vid.target = SDL_CreateTexture(vid.renderer,SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w * hard_scale,h * hard_scale);
-	}
-	else {
+		vid.target = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, w * hard_scale,
+									   h * hard_scale);
+	} else {
 		vid.target = NULL;
 	}
-	
 
-	vid.width	= w;
-	vid.height	= h;
-	vid.pitch	= p;
+
+	vid.width = w;
+	vid.height = h;
+	vid.pitch = p;
 
 	reloadShaderTextures = 1;
 }
 
-SDL_Surface* PLAT_resizeVideo(int w, int h, int p) {
-	resizeVideo(w,h,p);
+SDL_Surface *PLAT_resizeVideo(int w, int h, int p)
+{
+	resizeVideo(w, h, p);
 	return vid.screen;
 }
 
-void PLAT_setSharpness(int sharpness) {
-	if(sharpness==1) {
-		finalScaleFilter=GL_LINEAR;
-	} 
-	else {
+void PLAT_setSharpness(int sharpness)
+{
+	if (sharpness == 1) {
+		finalScaleFilter = GL_LINEAR;
+	} else {
 		finalScaleFilter = GL_NEAREST;
 	}
 	reloadShaderTextures = 1;
@@ -921,195 +966,194 @@ static struct FX_Context {
 	.color = 0,
 	.next_color = 0,
 };
-static void rgb565_to_rgb888(uint32_t rgb565, uint8_t *r, uint8_t *g, uint8_t *b) {
-    // Extract the red component (5 bits)
-    uint8_t red = (rgb565 >> 11) & 0x1F;
-    // Extract the green component (6 bits)
-    uint8_t green = (rgb565 >> 5) & 0x3F;
-    // Extract the blue component (5 bits)
-    uint8_t blue = rgb565 & 0x1F;
-
-    // Scale the values to 8-bit range
-    *r = (red << 3) | (red >> 2);
-    *g = (green << 2) | (green >> 4);
-    *b = (blue << 3) | (blue >> 2);
-}
-static char* effect_path;
+static void rgb565_to_rgb888(uint32_t rgb565, uint8_t *r, uint8_t *g, uint8_t *b)
+{
+	// Extract the red component (5 bits)
+	uint8_t red = (rgb565 >> 11) & 0x1F;
+	// Extract the green component (6 bits)
+	uint8_t green = (rgb565 >> 5) & 0x3F;
+	// Extract the blue component (5 bits)
+	uint8_t blue = rgb565 & 0x1F;
+
+	// Scale the values to 8-bit range
+	*r = (red << 3) | (red >> 2);
+	*g = (green << 2) | (green >> 4);
+	*b = (blue << 3) | (blue >> 2);
+}
+static char *effect_path;
 static int effectUpdated = 0;
-static void updateEffect(void) {
-	if (effect.next_scale==effect.scale && effect.next_type==effect.type && effect.next_color==effect.color) return; // unchanged
-	
+static void updateEffect(void)
+{
+	if (effect.next_scale == effect.scale && effect.next_type == effect.type && effect.next_color == effect.color)
+		return; // unchanged
+
 	int live_scale = effect.scale;
 	int live_color = effect.color;
 	effect.scale = effect.next_scale;
 	effect.type = effect.next_type;
 	effect.color = effect.next_color;
-	
-	if (effect.type==EFFECT_NONE) return; // disabled
-	if (effect.type==effect.live_type && effect.scale==live_scale && effect.color==live_color) return; // already loaded
-	
+
+	if (effect.type == EFFECT_NONE)
+		return; // disabled
+	if (effect.type == effect.live_type && effect.scale == live_scale && effect.color == live_color)
+		return; // already loaded
+
 	int opacity = 128; // 1 - 1/2 = 50%
-	if (effect.type==EFFECT_LINE) {
-		if (effect.scale<3) {
+	if (effect.type == EFFECT_LINE) {
+		if (effect.scale < 3) {
 			effect_path = RES_PATH "/line-2.png";
-		}
-		else if (effect.scale<4) {
+		} else if (effect.scale < 4) {
 			effect_path = RES_PATH "/line-3.png";
-		}
-		else if (effect.scale<5) {
+		} else if (effect.scale < 5) {
 			effect_path = RES_PATH "/line-4.png";
-		}
-		else if (effect.scale<6) {
+		} else if (effect.scale < 6) {
 			effect_path = RES_PATH "/line-5.png";
-		}
-		else if (effect.scale<8) {
+		} else if (effect.scale < 8) {
 			effect_path = RES_PATH "/line-6.png";
-		}
-		else {
+		} else {
 			effect_path = RES_PATH "/line-8.png";
 		}
-	}
-	else if (effect.type==EFFECT_GRID) {
-		if (effect.scale<3) {
+	} else if (effect.type == EFFECT_GRID) {
+		if (effect.scale < 3) {
 			effect_path = RES_PATH "/grid-2.png";
 			opacity = 64; // 1 - 3/4 = 25%
-		}
-		else if (effect.scale<4) {
+		} else if (effect.scale < 4) {
 			effect_path = RES_PATH "/grid-3.png";
 			opacity = 112; // 1 - 5/9 = ~44%
-		}
-		else if (effect.scale<5) {
+		} else if (effect.scale < 5) {
 			effect_path = RES_PATH "/grid-4.png";
 			opacity = 144; // 1 - 7/16 = ~56%
-		}
-		else if (effect.scale<6) {
+		} else if (effect.scale < 6) {
 			effect_path = RES_PATH "/grid-5.png";
 			opacity = 160; // 1 - 9/25 = ~64%
-			// opacity = 96; // TODO: tmp, for white grid
-		}
-		else if (effect.scale<8) {
+						   // opacity = 96; // TODO: tmp, for white grid
+		} else if (effect.scale < 8) {
 			effect_path = RES_PATH "/grid-6.png";
 			opacity = 112; // 1 - 5/9 = ~44%
-		}
-		else if (effect.scale<11) {
+		} else if (effect.scale < 11) {
 			effect_path = RES_PATH "/grid-8.png";
 			opacity = 144; // 1 - 7/16 = ~56%
-		}
-		else {
+		} else {
 			effect_path = RES_PATH "/grid-11.png";
 			opacity = 136; // 1 - 57/121 = ~52%
 		}
 	}
 	effectUpdated = 1;
-	
 }
 int screenx = 0;
 int screeny = 0;
-void PLAT_setOffsetX(int x) {
-    if (x < 0 || x > 128) return;
-    screenx = x - 64;
-	LOG_info("screenx: %i %i\n",screenx,x);
-}
-void PLAT_setOffsetY(int y) {
-    if (y < 0 || y > 128) return;
-    screeny = y - 64; 
-	LOG_info("screeny: %i %i\n",screeny,y);
-}
-static int overlayUpdated=0;
-void PLAT_setOverlay(const char* filename, const char* tag) {
-    if (vid.overlay) {
-        SDL_DestroyTexture(vid.overlay);
-        vid.overlay = NULL;
-    }
+void PLAT_setOffsetX(int x)
+{
+	if (x < 0 || x > 128)
+		return;
+	screenx = x - 64;
+	LOG_info("screenx: %i %i\n", screenx, x);
+}
+void PLAT_setOffsetY(int y)
+{
+	if (y < 0 || y > 128)
+		return;
+	screeny = y - 64;
+	LOG_info("screeny: %i %i\n", screeny, y);
+}
+static int overlayUpdated = 0;
+void PLAT_setOverlay(const char *filename, const char *tag)
+{
+	if (vid.overlay) {
+		SDL_DestroyTexture(vid.overlay);
+		vid.overlay = NULL;
+	}
 	overlay_path = NULL;
-	overlayUpdated=1;
+	overlayUpdated = 1;
 
-    if (!filename || strcmp(filename, "") == 0) {
+	if (!filename || strcmp(filename, "") == 0) {
 		overlay_path = strdup("");
-        printf("Skipping overlay update.\n");
-        return;
-    }
-
-    size_t path_len = strlen(OVERLAYS_FOLDER) + strlen(tag) + strlen(filename) + 4; // +3 for slashes and null-terminator
-    overlay_path = malloc(path_len);
+		printf("Skipping overlay update.\n");
+		return;
+	}
 
-    if (!overlay_path) {
-        perror("malloc failed");
-        return;
-    }
+	size_t path_len =
+		strlen(OVERLAYS_FOLDER) + strlen(tag) + strlen(filename) + 4; // +3 for slashes and null-terminator
+	overlay_path = malloc(path_len);
 
-    snprintf(overlay_path, path_len, "%s/%s/%s", OVERLAYS_FOLDER, tag, filename);
-    printf("Overlay path set to: %s\n", overlay_path);
+	if (!overlay_path) {
+		perror("malloc failed");
+		return;
+	}
 
+	snprintf(overlay_path, path_len, "%s/%s/%s", OVERLAYS_FOLDER, tag, filename);
+	printf("Overlay path set to: %s\n", overlay_path);
 }
 
-void applyRoundedCorners(SDL_Surface* surface, SDL_Rect* rect, int radius) {
-	if (!surface) return;
+void applyRoundedCorners(SDL_Surface *surface, SDL_Rect *rect, int radius)
+{
+	if (!surface)
+		return;
 
-    Uint32* pixels = (Uint32*)surface->pixels;
-    SDL_PixelFormat* fmt = surface->format;
+	Uint32 *pixels = (Uint32 *)surface->pixels;
+	SDL_PixelFormat *fmt = surface->format;
 	SDL_Rect target = {0, 0, surface->w, surface->h};
 	if (rect)
 		target = *rect;
-    
-    Uint32 transparent_black = SDL_MapRGBA(fmt, 0, 0, 0, 0);  // Fully transparent black
+
+	Uint32 transparent_black = SDL_MapRGBA(fmt, 0, 0, 0, 0); // Fully transparent black
 
 	const int xBeg = target.x;
 	const int xEnd = target.x + target.w;
 	const int yBeg = target.y;
 	const int yEnd = target.y + target.h;
-	for (int y = yBeg; y < yEnd; ++y)
-	{
+	for (int y = yBeg; y < yEnd; ++y) {
 		for (int x = xBeg; x < xEnd; ++x) {
-            int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
-            int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
-            if (dx * dx + dy * dy > radius * radius) {
-                pixels[y * target.w + x] = transparent_black;  // Set to fully transparent black
-            }
-        }
-    }
+			int dx = (x < xBeg + radius) ? xBeg + radius - x : (x >= xEnd - radius) ? x - (xEnd - radius - 1) : 0;
+			int dy = (y < yBeg + radius) ? yBeg + radius - y : (y >= yEnd - radius) ? y - (yEnd - radius - 1) : 0;
+			if (dx * dx + dy * dy > radius * radius) {
+				pixels[y * target.w + x] = transparent_black; // Set to fully transparent black
+			}
+		}
+	}
 }
 
-void PLAT_clearLayers(int layer) {
-	if(layer==0 || layer==1) {
+void PLAT_clearLayers(int layer)
+{
+	if (layer == 0 || layer == 1) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==2) {
+	if (layer == 0 || layer == 2) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer2);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==3) {
+	if (layer == 0 || layer == 3) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer3);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==4) {
+	if (layer == 0 || layer == 4) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 		SDL_RenderClear(vid.renderer);
 	}
-	if(layer==0 || layer==5) {
+	if (layer == 0 || layer == 5) {
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer5);
 		SDL_RenderClear(vid.renderer);
 	}
 
 	SDL_SetRenderTarget(vid.renderer, NULL);
 }
-void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,int layer) {
-    if (!inputSurface || !vid.target_layer1 || !vid.renderer) return; 
+void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, float brightness, bool maintainAspectRatio,
+					  int layer)
+{
+	if (!inputSurface || !vid.target_layer1 || !vid.renderer)
+		return;
 
-    SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-                                                 SDL_PIXELFORMAT_RGBA8888, 
-                                                 SDL_TEXTUREACCESS_TARGET,  
-                                                 inputSurface->w, inputSurface->h); 
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
-    if (!tempTexture) {
-        printf("Failed to create temporary texture: %s\n", SDL_GetError());
-        return;
-    }
+	if (!tempTexture) {
+		printf("Failed to create temporary texture: %s\n", SDL_GetError());
+		return;
+	}
 
-    SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-    switch (layer)
-	{
+	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
+	switch (layer) {
 	case 1:
 		SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 		break;
@@ -1130,52 +1174,44 @@ void PLAT_drawOnLayer(SDL_Surface *inputSurface, int x, int y, int w, int h, flo
 		break;
 	}
 
-    // Adjust brightness
-    Uint8 r = 255, g = 255, b = 255;
-    if (brightness < 1.0f) {
-        r = g = b = (Uint8)(255 * brightness);
-    } else if (brightness > 1.0f) {
-        r = g = b = 255;
-    }
-
-    SDL_SetTextureColorMod(tempTexture, r, g, b);
-
-    // Aspect ratio handling
-    SDL_Rect srcRect = { 0, 0, inputSurface->w, inputSurface->h }; 
-    SDL_Rect dstRect = { x, y, w, h };  
-
-    if (maintainAspectRatio) {
-        float aspectRatio = (float)inputSurface->w / (float)inputSurface->h;
-    
-        if (w / (float)h > aspectRatio) {
-            dstRect.w = (int)(h * aspectRatio);
-        } else {
-            dstRect.h = (int)(w / aspectRatio);
-        }
-    }
-
-    SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
-    SDL_SetRenderTarget(vid.renderer, NULL);
-    SDL_DestroyTexture(tempTexture);
-}
-
-
-void PLAT_animateSurface(
-	SDL_Surface *inputSurface,
-	int x, int y,
-	int target_x, int target_y,
-	int w, int h,
-	int duration_ms,
-	int start_opacity,
-	int target_opacity,
-	int layer
-) {
-	if (!inputSurface || !vid.target_layer2 || !vid.renderer) return;
-
-	SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	// Adjust brightness
+	Uint8 r = 255, g = 255, b = 255;
+	if (brightness < 1.0f) {
+		r = g = b = (Uint8)(255 * brightness);
+	} else if (brightness > 1.0f) {
+		r = g = b = 255;
+	}
+
+	SDL_SetTextureColorMod(tempTexture, r, g, b);
+
+	// Aspect ratio handling
+	SDL_Rect srcRect = {0, 0, inputSurface->w, inputSurface->h};
+	SDL_Rect dstRect = {x, y, w, h};
+
+	if (maintainAspectRatio) {
+		float aspectRatio = (float)inputSurface->w / (float)inputSurface->h;
+
+		if (w / (float)h > aspectRatio) {
+			dstRect.w = (int)(h * aspectRatio);
+		} else {
+			dstRect.h = (int)(w / aspectRatio);
+		}
+	}
+
+	SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
+	SDL_SetRenderTarget(vid.renderer, NULL);
+	SDL_DestroyTexture(tempTexture);
+}
+
+
+void PLAT_animateSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+						 int duration_ms, int start_opacity, int target_opacity, int layer)
+{
+	if (!inputSurface || !vid.target_layer2 || !vid.renderer)
+		return;
+
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!tempTexture) {
 		printf("Failed to create temporary texture: %s\n", SDL_GetError());
@@ -1183,14 +1219,13 @@ void PLAT_animateSurface(
 	}
 
 	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND);  // Enable blending for opacity
+	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND); // Enable blending for opacity
 
 	const int fps = 60;
 	const int frame_delay = 1000 / fps;
 	const int total_frames = duration_ms / frame_delay;
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 
 		int current_x = x + (int)((target_x - x) * t);
@@ -1198,8 +1233,10 @@ void PLAT_animateSurface(
 
 		// Interpolate opacity
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
 		SDL_SetTextureAlphaMod(tempTexture, current_opacity);
 
@@ -1208,11 +1245,11 @@ void PLAT_animateSurface(
 		else
 			SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 
-		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0); 
+		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect srcRect = { 0, 0, inputSurface->w, inputSurface->h };
-		SDL_Rect dstRect = { current_x, current_y, w, h };
+		SDL_Rect srcRect = {0, 0, inputSurface->w, inputSurface->h};
+		SDL_Rect dstRect = {current_x, current_y, w, h};
 		SDL_RenderCopy(vid.renderer, tempTexture, &srcRect, &dstRect);
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
@@ -1224,10 +1261,11 @@ void PLAT_animateSurface(
 
 static int text_offset = 0;
 
-int PLAT_resetScrollText(TTF_Font* font, const char* in_name,int max_width) {
+int PLAT_resetScrollText(TTF_Font *font, const char *in_name, int max_width)
+{
 	int text_width, text_height;
-	
-    TTF_SizeUTF8(font, in_name, &text_width, &text_height);
+
+	TTF_SizeUTF8(font, in_name, &text_width, &text_height);
 
 	text_offset = 0;
 
@@ -1237,77 +1275,78 @@ int PLAT_resetScrollText(TTF_Font* font, const char* in_name,int max_width) {
 		return 1;
 	}
 }
-void PLAT_scrollTextTexture(
-    TTF_Font* font,
-    const char* in_name,
-    int x, int y,      // Position on target layer
-    int w, int h,      // Clipping width and height
-    SDL_Color color,
-    float transparency
-) {
-    static int frame_counter = 0;
+void PLAT_scrollTextTexture(TTF_Font *font, const char *in_name, int x, int y, // Position on target layer
+							int w, int h,									   // Clipping width and height
+							SDL_Color color, float transparency)
+{
+	static int frame_counter = 0;
 	int padding = 30;
 
-    if (transparency < 0.0f) transparency = 0.0f;
-    if (transparency > 1.0f) transparency = 1.0f;
-    color.a = (Uint8)(transparency * 255);
+	if (transparency < 0.0f)
+		transparency = 0.0f;
+	if (transparency > 1.0f)
+		transparency = 1.0f;
+	color.a = (Uint8)(transparency * 255);
 
-    // Render the original text only once
-    SDL_Surface* singleSur = TTF_RenderUTF8_Blended(font, in_name, color);
-    if (!singleSur) return;
-
-    int single_width = singleSur->w;
-    int single_height = singleSur->h;
+	// Render the original text only once
+	SDL_Surface *singleSur = TTF_RenderUTF8_Blended(font, in_name, color);
+	if (!singleSur)
+		return;
 
-    // Create a surface to hold two copies side by side with padding
-    SDL_Surface* text_surface = SDL_CreateRGBSurfaceWithFormat(0,
-        single_width * 2 + padding, single_height, 32, SDL_PIXELFORMAT_RGBA8888);
+	int single_width = singleSur->w;
+	int single_height = singleSur->h;
 
-    SDL_FillRect(text_surface, NULL, THEME_COLOR1);
-    SDL_BlitSurface(singleSur, NULL, text_surface, NULL);
+	// Create a surface to hold two copies side by side with padding
+	SDL_Surface *text_surface =
+		SDL_CreateRGBSurfaceWithFormat(0, single_width * 2 + padding, single_height, 32, SDL_PIXELFORMAT_RGBA8888);
 
-    SDL_Rect second = { single_width + padding, 0, single_width, single_height };
-    SDL_BlitSurface(singleSur, NULL, text_surface, &second);
-    SDL_FreeSurface(singleSur);
+	SDL_FillRect(text_surface, NULL, THEME_COLOR1);
+	SDL_BlitSurface(singleSur, NULL, text_surface, NULL);
 
-    SDL_Texture* full_text_texture = SDL_CreateTextureFromSurface(vid.renderer, text_surface);
-    int full_text_width = text_surface->w;
-    SDL_FreeSurface(text_surface);
+	SDL_Rect second = {single_width + padding, 0, single_width, single_height};
+	SDL_BlitSurface(singleSur, NULL, text_surface, &second);
+	SDL_FreeSurface(singleSur);
 
-    if (!full_text_texture) return;
+	SDL_Texture *full_text_texture = SDL_CreateTextureFromSurface(vid.renderer, text_surface);
+	int full_text_width = text_surface->w;
+	SDL_FreeSurface(text_surface);
 
-    SDL_SetTextureBlendMode(full_text_texture, SDL_BLENDMODE_BLEND);
-    SDL_SetTextureAlphaMod(full_text_texture, color.a);
+	if (!full_text_texture)
+		return;
 
-    SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
+	SDL_SetTextureBlendMode(full_text_texture, SDL_BLENDMODE_BLEND);
+	SDL_SetTextureAlphaMod(full_text_texture, color.a);
 
-    SDL_Rect src_rect = { text_offset, 0, w, single_height };
-    SDL_Rect dst_rect = { x, y, w, single_height };
+	SDL_SetRenderTarget(vid.renderer, vid.target_layer4);
 
-    SDL_RenderCopy(vid.renderer, full_text_texture, &src_rect, &dst_rect);
+	SDL_Rect src_rect = {text_offset, 0, w, single_height};
+	SDL_Rect dst_rect = {x, y, w, single_height};
 
-    SDL_SetRenderTarget(vid.renderer, NULL);
-    SDL_DestroyTexture(full_text_texture);
+	SDL_RenderCopy(vid.renderer, full_text_texture, &src_rect, &dst_rect);
 
-    // Scroll only if text is wider than clip width
-    if (single_width > w) {
-        frame_counter++;
-        if (frame_counter >= 0) {
-            text_offset += 2;
-            if (text_offset >= single_width + padding) {
-                text_offset = 0;
-            }
-            frame_counter = 0;
-        }
-    } else {
-        text_offset = 0;
-    }
+	SDL_SetRenderTarget(vid.renderer, NULL);
+	SDL_DestroyTexture(full_text_texture);
+
+	// Scroll only if text is wider than clip width
+	if (single_width > w) {
+		frame_counter++;
+		if (frame_counter >= 0) {
+			text_offset += 2;
+			if (text_offset >= single_width + padding) {
+				text_offset = 0;
+			}
+			frame_counter = 0;
+		}
+	} else {
+		text_offset = 0;
+	}
 
-    PLAT_GPU_Flip();
+	PLAT_GPU_Flip();
 }
 
 // super fast without update_texture to draw screen
-void PLAT_GPU_Flip() {
+void PLAT_GPU_Flip()
+{
 	SDL_RenderClear(vid.renderer);
 	SDL_RenderCopy(vid.renderer, vid.target_layer1, NULL, NULL);
 	SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
@@ -1318,19 +1357,14 @@ void PLAT_GPU_Flip() {
 	SDL_RenderPresent(vid.renderer);
 }
 
-void PLAT_animateSurfaceOpacity(
-	SDL_Surface *inputSurface,
-	int x, int y, int w, int h,
-	int start_opacity, int target_opacity,
-	int duration_ms,
-	int layer
-) {
-	if (!inputSurface) return;
+void PLAT_animateSurfaceOpacity(SDL_Surface *inputSurface, int x, int y, int w, int h, int start_opacity,
+								int target_opacity, int duration_ms, int layer)
+{
+	if (!inputSurface)
+		return;
 
-	SDL_Texture* tempTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	SDL_Texture *tempTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!tempTexture) {
 		printf("Failed to create temporary texture: %s\n", SDL_GetError());
@@ -1338,50 +1372,52 @@ void PLAT_animateSurfaceOpacity(
 	}
 
 	SDL_UpdateTexture(tempTexture, NULL, inputSurface->pixels, inputSurface->pitch);
-	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND); 
+	SDL_SetTextureBlendMode(tempTexture, SDL_BLENDMODE_BLEND);
 
 	const int fps = 60;
 	const int frame_delay = 1000 / fps;
 	const int total_frames = duration_ms / frame_delay;
 
-	SDL_Texture* target_layer = (layer == 0) ? vid.target_layer2 : vid.target_layer4;
+	SDL_Texture *target_layer = (layer == 0) ? vid.target_layer2 : vid.target_layer4;
 	if (!target_layer) {
 		SDL_DestroyTexture(tempTexture);
 		return;
 	}
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
 		SDL_SetTextureAlphaMod(tempTexture, current_opacity);
 		SDL_SetRenderTarget(vid.renderer, target_layer);
 		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect dstRect = { x, y, w, h };
+		SDL_Rect dstRect = {x, y, w, h};
 		SDL_RenderCopy(vid.renderer, tempTexture, NULL, &dstRect);
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
 		// blit to 0 for normal draw
 		vid.blit = 0;
-		PLAT_flip(vid.screen,0);
-
+		PLAT_flip(vid.screen, 0);
 	}
 
 	SDL_DestroyTexture(tempTexture);
 }
 
-SDL_Surface* PLAT_captureRendererToSurface() {
-	if (!vid.renderer) return NULL;
+SDL_Surface *PLAT_captureRendererToSurface()
+{
+	if (!vid.renderer)
+		return NULL;
 
 	int width, height;
 	SDL_GetRendererOutputSize(vid.renderer, &width, &height);
 
-	SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_RGBA8888);
+	SDL_Surface *surface = SDL_CreateRGBSurfaceWithFormat(0, width, height, 32, SDL_PIXELFORMAT_RGBA8888);
 	if (!surface) {
 		printf("Failed to create surface: %s\n", SDL_GetError());
 		return NULL;
@@ -1397,7 +1433,7 @@ SDL_Surface* PLAT_captureRendererToSurface() {
 	}
 
 	// remove transparancy
-	Uint32* pixels = (Uint32*)surface->pixels;
+	Uint32 *pixels = (Uint32 *)surface->pixels;
 	int total_pixels = (surface->pitch / 4) * surface->h;
 
 	for (int i = 0; i < total_pixels; i++) {
@@ -1410,19 +1446,15 @@ SDL_Surface* PLAT_captureRendererToSurface() {
 	return surface;
 }
 
-void PLAT_animateAndFadeSurface(
-	SDL_Surface *inputSurface,
-	int x, int y, int target_x, int target_y, int w, int h, int duration_ms,
-	SDL_Surface *fadeSurface,
-	int fade_x, int fade_y, int fade_w, int fade_h,
-	int start_opacity, int target_opacity,int layer
-) {
-	if (!inputSurface || !vid.renderer) return;
+void PLAT_animateAndFadeSurface(SDL_Surface *inputSurface, int x, int y, int target_x, int target_y, int w, int h,
+								int duration_ms, SDL_Surface *fadeSurface, int fade_x, int fade_y, int fade_w,
+								int fade_h, int start_opacity, int target_opacity, int layer)
+{
+	if (!inputSurface || !vid.renderer)
+		return;
 
-	SDL_Texture* moveTexture = SDL_CreateTexture(vid.renderer,
-		SDL_PIXELFORMAT_RGBA8888,
-		SDL_TEXTUREACCESS_TARGET,
-		inputSurface->w, inputSurface->h);
+	SDL_Texture *moveTexture = SDL_CreateTexture(vid.renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+												 inputSurface->w, inputSurface->h);
 
 	if (!moveTexture) {
 		printf("Failed to create move texture: %s\n", SDL_GetError());
@@ -1431,7 +1463,7 @@ void PLAT_animateAndFadeSurface(
 
 	SDL_UpdateTexture(moveTexture, NULL, inputSurface->pixels, inputSurface->pitch);
 
-	SDL_Texture* fadeTexture = NULL;
+	SDL_Texture *fadeTexture = NULL;
 	if (fadeSurface) {
 		fadeTexture = SDL_CreateTextureFromSurface(vid.renderer, fadeSurface);
 		if (!fadeTexture) {
@@ -1449,18 +1481,18 @@ void PLAT_animateAndFadeSurface(
 	Uint32 start_time = SDL_GetTicks();
 
 	for (int frame = 0; frame <= total_frames; ++frame) {
-
 		float t = (float)frame / total_frames;
 
 		int current_x = x + (int)((target_x - x) * t);
 		int current_y = y + (int)((target_y - y) * t);
 
 		int current_opacity = start_opacity + (int)((target_opacity - start_opacity) * t);
-		if (current_opacity < 0) current_opacity = 0;
-		if (current_opacity > 255) current_opacity = 255;
+		if (current_opacity < 0)
+			current_opacity = 0;
+		if (current_opacity > 255)
+			current_opacity = 255;
 
-		switch (layer)
-		{
+		switch (layer) {
 		case 1:
 			SDL_SetRenderTarget(vid.renderer, vid.target_layer1);
 			break;
@@ -1483,95 +1515,104 @@ void PLAT_animateAndFadeSurface(
 		SDL_SetRenderDrawColor(vid.renderer, 0, 0, 0, 0);
 		SDL_RenderClear(vid.renderer);
 
-		SDL_Rect moveSrcRect = { 0, 0, inputSurface->w, inputSurface->h };
-		SDL_Rect moveDstRect = { current_x, current_y, w, h };
+		SDL_Rect moveSrcRect = {0, 0, inputSurface->w, inputSurface->h};
+		SDL_Rect moveDstRect = {current_x, current_y, w, h};
 		SDL_RenderCopy(vid.renderer, moveTexture, &moveSrcRect, &moveDstRect);
 
 		if (fadeTexture) {
 			SDL_SetTextureAlphaMod(fadeTexture, current_opacity);
-			SDL_Rect fadeDstRect = { fade_x, fade_y, fade_w, fade_h };
+			SDL_Rect fadeDstRect = {fade_x, fade_y, fade_w, fade_h};
 			SDL_RenderCopy(vid.renderer, fadeTexture, NULL, &fadeDstRect);
 		}
 
 		SDL_SetRenderTarget(vid.renderer, NULL);
 		PLAT_GPU_Flip();
-
 	}
 
 	SDL_DestroyTexture(moveTexture);
-	if (fadeTexture) SDL_DestroyTexture(fadeTexture);
+	if (fadeTexture)
+		SDL_DestroyTexture(fadeTexture);
 }
 
-void PLAT_setEffect(int next_type) {
+void PLAT_setEffect(int next_type)
+{
 	effect.next_type = next_type;
 }
-void PLAT_setEffectColor(int next_color) {
+void PLAT_setEffectColor(int next_color)
+{
 	effect.next_color = next_color;
 }
-void PLAT_vsync(int remaining) {
-	if (remaining>0) SDL_Delay(remaining);
+void PLAT_vsync(int remaining)
+{
+	if (remaining > 0)
+		SDL_Delay(remaining);
 }
 
-scaler_t PLAT_getScaler(GFX_Renderer* renderer) {
+scaler_t PLAT_getScaler(GFX_Renderer *renderer)
+{
 	// LOG_info("getScaler for scale: %i\n", renderer->scale);
 	effect.next_scale = renderer->scale;
 	return scale1x1_c16;
 }
 
-void setRectToAspectRatio(SDL_Rect* dst_rect) {
-    int x = vid.blit->src_x;
-    int y = vid.blit->src_y;
-    int w = vid.blit->src_w;
-    int h = vid.blit->src_h;
-
-    if (vid.blit->aspect == 0) {
-        w = vid.blit->src_w * vid.blit->scale;
-        h = vid.blit->src_h * vid.blit->scale;
-        dst_rect->x = (device_width - w) / 2 + screenx;
-        dst_rect->y = (device_height - h) / 2 + screeny;
-        dst_rect->w = w;
-        dst_rect->h = h;
-    } else if (vid.blit->aspect > 0) {
-        if (should_rotate) {
-            h = device_width;
-            w = h * vid.blit->aspect;
-            if (w > device_height) {
-                w = device_height;
-                h = w / vid.blit->aspect;
-            }
-        } else {
-            h = device_height;
-            w = h * vid.blit->aspect;
-            if (w > device_width) {
-                w = device_width;
-                h = w / vid.blit->aspect;
-            }
-        }
-        dst_rect->x = (device_width - w) / 2 + screenx;
-        dst_rect->y = (device_height - h) / 2 + screeny;
-        dst_rect->w = w;
-        dst_rect->h = h;
-    } else {
-        dst_rect->x = screenx;
-        dst_rect->y = screeny;
-        dst_rect->w = should_rotate ? device_height : device_width;
-        dst_rect->h = should_rotate ? device_width : device_height;
-    }
-}
-
-void PLAT_blitRenderer(GFX_Renderer* renderer) {
+void setRectToAspectRatio(SDL_Rect *dst_rect)
+{
+	int x = vid.blit->src_x;
+	int y = vid.blit->src_y;
+	int w = vid.blit->src_w;
+	int h = vid.blit->src_h;
+
+	if (vid.blit->aspect == 0) {
+		w = vid.blit->src_w * vid.blit->scale;
+		h = vid.blit->src_h * vid.blit->scale;
+		dst_rect->x = (device_width - w) / 2 + screenx;
+		dst_rect->y = (device_height - h) / 2 + screeny;
+		dst_rect->w = w;
+		dst_rect->h = h;
+	} else if (vid.blit->aspect > 0) {
+		if (should_rotate) {
+			h = device_width;
+			w = h * vid.blit->aspect;
+			if (w > device_height) {
+				w = device_height;
+				h = w / vid.blit->aspect;
+			}
+		} else {
+			h = device_height;
+			w = h * vid.blit->aspect;
+			if (w > device_width) {
+				w = device_width;
+				h = w / vid.blit->aspect;
+			}
+		}
+		dst_rect->x = (device_width - w) / 2 + screenx;
+		dst_rect->y = (device_height - h) / 2 + screeny;
+		dst_rect->w = w;
+		dst_rect->h = h;
+	} else {
+		dst_rect->x = screenx;
+		dst_rect->y = screeny;
+		dst_rect->w = should_rotate ? device_height : device_width;
+		dst_rect->h = should_rotate ? device_width : device_height;
+	}
+}
+
+void PLAT_blitRenderer(GFX_Renderer *renderer)
+{
 	vid.blit = renderer;
 	SDL_RenderClear(vid.renderer);
-	resizeVideo(vid.blit->true_w,vid.blit->true_h,vid.blit->src_p);
+	resizeVideo(vid.blit->true_w, vid.blit->true_h, vid.blit->src_p);
 }
 
-void PLAT_clearShaders() {
+void PLAT_clearShaders()
+{
 	// this funciton was empty so am abusing it for now for this, later need to make a seperate function for it
 	// set blit to 0 maybe should be seperate function later
 	vid.blit = NULL;
 }
 
-void PLAT_flipHidden() {
+void PLAT_flipHidden()
+{
 	SDL_RenderClear(vid.renderer);
 	resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
 	SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
@@ -1584,55 +1625,55 @@ void PLAT_flipHidden() {
 	//  SDL_RenderPresent(vid.renderer); // no present want to flip  hidden
 }
 
-void PLAT_flip(SDL_Surface* IGNORED, int ignored) {
+void PLAT_flip(SDL_Surface *IGNORED, int ignored)
+{
 	// dont think we need this here tbh
-	// SDL_RenderClear(vid.renderer);    
+	// SDL_RenderClear(vid.renderer);
 	if (!vid.blit) {
-        resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
-        SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
+		resizeVideo(device_width, device_height, FIXED_PITCH); // !!!???
+		SDL_UpdateTexture(vid.stream_layer1, NULL, vid.screen->pixels, vid.screen->pitch);
 		SDL_RenderCopy(vid.renderer, vid.target_layer1, NULL, NULL);
-        SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
-        SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
+		SDL_RenderCopy(vid.renderer, vid.target_layer2, NULL, NULL);
+		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer3, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer4, NULL, NULL);
 		SDL_RenderCopy(vid.renderer, vid.target_layer5, NULL, NULL);
-        SDL_RenderPresent(vid.renderer);
-        return;
-    }
-    SDL_UpdateTexture(vid.stream_layer1, NULL, vid.blit->src, vid.blit->src_p);
-
-    SDL_Texture* target = vid.stream_layer1;
-    int x = vid.blit->src_x;
-    int y = vid.blit->src_y;
-    int w = vid.blit->src_w;
-    int h = vid.blit->src_h;
-    if (vid.sharpness == SHARPNESS_CRISP) {
-		
-        SDL_SetRenderTarget(vid.renderer, vid.target);
-        SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
-        SDL_SetRenderTarget(vid.renderer, NULL);
-        x *= hard_scale;
-        y *= hard_scale;
-        w *= hard_scale;
-        h *= hard_scale;
-        target = vid.target;
-    }
-
-    SDL_Rect* src_rect = &(SDL_Rect){x, y, w, h};
-    SDL_Rect* dst_rect = &(SDL_Rect){0, 0, device_width, device_height};
-
-    setRectToAspectRatio(dst_rect);
-	
-    SDL_RenderCopy(vid.renderer, target, src_rect, dst_rect);
-
-    SDL_RenderPresent(vid.renderer);
-    vid.blit = NULL;
+		SDL_RenderPresent(vid.renderer);
+		return;
+	}
+	SDL_UpdateTexture(vid.stream_layer1, NULL, vid.blit->src, vid.blit->src_p);
+
+	SDL_Texture *target = vid.stream_layer1;
+	int x = vid.blit->src_x;
+	int y = vid.blit->src_y;
+	int w = vid.blit->src_w;
+	int h = vid.blit->src_h;
+	if (vid.sharpness == SHARPNESS_CRISP) {
+		SDL_SetRenderTarget(vid.renderer, vid.target);
+		SDL_RenderCopy(vid.renderer, vid.stream_layer1, NULL, NULL);
+		SDL_SetRenderTarget(vid.renderer, NULL);
+		x *= hard_scale;
+		y *= hard_scale;
+		w *= hard_scale;
+		h *= hard_scale;
+		target = vid.target;
+	}
+
+	SDL_Rect *src_rect = &(SDL_Rect){x, y, w, h};
+	SDL_Rect *dst_rect = &(SDL_Rect){0, 0, device_width, device_height};
+
+	setRectToAspectRatio(dst_rect);
+
+	SDL_RenderCopy(vid.renderer, target, src_rect, dst_rect);
+
+	SDL_RenderPresent(vid.renderer);
+	vid.blit = NULL;
 }
 
 static int frame_count = 0;
-void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_texture,
-                   int x, int y, int dst_width, int dst_height, Shader* shader, int alpha, int filter) {
-
+void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint *target_texture, int x, int y, int dst_width,
+				   int dst_height, Shader *shader, int alpha, int filter)
+{
 	static GLuint static_VAO = 0, static_VBO = 0;
 	static GLuint last_program = 0;
 	static GLfloat last_texelSize[2] = {-1.0f, -1.0f};
@@ -1644,7 +1685,7 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 
 
 	if (shader_program != last_program)
-    	glUseProgram(shader_program);
+		glUseProgram(shader_program);
 
 	if (static_VAO == 0) {
 		glGenVertexArrays(1, &static_VAO);
@@ -1654,60 +1695,60 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 
 		float vertices[] = {
 			// x,    y,    z,    w,     u,    v,    s,    t
-			-1.0f,  1.0f, 0.0f, 1.0f,  0.0f, 1.0f, 0.0f, 0.0f,  // top-left
-			-1.0f, -1.0f, 0.0f, 1.0f,  0.0f, 0.0f, 0.0f, 0.0f,  // bottom-left
-			1.0f,  1.0f, 0.0f, 1.0f,  1.0f, 1.0f, 0.0f, 0.0f,  // top-right
-			1.0f, -1.0f, 0.0f, 1.0f,  1.0f, 0.0f, 0.0f, 0.0f   // bottom-right
+			-1.0f, 1.0f,  0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, // top-left
+			-1.0f, -1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, // bottom-left
+			1.0f,  1.0f,  0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, // top-right
+			1.0f,  -1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f  // bottom-right
 		};
 
 		glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
 	}
-	
+
 
 	if (shader_program != last_program) {
 		GLint posAttrib = glGetAttribLocation(shader_program, "VertexCoord");
 		if (posAttrib >= 0) {
-			glVertexAttribPointer(posAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void*)0);
+			glVertexAttribPointer(posAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void *)0);
 			glEnableVertexAttribArray(posAttrib);
 		}
 		GLint texAttrib = glGetAttribLocation(shader_program, "TexCoord");
 		if (texAttrib >= 0) {
-			glVertexAttribPointer(texAttrib,  4, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void*)(4 * sizeof(float)));
+			glVertexAttribPointer(texAttrib, 4, GL_FLOAT, GL_FALSE, 8 * sizeof(float), (void *)(4 * sizeof(float)));
 			glEnableVertexAttribArray(texAttrib);
 		}
 
-		if (shader->u_FrameDirection >= 0) glUniform1i(shader->u_FrameDirection, 1);
-		if (shader->u_FrameCount >= 0) glUniform1i(shader->u_FrameCount, frame_count);
-		if (shader->u_OutputSize >= 0) glUniform2f(shader->u_OutputSize, dst_width, dst_height);
-		if (shader->u_TextureSize >= 0) glUniform2f(shader->u_TextureSize, shader->texw, shader->texh); 
-		if (shader->OrigInputSize >= 0) glUniform2f(shader->OrigInputSize, shader->srcw, shader->srch); 
-		if (shader->u_InputSize >= 0) glUniform2f(shader->u_InputSize, shader->srcw, shader->srch); 
+		if (shader->u_FrameDirection >= 0)
+			glUniform1i(shader->u_FrameDirection, 1);
+		if (shader->u_FrameCount >= 0)
+			glUniform1i(shader->u_FrameCount, frame_count);
+		if (shader->u_OutputSize >= 0)
+			glUniform2f(shader->u_OutputSize, dst_width, dst_height);
+		if (shader->u_TextureSize >= 0)
+			glUniform2f(shader->u_TextureSize, shader->texw, shader->texh);
+		if (shader->OrigInputSize >= 0)
+			glUniform2f(shader->OrigInputSize, shader->srcw, shader->srch);
+		if (shader->u_InputSize >= 0)
+			glUniform2f(shader->u_InputSize, shader->srcw, shader->srch);
 		for (int i = 0; i < shader->num_pragmas; ++i) {
 			glUniform1f(shader->pragmas[i].uniformLocation, shader->pragmas[i].value);
 		}
 
 		GLint u_MVP = glGetUniformLocation(shader_program, "MVPMatrix");
 		if (u_MVP >= 0) {
-			float identity[16] = {
-				1,0,0,0,
-				0,1,0,0,
-				0,0,1,0,
-				0,0,0,1
-			};
+			float identity[16] = {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1};
 			glUniformMatrix4fv(u_MVP, 1, GL_FALSE, identity);
 		}
 		glBindVertexArray(static_VAO);
 	}
 	static GLuint lastfbo = -1;
 	if (target_texture) {
-		if (*target_texture==0 || shader->updated || reloadShaderTextures) { 
-			
+		if (*target_texture == 0 || shader->updated || reloadShaderTextures) {
 			// if(target_texture) {
 			// 	glDeleteTextures(1,target_texture);
 			// }
-			if(*target_texture==0)
+			if (*target_texture == 0)
 				glGenTextures(1, target_texture);
-			glActiveTexture(GL_TEXTURE0);	
+			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(GL_TEXTURE_2D, *target_texture);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter);
@@ -1719,23 +1760,23 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 		if (fbo == 0) {
 			glGenFramebuffers(1, &fbo);
 		}
-		
+
 		if (lastfbo == 0) {
 			glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-			
 		}
 		lastfbo = fbo;
 		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, *target_texture, 0);
-		
-    } else {
-		// things like overlays and stuff we don't need to write to another texture so they can be directly written to screen framebuffer
+
+	} else {
+		// things like overlays and stuff we don't need to write to another texture so they can be directly written to
+		// screen framebuffer
 		if (lastfbo != 0) {
-        	glBindFramebuffer(GL_FRAMEBUFFER, 0);
+			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		}
 		lastfbo = 0;
-    }
+	}
 
-	if(alpha==1) {
+	if (alpha == 1) {
 		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	} else {
@@ -1750,35 +1791,37 @@ void runShaderPass(GLuint src_texture, GLuint shader_program, GLuint* target_tex
 	}
 	glViewport(x, y, dst_width, dst_height);
 
-	
-	if (shader->texLocation >= 0) glUniform1i(shader->texLocation, 0);  
-	
+
+	if (shader->texLocation >= 0)
+		glUniform1i(shader->texLocation, 0);
+
 	if (shader->texelSizeLocation >= 0) {
 		glUniform2fv(shader->texelSizeLocation, 1, texelSize);
 		last_texelSize[0] = texelSize[0];
 		last_texelSize[1] = texelSize[1];
 	}
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	last_program = shader_program;
 }
 
 typedef struct {
-    SDL_Surface* loaded_effect;
-    SDL_Surface* loaded_overlay;
-    int effect_ready;
-    int overlay_ready;
+	SDL_Surface *loaded_effect;
+	SDL_Surface *loaded_overlay;
+	int effect_ready;
+	int overlay_ready;
 } FramePreparation;
 
 static FramePreparation frame_prep = {0};
 
-int prepareFrameThread(void *data) {
-    while (1) {
+int prepareFrameThread(void *data)
+{
+	while (1) {
 		updateEffect();
 
-        if (effectUpdated) {
-			LOG_info("effect updated %s\n",effect_path);
-			if(effect_path) {
-				SDL_Surface* tmp = IMG_Load(effect_path);
+		if (effectUpdated) {
+			LOG_info("effect updated %s\n", effect_path);
+			if (effect_path) {
+				SDL_Surface *tmp = IMG_Load(effect_path);
 				if (tmp) {
 					frame_prep.loaded_effect = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_RGBA32, 0);
 					SDL_FreeSurface(tmp);
@@ -1789,19 +1832,17 @@ int prepareFrameThread(void *data) {
 				frame_prep.loaded_effect = 0;
 			}
 			effectUpdated = 0;
-			frame_prep.effect_ready = 1; 
-        }
-		if(effect.type == EFFECT_NONE && frame_prep.loaded_effect !=0) {
+			frame_prep.effect_ready = 1;
+		}
+		if (effect.type == EFFECT_NONE && frame_prep.loaded_effect != 0) {
 			frame_prep.loaded_effect = 0;
 			frame_prep.effect_ready = 1;
-	
 		}
 
-        if (overlayUpdated) {
-
+		if (overlayUpdated) {
 			LOG_info("overlay updated\n");
-			if(overlay_path) {
-				SDL_Surface* tmp = IMG_Load(overlay_path);
+			if (overlay_path) {
+				SDL_Surface *tmp = IMG_Load(overlay_path);
 				if (tmp) {
 					frame_prep.loaded_overlay = SDL_ConvertSurfaceFormat(tmp, SDL_PIXELFORMAT_RGBA32, 0);
 					SDL_FreeSurface(tmp);
@@ -1812,57 +1853,60 @@ int prepareFrameThread(void *data) {
 				frame_prep.loaded_overlay = 0;
 			}
 			frame_prep.overlay_ready = 1;
-			overlayUpdated=0;
-        }
+			overlayUpdated = 0;
+		}
 
-        SDL_Delay(120); 
-    }
-    return 0;
+		SDL_Delay(120);
+	}
+	return 0;
 }
 
 static SDL_Thread *prepare_thread = NULL;
 
-void PLAT_GL_Swap() {
-
+void PLAT_GL_Swap()
+{
 	if (prepare_thread == NULL) {
-        prepare_thread = SDL_CreateThread(prepareFrameThread, "PrepareFrameThread", NULL);
+		prepare_thread = SDL_CreateThread(prepareFrameThread, "PrepareFrameThread", NULL);
 
-        if (prepare_thread == NULL) {
-            printf("Error creating background thread: %s\n", SDL_GetError());
-            return; 
-        }
-    }
+		if (prepare_thread == NULL) {
+			printf("Error creating background thread: %s\n", SDL_GetError());
+			return;
+		}
+	}
 
-    static int lastframecount = 0;
-    if (reloadShaderTextures) lastframecount = frame_count;
-    if (frame_count < lastframecount + 3)
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+	static int lastframecount = 0;
+	if (reloadShaderTextures)
+		lastframecount = frame_count;
+	if (frame_count < lastframecount + 3)
+		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-    SDL_Rect dst_rect = {0, 0, device_width, device_height};
-    setRectToAspectRatio(&dst_rect);
+	SDL_Rect dst_rect = {0, 0, device_width, device_height};
+	setRectToAspectRatio(&dst_rect);
 
-    if (!vid.blit->src) {
-        return;
-    }
+	if (!vid.blit->src) {
+		return;
+	}
 
 	SDL_GL_MakeCurrent(vid.window, vid.gl_context);
 
-    static GLuint effect_tex = 0;
-    static int effect_w = 0, effect_h = 0;
-    static GLuint overlay_tex = 0;
-    static int overlay_w = 0, overlay_h = 0;
-    static int overlayload = 0;
+	static GLuint effect_tex = 0;
+	static int effect_w = 0, effect_h = 0;
+	static GLuint overlay_tex = 0;
+	static int overlay_w = 0, overlay_h = 0;
+	static int overlayload = 0;
 
 
-	 if (frame_prep.effect_ready) {
-		if(frame_prep.loaded_effect) {
-			if(!effect_tex) glGenTextures(1, &effect_tex);
+	if (frame_prep.effect_ready) {
+		if (frame_prep.loaded_effect) {
+			if (!effect_tex)
+				glGenTextures(1, &effect_tex);
 			glBindTexture(GL_TEXTURE_2D, effect_tex);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_effect->w, frame_prep.loaded_effect->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_effect->pixels);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_effect->w, frame_prep.loaded_effect->h, 0,
+						 GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_effect->pixels);
 			effect_w = frame_prep.loaded_effect->w;
 			effect_h = frame_prep.loaded_effect->h;
 		} else {
@@ -1871,260 +1915,261 @@ void PLAT_GL_Swap() {
 			}
 			effect_tex = 0;
 		}
-        frame_prep.effect_ready = 0; 
-    }
+		frame_prep.effect_ready = 0;
+	}
 
-    if (frame_prep.overlay_ready) {
-		if(frame_prep.loaded_overlay) {
-			if(!overlay_tex) glGenTextures(1, &overlay_tex);
+	if (frame_prep.overlay_ready) {
+		if (frame_prep.loaded_overlay) {
+			if (!overlay_tex)
+				glGenTextures(1, &overlay_tex);
 			glBindTexture(GL_TEXTURE_2D, overlay_tex);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_overlay->w, frame_prep.loaded_overlay->h, 0, GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_overlay->pixels);
+			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, frame_prep.loaded_overlay->w, frame_prep.loaded_overlay->h, 0,
+						 GL_RGBA, GL_UNSIGNED_BYTE, frame_prep.loaded_overlay->pixels);
 			overlay_w = frame_prep.loaded_overlay->w;
 			overlay_h = frame_prep.loaded_overlay->h;
-		
+
 		} else {
 			if (overlay_tex) {
 				glDeleteTextures(1, &overlay_tex);
 			}
 			overlay_tex = 0;
 		}
-        frame_prep.overlay_ready = 0; 
-    }
-	
-    static GLuint src_texture = 0;
-    static int src_w_last = 0, src_h_last = 0;
-    static int last_w = 0, last_h = 0;
-
-    if (!src_texture || reloadShaderTextures) {
-        // if (src_texture) {
-        //     glDeleteTextures(1, &src_texture);
-        //     src_texture = 0;
-        // }
-		if (src_texture==0)
-        	glGenTextures(1, &src_texture);
-        glBindTexture(GL_TEXTURE_2D, src_texture);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-    }
-
-    glBindTexture(GL_TEXTURE_2D, src_texture);
-    if (vid.blit->src_w != src_w_last || vid.blit->src_h != src_h_last || reloadShaderTextures) {
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, vid.blit->src_w, vid.blit->src_h, 0, GL_RGBA, GL_UNSIGNED_BYTE, vid.blit->src);
-        src_w_last = vid.blit->src_w;
-        src_h_last = vid.blit->src_h;
-    } else {
-        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, vid.blit->src_w, vid.blit->src_h, GL_RGBA, GL_UNSIGNED_BYTE, vid.blit->src);
-    }
-
-    if (nrofshaders < 1) {
-        runShaderPass(src_texture, g_shader_default, NULL, dst_rect.x, dst_rect.y,
-            dst_rect.w, dst_rect.h,
-            &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = vid.blit->src_w, .texh = vid.blit->src_h},
-            0, GL_NONE);
-    }
-
-    last_w = vid.blit->src_w;
-    last_h = vid.blit->src_h;
-
-    for (int i = 0; i < nrofshaders; i++) {
-        int src_w = last_w;
-        int src_h = last_h;
-        int dst_w = src_w * shaders[i]->scale;
-        int dst_h = src_h * shaders[i]->scale;
-
-        if (shaders[i]->scale == 9) {
-            dst_w = dst_rect.w;
-            dst_h = dst_rect.h;
-        }
-
-        if (reloadShaderTextures) {
-            for (int j = i; j < nrofshaders; j++) {
-                int real_input_w = (i == 0) ? vid.blit->src_w : last_w;
-                int real_input_h = (i == 0) ? vid.blit->src_h : last_h;
-
-                shaders[i]->srcw = shaders[i]->srctype == 0 ? vid.blit->src_w : shaders[i]->srctype == 2 ? dst_rect.w : real_input_w;
-                shaders[i]->srch = shaders[i]->srctype == 0 ? vid.blit->src_h : shaders[i]->srctype == 2 ? dst_rect.h : real_input_h;
-                shaders[i]->texw = shaders[i]->scaletype == 0 ? vid.blit->src_w : shaders[i]->scaletype == 2 ? dst_rect.w : real_input_w;
-                shaders[i]->texh = shaders[i]->scaletype == 0 ? vid.blit->src_h : shaders[i]->scaletype == 2 ? dst_rect.h : real_input_h;
-            }
-        }
-
-        static int shaderinfocount = 0;
-        static int shaderinfoscreen = 0;
-        if (shaderinfocount > 600 && shaderinfoscreen == i) {
-            currentshaderpass = i + 1;
-            currentshadertexw = shaders[i]->texw;
-            currentshadertexh = shaders[i]->texh;
-            currentshadersrcw = shaders[i]->srcw;
-            currentshadersrch = shaders[i]->srch;
-            currentshaderdstw = dst_w;
-            currentshaderdsth = dst_h;
-            shaderinfocount = 0;
-            shaderinfoscreen++;
-            if (shaderinfoscreen >= nrofshaders)
-                shaderinfoscreen = 0;
-        }
-        shaderinfocount++;
-
-        if (shaders[i]->shader_p) {
-            runShaderPass(
-                (i == 0) ? src_texture : shaders[i - 1]->texture,
-                shaders[i]->shader_p,
-                &shaders[i]->texture,
-                0, 0, dst_w, dst_h,
-                shaders[i],
-                0,
-                (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter
-            );
-        } else {
-            runShaderPass(
-                (i == 0) ? src_texture : shaders[i - 1]->texture,
-                g_noshader,
-                &shaders[i]->texture,
-                0, 0, dst_w, dst_h,
-                shaders[i],
-                0,
-                (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter
-            );
-        }
-
-        last_w = dst_w;
-        last_h = dst_h;
-    }
-
-    if (nrofshaders > 0) {
-        runShaderPass(
-            shaders[nrofshaders - 1]->texture,
-            g_shader_default,
-            NULL,
-            dst_rect.x, dst_rect.y, dst_rect.w, dst_rect.h,
-            &(Shader){.srcw = last_w, .srch = last_h, .texw = last_w, .texh = last_h},
-            0, GL_NONE
-        );
-    }
-
-    if (effect_tex) {
-        runShaderPass(
-            effect_tex,
-            g_shader_overlay,
-            NULL,
-			dst_rect.x, dst_rect.y, effect_w, effect_h,
-            &(Shader){.srcw = effect_w, .srch = effect_h, .texw = effect_w, .texh = effect_h},
-            1, GL_NONE
-        );
-    }
-
-    if (overlay_tex) {
-        runShaderPass(
-            overlay_tex,
-            g_shader_overlay,
-            NULL,
-            0, 0, device_width, device_height,
-            &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = overlay_w, .texh = overlay_h},
-            1, GL_NONE
-        );
-    }
-
-    SDL_GL_SwapWindow(vid.window);
-    frame_count++;
-    reloadShaderTextures = 0;
-}
-
-
-
-// tryin to some arm neon optimization for first time for flipping image upside down, they sit in platform cause not all have neon extensions
-void PLAT_pixelFlipper(uint8_t* pixels, int width, int height) {
-    const int rowBytes = width * 4;
-    uint8_t* rowTop;
-    uint8_t* rowBottom;
-
-    for (int y = 0; y < height / 2; ++y) {
-        rowTop = pixels + y * rowBytes;
-        rowBottom = pixels + (height - 1 - y) * rowBytes;
-
-        int x = 0;
-        for (; x + 15 < rowBytes; x += 16) {
-            uint8x16_t top = vld1q_u8(rowTop + x);
-            uint8x16_t bottom = vld1q_u8(rowBottom + x);
-
-            vst1q_u8(rowTop + x, bottom);
-            vst1q_u8(rowBottom + x, top);
-        }
-        for (; x < rowBytes; ++x) {
-            uint8_t temp = rowTop[x];
-            rowTop[x] = rowBottom[x];
-            rowBottom[x] = temp;
-        }
-    }
-}
-
-unsigned char* PLAT_GL_screenCapture(int* outWidth, int* outHeight) {
-    glViewport(0, 0, device_width, device_height);
-    GLint viewport[4];
-    glGetIntegerv(GL_VIEWPORT, viewport);
-	
-    int width = viewport[2];
-    int height = viewport[3];
-
-    if (outWidth) *outWidth = width;
-    if (outHeight) *outHeight = height;
-
-    unsigned char* pixels = malloc(width * height * 4); // RGBA
-    if (!pixels) return NULL;
-
-    glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+		frame_prep.overlay_ready = 0;
+	}
+
+	static GLuint src_texture = 0;
+	static int src_w_last = 0, src_h_last = 0;
+	static int last_w = 0, last_h = 0;
+
+	if (!src_texture || reloadShaderTextures) {
+		// if (src_texture) {
+		//     glDeleteTextures(1, &src_texture);
+		//     src_texture = 0;
+		// }
+		if (src_texture == 0)
+			glGenTextures(1, &src_texture);
+		glBindTexture(GL_TEXTURE_2D, src_texture);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, nrofshaders > 0 ? shaders[0]->filter : finalScaleFilter);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	}
+
+	glBindTexture(GL_TEXTURE_2D, src_texture);
+	if (vid.blit->src_w != src_w_last || vid.blit->src_h != src_h_last || reloadShaderTextures) {
+		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, vid.blit->src_w, vid.blit->src_h, 0, GL_RGBA, GL_UNSIGNED_BYTE,
+					 vid.blit->src);
+		src_w_last = vid.blit->src_w;
+		src_h_last = vid.blit->src_h;
+	} else {
+		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, vid.blit->src_w, vid.blit->src_h, GL_RGBA, GL_UNSIGNED_BYTE,
+						vid.blit->src);
+	}
+
+	if (nrofshaders < 1) {
+		runShaderPass(
+			src_texture, g_shader_default, NULL, dst_rect.x, dst_rect.y, dst_rect.w, dst_rect.h,
+			&(Shader){
+				.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = vid.blit->src_w, .texh = vid.blit->src_h},
+			0, GL_NONE);
+	}
+
+	last_w = vid.blit->src_w;
+	last_h = vid.blit->src_h;
+
+	for (int i = 0; i < nrofshaders; i++) {
+		int src_w = last_w;
+		int src_h = last_h;
+		int dst_w = src_w * shaders[i]->scale;
+		int dst_h = src_h * shaders[i]->scale;
+
+		if (shaders[i]->scale == 9) {
+			dst_w = dst_rect.w;
+			dst_h = dst_rect.h;
+		}
+
+		if (reloadShaderTextures) {
+			for (int j = i; j < nrofshaders; j++) {
+				int real_input_w = (i == 0) ? vid.blit->src_w : last_w;
+				int real_input_h = (i == 0) ? vid.blit->src_h : last_h;
+
+				shaders[i]->srcw = shaders[i]->srctype == 0	  ? vid.blit->src_w
+								   : shaders[i]->srctype == 2 ? dst_rect.w
+															  : real_input_w;
+				shaders[i]->srch = shaders[i]->srctype == 0	  ? vid.blit->src_h
+								   : shaders[i]->srctype == 2 ? dst_rect.h
+															  : real_input_h;
+				shaders[i]->texw = shaders[i]->scaletype == 0	? vid.blit->src_w
+								   : shaders[i]->scaletype == 2 ? dst_rect.w
+																: real_input_w;
+				shaders[i]->texh = shaders[i]->scaletype == 0	? vid.blit->src_h
+								   : shaders[i]->scaletype == 2 ? dst_rect.h
+																: real_input_h;
+			}
+		}
+
+		static int shaderinfocount = 0;
+		static int shaderinfoscreen = 0;
+		if (shaderinfocount > 600 && shaderinfoscreen == i) {
+			currentshaderpass = i + 1;
+			currentshadertexw = shaders[i]->texw;
+			currentshadertexh = shaders[i]->texh;
+			currentshadersrcw = shaders[i]->srcw;
+			currentshadersrch = shaders[i]->srch;
+			currentshaderdstw = dst_w;
+			currentshaderdsth = dst_h;
+			shaderinfocount = 0;
+			shaderinfoscreen++;
+			if (shaderinfoscreen >= nrofshaders)
+				shaderinfoscreen = 0;
+		}
+		shaderinfocount++;
+
+		if (shaders[i]->shader_p) {
+			runShaderPass((i == 0) ? src_texture : shaders[i - 1]->texture, shaders[i]->shader_p, &shaders[i]->texture,
+						  0, 0, dst_w, dst_h, shaders[i], 0,
+						  (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter);
+		} else {
+			runShaderPass((i == 0) ? src_texture : shaders[i - 1]->texture, g_noshader, &shaders[i]->texture, 0, 0,
+						  dst_w, dst_h, shaders[i], 0,
+						  (i == nrofshaders - 1) ? finalScaleFilter : shaders[i + 1]->filter);
+		}
+
+		last_w = dst_w;
+		last_h = dst_h;
+	}
+
+	if (nrofshaders > 0) {
+		runShaderPass(shaders[nrofshaders - 1]->texture, g_shader_default, NULL, dst_rect.x, dst_rect.y, dst_rect.w,
+					  dst_rect.h, &(Shader){.srcw = last_w, .srch = last_h, .texw = last_w, .texh = last_h}, 0,
+					  GL_NONE);
+	}
+
+	if (effect_tex) {
+		runShaderPass(effect_tex, g_shader_overlay, NULL, dst_rect.x, dst_rect.y, effect_w, effect_h,
+					  &(Shader){.srcw = effect_w, .srch = effect_h, .texw = effect_w, .texh = effect_h}, 1, GL_NONE);
+	}
+
+	if (overlay_tex) {
+		runShaderPass(overlay_tex, g_shader_overlay, NULL, 0, 0, device_width, device_height,
+					  &(Shader){.srcw = vid.blit->src_w, .srch = vid.blit->src_h, .texw = overlay_w, .texh = overlay_h},
+					  1, GL_NONE);
+	}
+
+	SDL_GL_SwapWindow(vid.window);
+	frame_count++;
+	reloadShaderTextures = 0;
+}
+
+
+// tryin to some arm neon optimization for first time for flipping image upside down, they sit in platform cause not all
+// have neon extensions
+void PLAT_pixelFlipper(uint8_t *pixels, int width, int height)
+{
+	const int rowBytes = width * 4;
+	uint8_t *rowTop;
+	uint8_t *rowBottom;
+
+	for (int y = 0; y < height / 2; ++y) {
+		rowTop = pixels + y * rowBytes;
+		rowBottom = pixels + (height - 1 - y) * rowBytes;
+
+		int x = 0;
+		for (; x + 15 < rowBytes; x += 16) {
+			uint8x16_t top = vld1q_u8(rowTop + x);
+			uint8x16_t bottom = vld1q_u8(rowBottom + x);
+
+			vst1q_u8(rowTop + x, bottom);
+			vst1q_u8(rowBottom + x, top);
+		}
+		for (; x < rowBytes; ++x) {
+			uint8_t temp = rowTop[x];
+			rowTop[x] = rowBottom[x];
+			rowBottom[x] = temp;
+		}
+	}
+}
+
+unsigned char *PLAT_GL_screenCapture(int *outWidth, int *outHeight)
+{
+	glViewport(0, 0, device_width, device_height);
+	GLint viewport[4];
+	glGetIntegerv(GL_VIEWPORT, viewport);
+
+	int width = viewport[2];
+	int height = viewport[3];
+
+	if (outWidth)
+		*outWidth = width;
+	if (outHeight)
+		*outHeight = height;
+
+	unsigned char *pixels = malloc(width * height * 4); // RGBA
+	if (!pixels)
+		return NULL;
+
+	glReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
 
 	PLAT_pixelFlipper(pixels, width, height);
 
-    return pixels; // caller must free
+	return pixels; // caller must free
 }
 
 ///////////////////////////////
 
-// TODO: 
-#define OVERLAY_WIDTH PILL_SIZE // unscaled
+// TODO:
+#define OVERLAY_WIDTH PILL_SIZE	 // unscaled
 #define OVERLAY_HEIGHT PILL_SIZE // unscaled
 #define OVERLAY_BPP 4
 #define OVERLAY_DEPTH 16
-#define OVERLAY_PITCH (OVERLAY_WIDTH * OVERLAY_BPP) // unscaled
-#define OVERLAY_RGBA_MASK 0x00ff0000,0x0000ff00,0x000000ff,0xff000000 // ARGB
+#define OVERLAY_PITCH (OVERLAY_WIDTH * OVERLAY_BPP)						 // unscaled
+#define OVERLAY_RGBA_MASK 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 // ARGB
 static struct OVL_Context {
-	SDL_Surface* overlay;
+	SDL_Surface *overlay;
 } ovl;
 
-SDL_Surface* PLAT_initOverlay(void) {
-	ovl.overlay = SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(OVERLAY_WIDTH,OVERLAY_HEIGHT),OVERLAY_DEPTH,OVERLAY_RGBA_MASK);
+SDL_Surface *PLAT_initOverlay(void)
+{
+	ovl.overlay =
+		SDL_CreateRGBSurface(SDL_SWSURFACE, SCALE2(OVERLAY_WIDTH, OVERLAY_HEIGHT), OVERLAY_DEPTH, OVERLAY_RGBA_MASK);
 	return ovl.overlay;
 }
-void PLAT_quitOverlay(void) {
-	if (ovl.overlay) SDL_FreeSurface(ovl.overlay);
+void PLAT_quitOverlay(void)
+{
+	if (ovl.overlay)
+		SDL_FreeSurface(ovl.overlay);
 }
-void PLAT_enableOverlay(int enable) {
-
+void PLAT_enableOverlay(int enable)
+{
 }
 
 ///////////////////////////////
 
-void PLAT_getBatteryStatus(int* is_charging, int* charge) {
+void PLAT_getBatteryStatus(int *is_charging, int *charge)
+{
 	PLAT_getBatteryStatusFine(is_charging, charge);
 
 	// worry less about battery and more about the game you're playing
-	     if (*charge>80) *charge = 100;
-	else if (*charge>60) *charge =  80;
-	else if (*charge>40) *charge =  60;
-	else if (*charge>20) *charge =  40;
-	else if (*charge>10) *charge =  20;
-	else           		 *charge =  10;
+	if (*charge > 80)
+		*charge = 100;
+	else if (*charge > 60)
+		*charge = 80;
+	else if (*charge > 40)
+		*charge = 60;
+	else if (*charge > 20)
+		*charge = 40;
+	else if (*charge > 10)
+		*charge = 20;
+	else
+		*charge = 10;
 }
-void PLAT_getCPUTemp() {
-	currentcputemp = getInt("/sys/devices/virtual/thermal/thermal_zone0/temp")/1000;
-
+void PLAT_getCPUTemp()
+{
+	currentcputemp = getInt("/sys/devices/virtual/thermal/thermal_zone0/temp") / 1000;
 }
 
 static struct WIFI_connection connection = {
@@ -2152,41 +2197,42 @@ static bool bluetoothConnected = false;
 
 void PLAT_updateNetworkStatus()
 {
-	if(WIFI_enabled())
+	if (WIFI_enabled())
 		WIFI_connectionInfo(&connection);
 	else
 		connection_reset(&connection);
-	
-	if(BT_enabled()) {
+
+	if (BT_enabled()) {
 		bluetoothConnected = PLAT_bluetoothConnected();
-	}
-	else
+	} else
 		bluetoothConnected = false;
 }
 
 void PLAT_getBatteryStatusFine(int *is_charging, int *charge)
-{	
-	if(is_charging) {
+{
+	if (is_charging) {
 		int time_to_full = getInt("/sys/class/power_supply/axp2202-battery/time_to_full_now");
-		int charger_present = getInt("/sys/class/power_supply/axp2202-usb/online"); 
+		int charger_present = getInt("/sys/class/power_supply/axp2202-usb/online");
 		*is_charging = (charger_present == 1) && (time_to_full > 0);
 	}
-	if(charge) {
+	if (charge) {
 		*charge = getInt("/sys/class/power_supply/axp2202-battery/capacity");
 	}
 }
 
-void PLAT_enableBacklight(int enable) {
+void PLAT_enableBacklight(int enable)
+{
 	if (enable) {
-		if (is_brick) SetRawBrightness(8);
+		if (is_brick)
+			SetRawBrightness(8);
 		SetBrightness(GetBrightness());
-	}
-	else {
+	} else {
 		SetRawBrightness(0);
 	}
 }
 
-void PLAT_powerOff(int reboot) {
+void PLAT_powerOff(int reboot)
+{
 	if (CFG_getHaptics()) {
 		VIB_singlePulse(VIB_bootStrength, VIB_bootDuration_ms);
 	}
@@ -2201,7 +2247,7 @@ void PLAT_powerOff(int reboot) {
 	GFX_quit();
 
 	system("cat /dev/zero > /dev/fb0 2>/dev/null");
-	if(reboot > 0)
+	if (reboot > 0)
 		touch("/tmp/reboot");
 	else
 		touch("/tmp/poweroff");
@@ -2209,160 +2255,190 @@ void PLAT_powerOff(int reboot) {
 	exit(0);
 }
 
-int PLAT_supportsDeepSleep(void) { return 1; }
+int PLAT_supportsDeepSleep(void)
+{
+	return 1;
+}
 
 ///////////////////////////////
 
-double get_time_sec() {
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-    return ts.tv_sec + ts.tv_nsec / 1e9; // Convert to seconds
+double get_time_sec()
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
+	return ts.tv_sec + ts.tv_nsec / 1e9; // Convert to seconds
 }
-double get_process_cpu_time_sec() {
-	// this gives cpu time in nanoseconds needed to accurately calculate cpu usage in very short time frames. 
+double get_process_cpu_time_sec()
+{
+	// this gives cpu time in nanoseconds needed to accurately calculate cpu usage in very short time frames.
 	// unfortunately about 20ms between meassures seems the lowest i can go to get accurate results
-	// maybe in the future i will find and even more granual way to get cpu time, but might just be a limit of C or Linux alltogether
-    struct timespec ts;
-    clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts);
-    return ts.tv_sec + ts.tv_nsec / 1e9; // Convert to seconds
+	// maybe in the future i will find and even more granual way to get cpu time, but might just be a limit of C or
+	// Linux alltogether
+	struct timespec ts;
+	clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts);
+	return ts.tv_sec + ts.tv_nsec / 1e9; // Convert to seconds
 }
 
 static pthread_mutex_t currentcpuinfo;
-// a roling average for the display values of about 2 frames, otherwise they are unreadable jumping too fast up and down and stuff to read
-#define ROLLING_WINDOW 120  
+// a roling average for the display values of about 2 frames, otherwise they are unreadable jumping too fast up and down
+// and stuff to read
+#define ROLLING_WINDOW 120
 
 volatile int useAutoCpu = 1;
-void *PLAT_cpu_monitor(void *arg) {
-    struct timespec start_time, curr_time;
-    clock_gettime(CLOCK_MONOTONIC_RAW, &start_time);
-
-    long clock_ticks_per_sec = sysconf(_SC_CLK_TCK);
-
-    double prev_real_time = get_time_sec();
-    double prev_cpu_time = get_process_cpu_time_sec();
-
-	const int cpu_frequencies[] = {408,450,500,550,  600,650,700,750, 800,850,900,950, 1000,1050,1100,1150, 1200,1250,1300,1350, 1400,1450,1500,1550, 1600,1650,1700,1750, 1800,1850,1900,1950, 2000};
-    const int num_freqs = sizeof(cpu_frequencies) / sizeof(cpu_frequencies[0]);
-    int current_index = 5; 
+void *PLAT_cpu_monitor(void *arg)
+{
+	struct timespec start_time, curr_time;
+	clock_gettime(CLOCK_MONOTONIC_RAW, &start_time);
 
-    double cpu_usage_history[ROLLING_WINDOW] = {0};
-    double cpu_speed_history[ROLLING_WINDOW] = {0};
-    int history_index = 0;
-    int history_count = 0; 
+	long clock_ticks_per_sec = sysconf(_SC_CLK_TCK);
 
-    while (true) {
-        if (useAutoCpu) {
-            double curr_real_time = get_time_sec();
-            double curr_cpu_time = get_process_cpu_time_sec();
+	double prev_real_time = get_time_sec();
+	double prev_cpu_time = get_process_cpu_time_sec();
 
-            double elapsed_real_time = curr_real_time - prev_real_time;
-            double elapsed_cpu_time = curr_cpu_time - prev_cpu_time;
-            double cpu_usage = 0;
+	const int cpu_frequencies[] = {408,	 450,  500,	 550,  600,	 650,  700,	 750,  800,	 850,  900,
+								   950,	 1000, 1050, 1100, 1150, 1200, 1250, 1300, 1350, 1400, 1450,
+								   1500, 1550, 1600, 1650, 1700, 1750, 1800, 1850, 1900, 1950, 2000};
+	const int num_freqs = sizeof(cpu_frequencies) / sizeof(cpu_frequencies[0]);
+	int current_index = 5;
 
-            if (elapsed_real_time > 0) {
-                cpu_usage = (elapsed_cpu_time / elapsed_real_time) * 100.0;
-            }
+	double cpu_usage_history[ROLLING_WINDOW] = {0};
+	double cpu_speed_history[ROLLING_WINDOW] = {0};
+	int history_index = 0;
+	int history_count = 0;
 
-            pthread_mutex_lock(&currentcpuinfo);
+	while (true) {
+		if (useAutoCpu) {
+			double curr_real_time = get_time_sec();
+			double curr_cpu_time = get_process_cpu_time_sec();
 
-			// the goal here is is to keep cpu usage between 75% and 85% at the lowest possible speed so device stays cool and battery usage is at a minimum
-			// if usage falls out of this range it will either scale a step down or up 
-			// but if usage hits above 95% we need that max boost and we instant scale up to 2000mhz as long as needed
-			// all this happens very fast like 60 times per second, so i'm applying roling averages to display values, so debug screen is readable and gives a good estimate on whats happening cpu wise
-			// the roling averages are purely for displaying, the actual scaling is happening realtime each run. 
-            if (cpu_usage > 95) {
-                current_index = num_freqs - 1; // Instant power needed, cpu is above 95% Jump directly to max boost 2000MHz
-            }
-            else if (cpu_usage > 85 && current_index < num_freqs - 1) { // otherwise try to keep between 75 and 85 at lowest clock speed
-                current_index++; 
-            } 
-            else if (cpu_usage < 75 && current_index > 0) {
-                current_index--; 
-            }
+			double elapsed_real_time = curr_real_time - prev_real_time;
+			double elapsed_cpu_time = curr_cpu_time - prev_cpu_time;
+			double cpu_usage = 0;
 
-            PLAT_setCustomCPUSpeed(cpu_frequencies[current_index] * 1000);
+			if (elapsed_real_time > 0) {
+				cpu_usage = (elapsed_cpu_time / elapsed_real_time) * 100.0;
+			}
 
-            cpu_usage_history[history_index] = cpu_usage;
-            cpu_speed_history[history_index] = cpu_frequencies[current_index];
+			pthread_mutex_lock(&currentcpuinfo);
+
+			// the goal here is is to keep cpu usage between 75% and 85% at the lowest possible speed so device stays
+			// cool and battery usage is at a minimum if usage falls out of this range it will either scale a step down
+			// or up but if usage hits above 95% we need that max boost and we instant scale up to 2000mhz as long as
+			// needed all this happens very fast like 60 times per second, so i'm applying roling averages to display
+			// values, so debug screen is readable and gives a good estimate on whats happening cpu wise the roling
+			// averages are purely for displaying, the actual scaling is happening realtime each run.
+			if (cpu_usage > 95) {
+				current_index =
+					num_freqs - 1; // Instant power needed, cpu is above 95% Jump directly to max boost 2000MHz
+			} else if (cpu_usage > 85 &&
+					   current_index < num_freqs - 1) { // otherwise try to keep between 75 and 85 at lowest clock speed
+				current_index++;
+			} else if (cpu_usage < 75 && current_index > 0) {
+				current_index--;
+			}
 
-            history_index = (history_index + 1) % ROLLING_WINDOW;
-            if (history_count < ROLLING_WINDOW) {
-                history_count++; 
-            }
+			PLAT_setCustomCPUSpeed(cpu_frequencies[current_index] * 1000);
 
-            double sum_cpu_usage = 0, sum_cpu_speed = 0;
-            for (int i = 0; i < history_count; i++) {
-                sum_cpu_usage += cpu_usage_history[i];
-                sum_cpu_speed += cpu_speed_history[i];
-            }
+			cpu_usage_history[history_index] = cpu_usage;
+			cpu_speed_history[history_index] = cpu_frequencies[current_index];
 
-            currentcpuse = sum_cpu_usage / history_count;
-            currentcpuspeed = sum_cpu_speed / history_count;
+			history_index = (history_index + 1) % ROLLING_WINDOW;
+			if (history_count < ROLLING_WINDOW) {
+				history_count++;
+			}
 
-            pthread_mutex_unlock(&currentcpuinfo);
+			double sum_cpu_usage = 0, sum_cpu_speed = 0;
+			for (int i = 0; i < history_count; i++) {
+				sum_cpu_usage += cpu_usage_history[i];
+				sum_cpu_speed += cpu_speed_history[i];
+			}
 
-            prev_real_time = curr_real_time;
-            prev_cpu_time = curr_cpu_time;
-			// 20ms really seems lowest i can go, anything lower it becomes innacurate, maybe one day I will find another even more granual way to calculate usage accurately and lower this shit to 1ms haha, altough anything lower than 10ms causes cpu usage in itself so yeah
-			// Anyways screw it 20ms is pretty much on a frame by frame basis anyways, so will anything lower really make a difference specially if that introduces cpu usage by itself? 
-			// Who knows, maybe some CPU engineer will find my comment here one day and can explain, maybe this is looking for the limits of C and needs Assambler or whatever to call CPU instructions directly to go further, but all I know is PUSH and MOV, how did the orignal Roller Coaster Tycoon developer wrote a whole game like this anyways? Its insane..
-            usleep(20000);
-        } else {
-            // Just measure CPU usage without changing frequency
-            double curr_real_time = get_time_sec();
-            double curr_cpu_time = get_process_cpu_time_sec();
+			currentcpuse = sum_cpu_usage / history_count;
+			currentcpuspeed = sum_cpu_speed / history_count;
+
+			pthread_mutex_unlock(&currentcpuinfo);
+
+			prev_real_time = curr_real_time;
+			prev_cpu_time = curr_cpu_time;
+			// 20ms really seems lowest i can go, anything lower it becomes innacurate, maybe one day I will find
+			// another even more granual way to calculate usage accurately and lower this shit to 1ms haha, altough
+			// anything lower than 10ms causes cpu usage in itself so yeah Anyways screw it 20ms is pretty much on a
+			// frame by frame basis anyways, so will anything lower really make a difference specially if that
+			// introduces cpu usage by itself? Who knows, maybe some CPU engineer will find my comment here one day and
+			// can explain, maybe this is looking for the limits of C and needs Assambler or whatever to call CPU
+			// instructions directly to go further, but all I know is PUSH and MOV, how did the orignal Roller Coaster
+			// Tycoon developer wrote a whole game like this anyways? Its insane..
+			usleep(20000);
+		} else {
+			// Just measure CPU usage without changing frequency
+			double curr_real_time = get_time_sec();
+			double curr_cpu_time = get_process_cpu_time_sec();
 
-            double elapsed_real_time = curr_real_time - prev_real_time;
-            double elapsed_cpu_time = curr_cpu_time - prev_cpu_time;
+			double elapsed_real_time = curr_real_time - prev_real_time;
+			double elapsed_cpu_time = curr_cpu_time - prev_cpu_time;
 
-            if (elapsed_real_time > 0) {
-                double cpu_usage = (elapsed_cpu_time / elapsed_real_time) * 100.0;
+			if (elapsed_real_time > 0) {
+				double cpu_usage = (elapsed_cpu_time / elapsed_real_time) * 100.0;
 
-                pthread_mutex_lock(&currentcpuinfo);
+				pthread_mutex_lock(&currentcpuinfo);
 
-                cpu_usage_history[history_index] = cpu_usage;
+				cpu_usage_history[history_index] = cpu_usage;
 
-                history_index = (history_index + 1) % ROLLING_WINDOW;
-                if (history_count < ROLLING_WINDOW) {
-                    history_count++;
-                }
+				history_index = (history_index + 1) % ROLLING_WINDOW;
+				if (history_count < ROLLING_WINDOW) {
+					history_count++;
+				}
 
-                double sum_cpu_usage = 0;
-                for (int i = 0; i < history_count; i++) {
-                    sum_cpu_usage += cpu_usage_history[i];
-                }
+				double sum_cpu_usage = 0;
+				for (int i = 0; i < history_count; i++) {
+					sum_cpu_usage += cpu_usage_history[i];
+				}
 
-                currentcpuse = sum_cpu_usage / history_count;
+				currentcpuse = sum_cpu_usage / history_count;
 
-                pthread_mutex_unlock(&currentcpuinfo);
-            }
+				pthread_mutex_unlock(&currentcpuinfo);
+			}
 
-            prev_real_time = curr_real_time;
-            prev_cpu_time = curr_cpu_time;
-            usleep(100000); 
-        }
-    }
+			prev_real_time = curr_real_time;
+			prev_cpu_time = curr_cpu_time;
+			usleep(100000);
+		}
+	}
 }
 
 
 #define GOVERNOR_PATH "/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed"
-void PLAT_setCustomCPUSpeed(int speed) {
-    FILE *fp = fopen(GOVERNOR_PATH, "w");
-    if (fp == NULL) {
-        perror("Failed to open scaling_setspeed");
-        return;
-    }
+void PLAT_setCustomCPUSpeed(int speed)
+{
+	FILE *fp = fopen(GOVERNOR_PATH, "w");
+	if (fp == NULL) {
+		perror("Failed to open scaling_setspeed");
+		return;
+	}
 
-    fprintf(fp, "%d\n", speed);
-    fclose(fp);
+	fprintf(fp, "%d\n", speed);
+	fclose(fp);
 }
-void PLAT_setCPUSpeed(int speed) {
+void PLAT_setCPUSpeed(int speed)
+{
 	int freq = 0;
 	switch (speed) {
-		case CPU_SPEED_MENU: 		freq =  600000; currentcpuspeed = 600; break;
-		case CPU_SPEED_POWERSAVE:	freq = 1200000; currentcpuspeed = 1200; break;
-		case CPU_SPEED_NORMAL: 		freq = 1608000; currentcpuspeed = 1600; break;
-		case CPU_SPEED_PERFORMANCE: freq = 2000000; currentcpuspeed = 2000; break;
+	case CPU_SPEED_MENU:
+		freq = 600000;
+		currentcpuspeed = 600;
+		break;
+	case CPU_SPEED_POWERSAVE:
+		freq = 1200000;
+		currentcpuspeed = 1200;
+		break;
+	case CPU_SPEED_NORMAL:
+		freq = 1608000;
+		currentcpuspeed = 1600;
+		break;
+	case CPU_SPEED_PERFORMANCE:
+		freq = 2000000;
+		currentcpuspeed = 2000;
+		break;
 	}
 	putInt(GOVERNOR_PATH, freq);
 }
@@ -2373,39 +2449,42 @@ void PLAT_setCPUSpeed(int speed) {
 #define RUMBLE_PATH "/sys/class/gpio/gpio227/value"
 #define RUMBLE_VOLTAGE_PATH "/sys/class/motor/voltage"
 
-void PLAT_setRumble(int strength) {
+void PLAT_setRumble(int strength)
+{
 	int voltage = MAX_VOLTAGE;
 
-	if(strength > 0 && strength < MAX_STRENGTH) {
+	if (strength > 0 && strength < MAX_STRENGTH) {
 		voltage = MIN_VOLTAGE + (int)(strength * ((long long)(MAX_VOLTAGE - MIN_VOLTAGE) / MAX_STRENGTH));
 		putInt(RUMBLE_VOLTAGE_PATH, voltage);
-	}
-	else {
+	} else {
 		putInt(RUMBLE_VOLTAGE_PATH, MAX_VOLTAGE);
 	}
 
 	// enable rumble - removed the FN switch disabling haptics
-	// did not make sense 
+	// did not make sense
 	putInt(RUMBLE_PATH, (strength) ? 1 : 0);
 }
 
-int PLAT_pickSampleRate(int requested, int max) {
+int PLAT_pickSampleRate(int requested, int max)
+{
 	// bluetooth: allow limiting the maximum to improve compatibility
-	if(PLAT_bluetoothConnected())
+	if (PLAT_bluetoothConnected())
 		return MIN(requested, CFG_getBluetoothSamplingrateLimit());
 
 	return MIN(requested, max);
 }
 
-char* PLAT_getModel(void) {
-	char* model = getenv("TRIMUI_MODEL");
-	if (model) return model;
+char *PLAT_getModel(void)
+{
+	char *model = getenv("TRIMUI_MODEL");
+	if (model)
+		return model;
 	return "Trimui Smart Pro";
 }
 
-void PLAT_getOsVersionInfo(char* output_str, size_t max_len)
+void PLAT_getOsVersionInfo(char *output_str, size_t max_len)
 {
-	return getFile("/etc/version", output_str,max_len);
+	return getFile("/etc/version", output_str, max_len);
 }
 
 bool PLAT_btIsConnected(void)
@@ -2413,12 +2492,14 @@ bool PLAT_btIsConnected(void)
 	return bluetoothConnected;
 }
 
-int PLAT_isOnline(void) {
+int PLAT_isOnline(void)
+{
 	return (connection.valid && connection.ssid[0] != '\0');
 }
 
-ConnectionStrength PLAT_connectionStrength(void) {
-	if(!WIFI_enabled() || !connection.valid || connection.rssi == -1)
+ConnectionStrength PLAT_connectionStrength(void)
+{
+	if (!WIFI_enabled() || !connection.valid || connection.rssi == -1)
 		return SIGNAL_STRENGTH_OFF;
 	else if (connection.rssi == 0)
 		return SIGNAL_STRENGTH_DISCONNECTED;
@@ -2430,197 +2511,89 @@ ConnectionStrength PLAT_connectionStrength(void) {
 		return SIGNAL_STRENGTH_LOW;
 }
 
-void PLAT_initDefaultLeds() {
-	char* device = getenv("DEVICE");
+void PLAT_initDefaultLeds()
+{
+	char *device = getenv("DEVICE");
 	is_brick = exactMatch("brick", device);
-	if(is_brick) {
-	lightsDefault[0] = (LightSettings) {
-		"FN 1 key",
-		"f1",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-	lightsDefault[1] = (LightSettings) {
-		"FN 2 key",
-		"f2",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-	lightsDefault[2] = (LightSettings) {
-		"Topbar",
-		"m",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-	lightsDefault[3] = (LightSettings) {
-		"L/R triggers",
-		"lr",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-} else {
-	lightsDefault[0] = (LightSettings) {
-		"Joystick L",
-		"l",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-	lightsDefault[1] = (LightSettings) {
-		"Joystick R",
-		"r",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-	lightsDefault[2] = (LightSettings) {
-		"Logo",
-		"m",
-		4,
-		1000,
-		100,
-		0xFFFFFF,
-		0xFFFFFF,
-		0,
-		{},
-		1,
-		100,
-		0
-	};
-}
+	if (is_brick) {
+		lightsDefault[0] = (LightSettings){"FN 1 key", "f1", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+		lightsDefault[1] = (LightSettings){"FN 2 key", "f2", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+		lightsDefault[2] = (LightSettings){"Topbar", "m", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+		lightsDefault[3] = (LightSettings){"L/R triggers", "lr", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+	} else {
+		lightsDefault[0] = (LightSettings){"Joystick L", "l", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+		lightsDefault[1] = (LightSettings){"Joystick R", "r", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+		lightsDefault[2] = (LightSettings){"Logo", "m", 4, 1000, 100, 0xFFFFFF, 0xFFFFFF, 0, {}, 1, 100, 0};
+	}
 }
-void PLAT_initLeds(LightSettings *lights) 
+void PLAT_initLeds(LightSettings *lights)
 {
-	char* device = getenv("DEVICE");
+	char *device = getenv("DEVICE");
 	is_brick = exactMatch("brick", device);
 
 	PLAT_initDefaultLeds();
 	FILE *file;
-	if(is_brick) {
+	if (is_brick) {
 		file = PLAT_OpenSettings("ledsettings_brick.txt");
-	}
-	else {
+	} else {
 		file = PLAT_OpenSettings("ledsettings.txt");
 	}
 
-    if (file == NULL)
-    {
-        LOG_warn("Unable to open led settings file\n");
-    }
-	else {
+	if (file == NULL) {
+		LOG_warn("Unable to open led settings file\n");
+	} else {
 		char line[256];
 		int current_light = -1;
-		while (fgets(line, sizeof(line), file))
-		{
-			if (line[0] == '[')
-			{
+		while (fgets(line, sizeof(line), file)) {
+			if (line[0] == '[') {
 				// Section header
 				char light_name[255];
-				if (sscanf(line, "[%49[^]]]", light_name) == 1)
-				{
+				if (sscanf(line, "[%49[^]]]", light_name) == 1) {
 					current_light++;
-					if (current_light < MAX_LIGHTS)
-					{
+					if (current_light < MAX_LIGHTS) {
 						strncpy(lights[current_light].name, light_name, 255 - 1);
 						lights[current_light].name[255 - 1] = '\0'; // Ensure null-termination
-						lights[current_light].cycles = -1; // cycles (times animation loops) should basically always be -1 for unlimited unless specifically set
-					}
-					else
-					{
+						lights[current_light].cycles = -1; // cycles (times animation loops) should basically always be
+														   // -1 for unlimited unless specifically set
+					} else {
 						LOG_info("Maximum number of lights (%d) exceeded. Ignoring further sections.\n", MAX_LIGHTS);
 						current_light = -1; // Reset if max_lights exceeded
 					}
 				}
-			}
-			else if (current_light >= 0 && current_light < MAX_LIGHTS)
-			{
+			} else if (current_light >= 0 && current_light < MAX_LIGHTS) {
 				int temp_value;
 				uint32_t temp_color;
 				char filename[255];
 
-				if (sscanf(line, "filename=%s", &filename) == 1)
-				{
+				if (sscanf(line, "filename=%s", &filename) == 1) {
 					strncpy(lights[current_light].filename, filename, 255 - 1);
 					continue;
 				}
-				if (sscanf(line, "effect=%d", &temp_value) == 1)
-				{
+				if (sscanf(line, "effect=%d", &temp_value) == 1) {
 					lights[current_light].effect = temp_value;
 					continue;
 				}
-				if (sscanf(line, "color1=%x", &temp_color) == 1)
-				{
+				if (sscanf(line, "color1=%x", &temp_color) == 1) {
 					lights[current_light].color1 = temp_color;
 					continue;
 				}
-				if (sscanf(line, "color2=%x", &temp_color) == 1)
-				{
+				if (sscanf(line, "color2=%x", &temp_color) == 1) {
 					lights[current_light].color2 = temp_color;
 					continue;
 				}
-				if (sscanf(line, "speed=%d", &temp_value) == 1)
-				{
+				if (sscanf(line, "speed=%d", &temp_value) == 1) {
 					lights[current_light].speed = temp_value;
 					continue;
 				}
-				if (sscanf(line, "brightness=%d", &temp_value) == 1)
-				{
+				if (sscanf(line, "brightness=%d", &temp_value) == 1) {
 					lights[current_light].brightness = temp_value;
 					continue;
 				}
-				if (sscanf(line, "trigger=%d", &temp_value) == 1)
-				{
+				if (sscanf(line, "trigger=%d", &temp_value) == 1) {
 					lights[current_light].trigger = temp_value;
 					continue;
 				}
-				if (sscanf(line, "inbrightness=%d", &temp_value) == 1)
-				{
+				if (sscanf(line, "inbrightness=%d", &temp_value) == 1) {
 					lights[current_light].inbrightness = temp_value;
 					continue;
 				}
@@ -2632,19 +2605,19 @@ void PLAT_initLeds(LightSettings *lights)
 
 #define LED_PATH1 "/sys/class/led_anim/max_scale"
 #define LED_PATH2 "/sys/class/led_anim/max_scale_lr"
-#define LED_PATH3 "/sys/class/led_anim/max_scale_f1f2" 
+#define LED_PATH3 "/sys/class/led_anim/max_scale_f1f2"
 
 void PLAT_setLedInbrightness(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-	if(is_brick) {
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	if (is_brick) {
 		if (strcmp(led->filename, "m") == 0) {
 			snprintf(filepath, sizeof(filepath), LED_PATH1);
 		} else if (strcmp(led->filename, "f1") == 0) {
-			snprintf(filepath, sizeof(filepath),LED_PATH3);
-		} else  {
+			snprintf(filepath, sizeof(filepath), LED_PATH3);
+		} else {
 			snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/max_scale_%s", led->filename);
 		}
 	} else {
@@ -2653,8 +2626,7 @@ void PLAT_setLedInbrightness(LightSettings *led)
 	if (strcmp(led->filename, "f2") != 0) {
 		// do nothhing for f2
 		file = fopen(filepath, "w");
-		if (file != NULL)
-		{
+		if (file != NULL) {
 			fprintf(file, "%i\n", led->inbrightness);
 			fclose(file);
 		}
@@ -2662,15 +2634,15 @@ void PLAT_setLedInbrightness(LightSettings *led)
 }
 void PLAT_setLedBrightness(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-	if(is_brick) {
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	if (is_brick) {
 		if (strcmp(led->filename, "m") == 0) {
 			snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/max_scale");
 		} else if (strcmp(led->filename, "f1") == 0) {
 			snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/max_scale_f1f2");
-		} else  {
+		} else {
 			snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/max_scale_%s", led->filename);
 		}
 	} else {
@@ -2679,8 +2651,7 @@ void PLAT_setLedBrightness(LightSettings *led)
 	if (strcmp(led->filename, "f2") != 0) {
 		// do nothhing for f2
 		file = fopen(filepath, "w");
-		if (file != NULL)
-		{
+		if (file != NULL) {
 			fprintf(file, "%i\n", led->brightness);
 			fclose(file);
 		}
@@ -2688,60 +2659,59 @@ void PLAT_setLedBrightness(LightSettings *led)
 }
 void PLAT_setLedEffect(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-    snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_%s", led->filename);
-    file = fopen(filepath, "w");
-    if (file != NULL)
-    {
-        fprintf(file, "%i\n", led->effect);
-        fclose(file);
-    }
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_%s", led->filename);
+	file = fopen(filepath, "w");
+	if (file != NULL) {
+		fprintf(file, "%i\n", led->effect);
+		fclose(file);
+	}
 }
 void PLAT_setLedEffectCycles(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-    snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_cycles_%s", led->filename);
-    file = fopen(filepath, "w");
-    if (file != NULL)
-    {
-        fprintf(file, "%i\n", led->cycles);
-        fclose(file);
-    }
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_cycles_%s", led->filename);
+	file = fopen(filepath, "w");
+	if (file != NULL) {
+		fprintf(file, "%i\n", led->cycles);
+		fclose(file);
+	}
 }
 void PLAT_setLedEffectSpeed(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-    snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_duration_%s", led->filename);
-    file = fopen(filepath, "w");
-    if (file != NULL)
-    {
-        fprintf(file, "%i\n", led->speed);
-        fclose(file);
-    }
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_duration_%s", led->filename);
+	file = fopen(filepath, "w");
+	if (file != NULL) {
+		fprintf(file, "%i\n", led->speed);
+		fclose(file);
+	}
 }
 void PLAT_setLedColor(LightSettings *led)
 {
-    char filepath[256];
-    FILE *file;
-    // first set brightness
-    snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_rgb_hex_%s", led->filename);
-    file = fopen(filepath, "w");
-    if (file != NULL)
-    {
-        fprintf(file, "%06X\n", led->color1);
-        fclose(file);
-    }
+	char filepath[256];
+	FILE *file;
+	// first set brightness
+	snprintf(filepath, sizeof(filepath), "/sys/class/led_anim/effect_rgb_hex_%s", led->filename);
+	file = fopen(filepath, "w");
+	if (file != NULL) {
+		fprintf(file, "%06X\n", led->color1);
+		fclose(file);
+	}
 }
 
 //////////////////////////////////////////////
 
-bool PLAT_canTurbo(void) { return true; }
+bool PLAT_canTurbo(void)
+{
+	return true;
+}
 
 #define INPUTD_PATH "/tmp/trimui_inputd"
 
@@ -2751,29 +2721,23 @@ typedef struct TurboBtnPath {
 } TurboBtnPath;
 
 static TurboBtnPath turbo_mapping[] = {
-    {BTN_ID_A, INPUTD_PATH "/turbo_a"},
-    {BTN_ID_B, INPUTD_PATH "/turbo_b"},
-    {BTN_ID_X, INPUTD_PATH "/turbo_x"},
-    {BTN_ID_Y, INPUTD_PATH "/turbo_y"},
-    {BTN_ID_L1, INPUTD_PATH "/turbo_l"},
-    {BTN_ID_L2, INPUTD_PATH "/turbo_l2"},
-    {BTN_ID_R1, INPUTD_PATH "/turbo_r"},
-    {BTN_ID_R2, INPUTD_PATH "/turbo_r2"},
-	{0, NULL}
-};
+	{BTN_ID_A, INPUTD_PATH "/turbo_a"},	 {BTN_ID_B, INPUTD_PATH "/turbo_b"},   {BTN_ID_X, INPUTD_PATH "/turbo_x"},
+	{BTN_ID_Y, INPUTD_PATH "/turbo_y"},	 {BTN_ID_L1, INPUTD_PATH "/turbo_l"},  {BTN_ID_L2, INPUTD_PATH "/turbo_l2"},
+	{BTN_ID_R1, INPUTD_PATH "/turbo_r"}, {BTN_ID_R2, INPUTD_PATH "/turbo_r2"}, {0, NULL}};
 
-int toggle_file(const char *path) {
-    if (access(path, F_OK) == 0) {
-        unlink(path);
-        return 0;
-    } else {
-        int fd = open(path, O_CREAT | O_WRONLY, 0644);
-        if (fd >= 0) {
-            close(fd);
-            return 1;
-        }
-        return -1; // error
-    }
+int toggle_file(const char *path)
+{
+	if (access(path, F_OK) == 0) {
+		unlink(path);
+		return 0;
+	} else {
+		int fd = open(path, O_CREAT | O_WRONLY, 0644);
+		if (fd >= 0) {
+			close(fd);
+			return 1;
+		}
+		return -1; // error
+	}
 }
 
 int PLAT_toggleTurbo(int btn_id)
@@ -2793,7 +2757,8 @@ int PLAT_toggleTurbo(int btn_id)
 	return 0;
 }
 
-void PLAT_clearTurbo() {
+void PLAT_clearTurbo()
+{
 	for (int i = 0; turbo_mapping[i].path; i++) {
 		unlink(turbo_mapping[i].path);
 	}
@@ -2801,9 +2766,10 @@ void PLAT_clearTurbo() {
 
 //////////////////////////////////////////////
 
-int PLAT_setDateTime(int y, int m, int d, int h, int i, int s) {
+int PLAT_setDateTime(int y, int m, int d, int h, int i, int s)
+{
 	char cmd[512];
-	sprintf(cmd, "date -s '%d-%d-%d %d:%d:%d'; hwclock -u -w", y,m,d,h,i,s);
+	sprintf(cmd, "date -s '%d-%d-%d %d:%d:%d'; hwclock -u -w", y, m, d, h, i, s);
 	system(cmd);
 	return 0; // why does this return an int?
 }
@@ -2815,74 +2781,80 @@ int PLAT_setDateTime(int y, int m, int d, int h, int i, int s) {
 static char cached_timezones[MAX_TIMEZONES][MAX_TZ_LENGTH];
 static int cached_tz_count = -1;
 
-int compare_timezones(const void *a, const void *b) {
-    return strcmp((const char *)a, (const char *)b);
-}
-
-void PLAT_initTimezones() {
-    if (cached_tz_count != -1) { // Already initialized
-        return;
-    }
-    
-    FILE *file = fopen(ZONE_TAB_PATH, "r");
-    if (!file) {
-        LOG_info("Error opening file %s\n", ZONE_TAB_PATH);
-        return;
-    }
-    
-    char line[MAX_LINE_LENGTH];
-    cached_tz_count = 0;
-    
-    while (fgets(line, sizeof(line), file)) {
-        // Skip comment lines
-        if (line[0] == '#' || strlen(line) < 3) {
-            continue;
-        }
-        
-        char *token = strtok(line, "\t"); // Skip country code
-        if (!token) continue;
-        
-        token = strtok(NULL, "\t"); // Skip latitude/longitude
-        if (!token) continue;
-        
-        token = strtok(NULL, "\t\n"); // Extract timezone
-        if (!token) continue;
-        
-        // Check for duplicates before adding
-        int duplicate = 0;
-        for (int i = 0; i < cached_tz_count; i++) {
-            if (strcmp(cached_timezones[i], token) == 0) {
-                duplicate = 1;
-                break;
-            }
-        }
-        
-        if (!duplicate && cached_tz_count < MAX_TIMEZONES) {
-            strncpy(cached_timezones[cached_tz_count], token, MAX_TZ_LENGTH - 1);
-            cached_timezones[cached_tz_count][MAX_TZ_LENGTH - 1] = '\0'; // Ensure null-termination
-            cached_tz_count++;
-        }
-    }
-    
-    fclose(file);
-    
-    // Sort the list alphabetically
-    qsort(cached_timezones, cached_tz_count, MAX_TZ_LENGTH, compare_timezones);
-}
-
-void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count) {
-    if (cached_tz_count == -1) {
-        LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
-        *tz_count = 0;
-        return;
-    }
-    
-    memcpy(timezones, cached_timezones, sizeof(cached_timezones));
-    *tz_count = cached_tz_count;
-}
-
-char *PLAT_getCurrentTimezone() {
+int compare_timezones(const void *a, const void *b)
+{
+	return strcmp((const char *)a, (const char *)b);
+}
+
+void PLAT_initTimezones()
+{
+	if (cached_tz_count != -1) { // Already initialized
+		return;
+	}
+
+	FILE *file = fopen(ZONE_TAB_PATH, "r");
+	if (!file) {
+		LOG_info("Error opening file %s\n", ZONE_TAB_PATH);
+		return;
+	}
+
+	char line[MAX_LINE_LENGTH];
+	cached_tz_count = 0;
+
+	while (fgets(line, sizeof(line), file)) {
+		// Skip comment lines
+		if (line[0] == '#' || strlen(line) < 3) {
+			continue;
+		}
+
+		char *token = strtok(line, "\t"); // Skip country code
+		if (!token)
+			continue;
+
+		token = strtok(NULL, "\t"); // Skip latitude/longitude
+		if (!token)
+			continue;
+
+		token = strtok(NULL, "\t\n"); // Extract timezone
+		if (!token)
+			continue;
+
+		// Check for duplicates before adding
+		int duplicate = 0;
+		for (int i = 0; i < cached_tz_count; i++) {
+			if (strcmp(cached_timezones[i], token) == 0) {
+				duplicate = 1;
+				break;
+			}
+		}
+
+		if (!duplicate && cached_tz_count < MAX_TIMEZONES) {
+			strncpy(cached_timezones[cached_tz_count], token, MAX_TZ_LENGTH - 1);
+			cached_timezones[cached_tz_count][MAX_TZ_LENGTH - 1] = '\0'; // Ensure null-termination
+			cached_tz_count++;
+		}
+	}
+
+	fclose(file);
+
+	// Sort the list alphabetically
+	qsort(cached_timezones, cached_tz_count, MAX_TZ_LENGTH, compare_timezones);
+}
+
+void PLAT_getTimezones(char timezones[MAX_TIMEZONES][MAX_TZ_LENGTH], int *tz_count)
+{
+	if (cached_tz_count == -1) {
+		LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
+		*tz_count = 0;
+		return;
+	}
+
+	memcpy(timezones, cached_timezones, sizeof(cached_timezones));
+	*tz_count = cached_tz_count;
+}
 
+char *PLAT_getCurrentTimezone()
+{
 	char *output = (char *)malloc(256);
 	if (!output) {
 		return false;
@@ -2899,11 +2871,12 @@ char *PLAT_getCurrentTimezone() {
 	return output;
 }
 
-void PLAT_setCurrentTimezone(const char* tz) {
+void PLAT_setCurrentTimezone(const char *tz)
+{
 	if (cached_tz_count == -1) {
 		LOG_warn("Error: Timezones not initialized. Call PLAT_initTimezones first.\n");
-        return;
-    }
+		return;
+	}
 
 	// This makes it permanent
 	char *zonename = (char *)malloc(256);
@@ -2911,7 +2884,7 @@ void PLAT_setCurrentTimezone(const char* tz) {
 		return;
 	snprintf(zonename, 256, "uci set system.@system[0].zonename=\"%s\"", tz);
 	system(zonename);
-	//system("uci set system.@system[0].zonename=\"Europe/Berlin\"");
+	// system("uci set system.@system[0].zonename=\"Europe/Berlin\"");
 	system("uci del -q system.@system[0].timezone");
 	system("uci commit system");
 	free(zonename);
@@ -2935,7 +2908,8 @@ void PLAT_setCurrentTimezone(const char* tz) {
 	system("date -k");
 }
 
-bool PLAT_getNetworkTimeSync(void) {
+bool PLAT_getNetworkTimeSync(void)
+{
 	char *output = (char *)malloc(256);
 	if (!output) {
 		return false;
@@ -2952,8 +2926,10 @@ bool PLAT_getNetworkTimeSync(void) {
 	return result;
 }
 
-void PLAT_setNetworkTimeSync(bool on) {
-	// note: this is not the service residing at /etc/init.d/ntpd - that one has hardcoded time server URLs and does not interact with UCI.
+void PLAT_setNetworkTimeSync(bool on)
+{
+	// note: this is not the service residing at /etc/init.d/ntpd - that one has hardcoded time server URLs and does not
+	// interact with UCI.
 	if (on) {
 		// permanment
 		system("uci set system.ntp.enable=1");
@@ -2969,36 +2945,43 @@ void PLAT_setNetworkTimeSync(bool on) {
 
 /////////////////////////
 
-bool PLAT_supportSSH() { return true; }
+bool PLAT_supportSSH()
+{
+	return true;
+}
 
 /////////////////////////
 
-bool PLAT_hasWifi() { return true; }
+bool PLAT_hasWifi()
+{
+	return true;
+}
 
-#define wifilog(fmt, ...) \
-    LOG_note(PLAT_wifiDiagnosticsEnabled() ? LOG_INFO : LOG_DEBUG, fmt, ##__VA_ARGS__)
+#define wifilog(fmt, ...) LOG_note(PLAT_wifiDiagnosticsEnabled() ? LOG_INFO : LOG_DEBUG, fmt, ##__VA_ARGS__)
 
-void PLAT_wifiInit() {
+void PLAT_wifiInit()
+{
 	wifilog("Wifi init\n");
 	PLAT_wifiEnable(CFG_getWifi());
 }
 
-bool PLAT_wifiEnabled() {
+bool PLAT_wifiEnabled()
+{
 	return CFG_getWifi();
 }
 
 #include "wmg_debug.h"
 #include "wifid_cmd.h"
 
-void PLAT_wifiEnable(bool on) {
-	if (on)
-	{
+void PLAT_wifiEnable(bool on)
+{
+	if (on) {
 		wifilog("turning wifi on...\n");
 
-		// This shouldnt be needed, but we cant really rely on nobody else messing with this stuff. 
+		// This shouldnt be needed, but we cant really rely on nobody else messing with this stuff.
 		// Make sure supplicant is up and rfkill doesnt block.
 		system("rfkill.elf unblock wifi");
-		
+
 		int ret = system("pidof wpa_supplicant > /dev/null 2>&1");
 		if (ret != 0) {
 			system("/etc/init.d/wpa_supplicant enable");
@@ -3010,8 +2993,7 @@ void PLAT_wifiEnable(bool on) {
 
 		// Keep config in sync
 		CFG_setWifi(on);
-	}
-	else {
+	} else {
 		wifilog("turning wifi off...\n");
 
 		// Keep config in sync
@@ -3022,109 +3004,108 @@ void PLAT_wifiEnable(bool on) {
 		// Honestly, I'd rather not do this but it seems to keep the questionable wifi implementation
 		// on Trimui from randomly reconnecting automatically
 		system("rfkill.elf block wifi");
-		//system("/etc/init.d/wpa_supplicant stop&");
+		// system("/etc/init.d/wpa_supplicant stop&");
 	}
 }
 
 int PLAT_wifiScan(struct WIFI_network *networks, int max)
 {
-    if(!CFG_getWifi()) {
-        LOG_error("PLAT_wifiScan: wifi is currently disabled.\n");
-        return -1;
-    }
+	if (!CFG_getWifi()) {
+		LOG_error("PLAT_wifiScan: wifi is currently disabled.\n");
+		return -1;
+	}
 
-    char results[SCAN_MAX];
-    int ret = aw_wifid_get_scan_results(results, SCAN_MAX);
-    if (ret < 0) {
-        //LOG_error("PLAT_wifiScan: failed to get wifi scan results (%i).\n", ret);
-        return -1;
-    }
-    results[SCAN_MAX - 1] = '\0'; // ensure null termination
+	char results[SCAN_MAX];
+	int ret = aw_wifid_get_scan_results(results, SCAN_MAX);
+	if (ret < 0) {
+		// LOG_error("PLAT_wifiScan: failed to get wifi scan results (%i).\n", ret);
+		return -1;
+	}
+	results[SCAN_MAX - 1] = '\0'; // ensure null termination
 
 	// Results will be in this form:
 	//[INFO] bssid / frequency / signal level / flags / ssid
-	//04:b4:fe:32:f9:73	2462	-63	[WPA2-PSK-CCMP][WPS][ESS]	frynet
-	//04:b4:fe:32:e4:50	2437	-56	[WPA2-PSK-CCMP][WPS][ESS]	frynet
-
-    wifilog("%s\n", results);
-
-    const char *current = results;
-
-    // Skip header line
-    const char *next = strchr(current, '\n');
-    if (!next) {
-        LOG_warn("PLAT_wifiScan: no scan results lines found.\n");
-        return 0;
-    }
-    current = next + 1;
-
-    int count = 0;
-    char line[512];  // buffer for each line
-
-    while (current && *current && count < max) {
-        next = strchr(current, '\n');
-        size_t len = next ? (size_t)(next - current) : strlen(current);
-        if (len >= sizeof(line)) {
-            LOG_warn("PLAT_wifiScan: line too long, truncating.\n");
-            len = sizeof(line) - 1;
-        }
-
-        strncpy(line, current, len);
-        line[len] = '\0';
-
-        // Parse line with sscanf
-        char features[128];
-        struct WIFI_network *network = &networks[count];
-
-        // Initialize fields
-        network->bssid[0] = '\0';
-        network->ssid[0] = '\0';
-        network->freq = -1;
-        network->rssi = -1;
-        network->security = SECURITY_NONE;
-
-        int parsed = sscanf(line, "%17[0-9a-fA-F:]\t%d\t%d\t%127[^\t]\t%127[^\n]",
-                            network->bssid, &network->freq, &network->rssi,
-                            features, network->ssid);
-
-        if (parsed != 5) {
-            LOG_warn("PLAT_wifiScan: malformed line skipped (parsed %d fields): '%s'\n", parsed, line);
-            current = next ? next + 1 : NULL;
-            continue;
-        }
-
-        // Trim trailing whitespace from SSID (optional)
-        size_t ssid_len = strlen(network->ssid);
-        while (ssid_len > 0 && (network->ssid[ssid_len - 1] == ' ' || network->ssid[ssid_len - 1] == '\t')) {
-            network->ssid[ssid_len - 1] = '\0';
-            ssid_len--;
-        }
-
-        if (network->ssid[0] == '\0') {
-            LOG_warn("Ignoring network %s with empty SSID\n", network->bssid);
-            current = next ? next + 1 : NULL;
-            continue;
-        }
-
-        if (containsString(features, "WPA2-PSK"))
-            network->security = SECURITY_WPA2_PSK;
-        else if (containsString(features, "WPA-PSK"))
-            network->security = SECURITY_WPA_PSK;
-        else if (containsString(features, "WEP"))
-            network->security = SECURITY_WEP;
-        else if (containsString(features, "EAP"))
-            network->security = SECURITY_UNSUPPORTED;
-
-        count++;
-        current = next ? next + 1 : NULL;
-    }
-
-    return count;
+	// 04:b4:fe:32:f9:73	2462	-63	[WPA2-PSK-CCMP][WPS][ESS]	frynet
+	// 04:b4:fe:32:e4:50	2437	-56	[WPA2-PSK-CCMP][WPS][ESS]	frynet
+
+	wifilog("%s\n", results);
+
+	const char *current = results;
+
+	// Skip header line
+	const char *next = strchr(current, '\n');
+	if (!next) {
+		LOG_warn("PLAT_wifiScan: no scan results lines found.\n");
+		return 0;
+	}
+	current = next + 1;
+
+	int count = 0;
+	char line[512]; // buffer for each line
+
+	while (current && *current && count < max) {
+		next = strchr(current, '\n');
+		size_t len = next ? (size_t)(next - current) : strlen(current);
+		if (len >= sizeof(line)) {
+			LOG_warn("PLAT_wifiScan: line too long, truncating.\n");
+			len = sizeof(line) - 1;
+		}
+
+		strncpy(line, current, len);
+		line[len] = '\0';
+
+		// Parse line with sscanf
+		char features[128];
+		struct WIFI_network *network = &networks[count];
+
+		// Initialize fields
+		network->bssid[0] = '\0';
+		network->ssid[0] = '\0';
+		network->freq = -1;
+		network->rssi = -1;
+		network->security = SECURITY_NONE;
+
+		int parsed = sscanf(line, "%17[0-9a-fA-F:]\t%d\t%d\t%127[^\t]\t%127[^\n]", network->bssid, &network->freq,
+							&network->rssi, features, network->ssid);
+
+		if (parsed != 5) {
+			LOG_warn("PLAT_wifiScan: malformed line skipped (parsed %d fields): '%s'\n", parsed, line);
+			current = next ? next + 1 : NULL;
+			continue;
+		}
+
+		// Trim trailing whitespace from SSID (optional)
+		size_t ssid_len = strlen(network->ssid);
+		while (ssid_len > 0 && (network->ssid[ssid_len - 1] == ' ' || network->ssid[ssid_len - 1] == '\t')) {
+			network->ssid[ssid_len - 1] = '\0';
+			ssid_len--;
+		}
+
+		if (network->ssid[0] == '\0') {
+			LOG_warn("Ignoring network %s with empty SSID\n", network->bssid);
+			current = next ? next + 1 : NULL;
+			continue;
+		}
+
+		if (containsString(features, "WPA2-PSK"))
+			network->security = SECURITY_WPA2_PSK;
+		else if (containsString(features, "WPA-PSK"))
+			network->security = SECURITY_WPA_PSK;
+		else if (containsString(features, "WEP"))
+			network->security = SECURITY_WEP;
+		else if (containsString(features, "EAP"))
+			network->security = SECURITY_UNSUPPORTED;
+
+		count++;
+		current = next ? next + 1 : NULL;
+	}
+
+	return count;
 }
 
 bool PLAT_wifiConnected()
 {
-	if(!CFG_getWifi()) {
+	if (!CFG_getWifi()) {
 		wifilog("PLAT_wifiConnected: wifi is currently disabled.\n");
 		return false;
 	}
@@ -3134,7 +3115,7 @@ bool PLAT_wifiConnected()
 		.ssid = {'\0'},
 	};
 	int ret = aw_wifid_get_status(&status);
-	if(ret < 0) {
+	if (ret < 0) {
 		LOG_error("PLAT_wifiConnected: failed to get wifi status (%i).\n", ret);
 		return false;
 	}
@@ -3146,7 +3127,7 @@ bool PLAT_wifiConnected()
 
 int PLAT_wifiConnection(struct WIFI_connection *connection_info)
 {
-	if(!CFG_getWifi()) {
+	if (!CFG_getWifi()) {
 		wifilog("PLAT_wifiConnection: wifi is currently disabled.\n");
 		connection_reset(connection_info);
 		return -1;
@@ -3157,34 +3138,32 @@ int PLAT_wifiConnection(struct WIFI_connection *connection_info)
 		.ssid = {'\0'},
 	};
 	int ret = aw_wifid_get_status(&status);
-	if(ret < 0) {
+	if (ret < 0) {
 		LOG_error("PLAT_wifiConnection: failed to get wifi status (%i).\n", ret);
 		connection_reset(connection_info);
 		return -1;
 	}
 
-	if(status.state == NETWORK_CONNECTED) {
+	if (status.state == NETWORK_CONNECTED) {
 		connection_status conn;
-		if(aw_wifid_get_connection(&conn) >= 0) {
+		if (aw_wifid_get_connection(&conn) >= 0) {
 			connection_info->valid = true;
 			connection_info->freq = conn.freq;
 			connection_info->link_speed = conn.link_speed;
 			connection_info->noise = conn.noise;
 			connection_info->rssi = conn.rssi;
 			strcpy(connection_info->ip, conn.ip_address);
-			//strcpy(connection_info->ssid, conn.ssid);
-			
+			// strcpy(connection_info->ssid, conn.ssid);
+
 			// aw_wifid_get_connection returns garbage SSID sometimes
 			strcpy(connection_info->ssid, status.ssid);
-		}
-		else {
+		} else {
 			connection_reset(connection_info);
 			LOG_error("Failed to get Wifi connection info\n");
 		}
 		wifilog("Connected AP: %s\n", connection_info->ssid);
 		wifilog("IP address: %s\n", connection_info->ip);
-	}
-	else {
+	} else {
 		connection_reset(connection_info);
 		wifilog("PLAT_wifiConnection: Not connected\n", connection_info->ssid);
 	}
@@ -3194,102 +3173,100 @@ int PLAT_wifiConnection(struct WIFI_connection *connection_info)
 
 bool PLAT_wifiHasCredentials(char *ssid, WifiSecurityType sec)
 {
-    // Validate input SSID (reject tabs/newlines)
-    for (int i = 0; ssid[i]; ++i) {
-        if (ssid[i] == '\t' || ssid[i] == '\n') {
-            LOG_warn("PLAT_wifiHasCredentials: SSID contains invalid control characters.\n");
-            return false;
-        }
-    }
-
-    if (!CFG_getWifi()) {
-        LOG_error("PLAT_wifiHasCredentials: wifi is currently disabled.\n");
-        return false;
-    }
-
-    char list_net_results[LIST_NETWORK_MAX];
-    int ret = aw_wifid_list_networks(list_net_results, LIST_NETWORK_MAX);
-    if (ret < 0) {
-        wifilog("PLAT_wifiHasCredentials: failed to get wifi network list (%i).\n", ret);
-        return false;
-    }
-	else if (ret == 0)
-	{
+	// Validate input SSID (reject tabs/newlines)
+	for (int i = 0; ssid[i]; ++i) {
+		if (ssid[i] == '\t' || ssid[i] == '\n') {
+			LOG_warn("PLAT_wifiHasCredentials: SSID contains invalid control characters.\n");
+			return false;
+		}
+	}
+
+	if (!CFG_getWifi()) {
+		LOG_error("PLAT_wifiHasCredentials: wifi is currently disabled.\n");
+		return false;
+	}
+
+	char list_net_results[LIST_NETWORK_MAX];
+	int ret = aw_wifid_list_networks(list_net_results, LIST_NETWORK_MAX);
+	if (ret < 0) {
+		wifilog("PLAT_wifiHasCredentials: failed to get wifi network list (%i).\n", ret);
+		return false;
+	} else if (ret == 0) {
 		LOG_warn("PLAT_wifiHasCredentials: wpa_supplicant.conf has no entries.\n");
 		return false;
-	}	
-
-    // Ensure null termination just in case aw_wifid_list_networks doesn't guarantee it
-    list_net_results[LIST_NETWORK_MAX - 1] = '\0';
-
-    wifilog("LIST:\n%s\n", list_net_results);
-
-    const char *current = list_net_results;
-
-    // Skip header line
-    const char *next = strchr(current, '\n');
-    if (!next) {
-        LOG_warn("PLAT_wifiHasCredentials: network list has no data lines.\n");
-        return false;
-    }
-    current = next + 1;
-
-    char line[256];
-
-    while (current && *current) {
-        next = strchr(current, '\n');
-        size_t len = next ? (size_t)(next - current) : strlen(current);
-        if (len >= sizeof(line)) {
-            LOG_warn("PLAT_wifiHasCredentials: line too long, truncating.\n");
-            len = sizeof(line) - 1;
-        }
-
-        // Copy line safely and null-terminate
-        strncpy(line, current, len);
-        line[len] = '\0';
-
-        wifilog("Parsing line: '%s'\n", line);
-
-        // Tokenize line by tabs
-        char *saveptr = NULL;
-        char *token_id    = strtok_r(line, "\t", &saveptr);
-        char *token_ssid  = strtok_r(NULL, "\t", &saveptr);
-        char *token_bssid = strtok_r(NULL, "\t", &saveptr);
-        char *token_flags = strtok_r(NULL, "\t", &saveptr);
-        char *extra       = strtok_r(NULL, "\t", &saveptr);
-
-        // Check mandatory fields: id, ssid, bssid must be present
-        if (!(token_id && token_ssid && token_bssid)) {
-            LOG_warn("PLAT_wifiHasCredentials: Malformed line skipped (missing required fields): '%s'\n", line);
-            current = next ? next + 1 : NULL;
-            continue;
-        }
-        // token_flags may be NULL (no flags)
-        // extra must be NULL (no extra tokens)
-        if (extra != NULL) {
-            LOG_warn("PLAT_wifiHasCredentials: Malformed line skipped (too many fields): '%s'\n", line);
-            current = next ? next + 1 : NULL;
-            continue;
-        }
-
-        if (strcmp(token_ssid, ssid) == 0) {
-            return true;
-        }
-
-        current = next ? next + 1 : NULL;
-    }
-
-    return false;
+	}
+
+	// Ensure null termination just in case aw_wifid_list_networks doesn't guarantee it
+	list_net_results[LIST_NETWORK_MAX - 1] = '\0';
+
+	wifilog("LIST:\n%s\n", list_net_results);
+
+	const char *current = list_net_results;
+
+	// Skip header line
+	const char *next = strchr(current, '\n');
+	if (!next) {
+		LOG_warn("PLAT_wifiHasCredentials: network list has no data lines.\n");
+		return false;
+	}
+	current = next + 1;
+
+	char line[256];
+
+	while (current && *current) {
+		next = strchr(current, '\n');
+		size_t len = next ? (size_t)(next - current) : strlen(current);
+		if (len >= sizeof(line)) {
+			LOG_warn("PLAT_wifiHasCredentials: line too long, truncating.\n");
+			len = sizeof(line) - 1;
+		}
+
+		// Copy line safely and null-terminate
+		strncpy(line, current, len);
+		line[len] = '\0';
+
+		wifilog("Parsing line: '%s'\n", line);
+
+		// Tokenize line by tabs
+		char *saveptr = NULL;
+		char *token_id = strtok_r(line, "\t", &saveptr);
+		char *token_ssid = strtok_r(NULL, "\t", &saveptr);
+		char *token_bssid = strtok_r(NULL, "\t", &saveptr);
+		char *token_flags = strtok_r(NULL, "\t", &saveptr);
+		char *extra = strtok_r(NULL, "\t", &saveptr);
+
+		// Check mandatory fields: id, ssid, bssid must be present
+		if (!(token_id && token_ssid && token_bssid)) {
+			LOG_warn("PLAT_wifiHasCredentials: Malformed line skipped (missing required fields): '%s'\n", line);
+			current = next ? next + 1 : NULL;
+			continue;
+		}
+		// token_flags may be NULL (no flags)
+		// extra must be NULL (no extra tokens)
+		if (extra != NULL) {
+			LOG_warn("PLAT_wifiHasCredentials: Malformed line skipped (too many fields): '%s'\n", line);
+			current = next ? next + 1 : NULL;
+			continue;
+		}
+
+		if (strcmp(token_ssid, ssid) == 0) {
+			return true;
+		}
+
+		current = next ? next + 1 : NULL;
+	}
+
+	return false;
 }
 
 void PLAT_wifiForget(char *ssid, WifiSecurityType sec)
 {
-	if(!CFG_getWifi()) {
+	if (!CFG_getWifi()) {
 		LOG_error("PLAT_wifiForget: wifi is currently disabled.\n");
 		return;
 	}
 
-	aw_wifid_remove_networks(ssid,strlen(ssid));
+	aw_wifid_remove_networks(ssid, strlen(ssid));
 }
 
 void PLAT_wifiConnect(char *ssid, WifiSecurityType sec)
@@ -3297,23 +3274,23 @@ void PLAT_wifiConnect(char *ssid, WifiSecurityType sec)
 	PLAT_wifiConnectPass(ssid, sec, NULL);
 }
 
-void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char* pass)
+void PLAT_wifiConnectPass(const char *ssid, WifiSecurityType sec, const char *pass)
 {
-	if(!CFG_getWifi()) {
+	if (!CFG_getWifi()) {
 		wifilog("PLAT_wifiConnectPass: wifi is currently disabled.\n");
 		return;
 	}
 
 	wifilog("Attempting to connect to SSID %s with password\n", ssid);
-	
+
 	enum cn_event event = DA_UNKNOWN;
-	int ret = aw_wifid_connect_ap(ssid,pass,&event);
-	if(ret < 0) {
+	int ret = aw_wifid_connect_ap(ssid, pass, &event);
+	if (ret < 0) {
 		LOG_error("PLAT_wifiConnectPass: failed to connect to wifi (%i, %i).\n", ret, event);
 		return;
 	}
 
-	if(event == DA_CONNECTED)
+	if (event == DA_CONNECTED)
 		wifilog("PLAT_wifiConnectPass: connected ap successfully\n");
 	else
 		wifilog("PLAT_wifiConnectPass: connecting ap failed:%s\n", connect_event_txt(event));
@@ -3324,12 +3301,12 @@ void PLAT_wifiDisconnect()
 	PLAT_wifiConnectPass(NULL, SECURITY_WPA2_PSK, NULL);
 }
 
-bool PLAT_wifiDiagnosticsEnabled() 
+bool PLAT_wifiDiagnosticsEnabled()
 {
 	return CFG_getWifiDiagnostics();
 }
 
-void PLAT_wifiDiagnosticsEnable(bool on) 
+void PLAT_wifiDiagnosticsEnable(bool on)
 {
 	wmg_set_debug_level(on ? 4 : 2);
 	CFG_setWifiDiagnostics(on);
@@ -3337,8 +3314,14 @@ void PLAT_wifiDiagnosticsEnable(bool on)
 
 /////////////////////////
 
-bool PLAT_hasBluetooth() { return true; }
-bool PLAT_bluetoothEnabled() { return CFG_getBluetooth(); }
+bool PLAT_hasBluetooth()
+{
+	return true;
+}
+bool PLAT_bluetoothEnabled()
+{
+	return CFG_getBluetooth();
+}
 
 #include "bt_dev_list.h"
 #include "bt_log.h"
@@ -3352,14 +3335,13 @@ dev_list_t *discovered_audiodev = NULL;
 
 static bool auto_connect = true;
 
-#define btlog(fmt, ...) \
-    LOG_note(PLAT_bluetoothDiagnosticsEnabled() ? LOG_INFO : LOG_DEBUG, fmt, ##__VA_ARGS__)
+#define btlog(fmt, ...) LOG_note(PLAT_bluetoothDiagnosticsEnabled() ? LOG_INFO : LOG_DEBUG, fmt, ##__VA_ARGS__)
 
 // Utility: Parse BT device class
 
-#define COD_MAJOR_MASK     0x1F00
-#define COD_MINOR_MASK     0x00FC
-#define COD_SERVICE_MASK   0xFFE000
+#define COD_MAJOR_MASK 0x1F00
+#define COD_MINOR_MASK 0x00FC
+#define COD_SERVICE_MASK 0xFFE000
 
 #define GET_MAJOR_CLASS(cod) ((cod & COD_MAJOR_MASK) >> 8)
 #define GET_MINOR_CLASS(cod) ((cod & COD_MINOR_MASK) >> 2)
@@ -3390,7 +3372,7 @@ static void bt_test_status_cb(btmg_state_t status)
 		btlog("BT is off\n");
 	} else if (status == BTMG_STATE_ON) {
 		btlog("BT is ON\n");
-		if(is_background)
+		if (is_background)
 			bt_manager_gap_set_io_capability(BTMG_IO_CAP_NOINPUTNOOUTPUT);
 		else
 			bt_manager_gap_set_io_capability(BTMG_IO_CAP_KEYBOARDDISPLAY);
@@ -3417,13 +3399,13 @@ static void bt_test_discovery_status_cb(btmg_discovery_state_t status)
 
 static void bt_test_gap_connected_changed_cb(btmg_bt_device_t *device)
 {
-	LOG_info("address:%s,name:%s,class:%d,icon:%s,address type:%s,rssi:%d,state:%s\n",device->remote_address,
-			device->remote_name, device->r_class, device->icon, device->address_type, device->rssi, device->connected ? "CONNECTED":"DISCONNECTED");
+	LOG_info("address:%s,name:%s,class:%d,icon:%s,address type:%s,rssi:%d,state:%s\n", device->remote_address,
+			 device->remote_name, device->r_class, device->icon, device->address_type, device->rssi,
+			 device->connected ? "CONNECTED" : "DISCONNECTED");
 	// TODO: check for device class and call SDL_OpenJoystick if its a gamepad/HID device
-	if(device->connected == false) {
+	if (device->connected == false) {
 		bt_manager_set_discovery_mode(BTMG_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
-	}
-	else {
+	} else {
 		// not sure why this isnt handled over btmgr interface, but we need it
 		char act[256];
 		sprintf(act, "bluetoothctl trust %s", device->remote_address);
@@ -3433,18 +3415,18 @@ static void bt_test_gap_connected_changed_cb(btmg_bt_device_t *device)
 
 static void bt_test_dev_add_cb(btmg_bt_device_t *device)
 {
-	btlog("address:%s,name:%s,class:%d,icon:%s,address type:%s,rssi:%d\n", device->remote_address,
-			device->remote_name, device->r_class, device->icon, device->address_type, device->rssi);
+	btlog("address:%s,name:%s,class:%d,icon:%s,address type:%s,rssi:%d\n", device->remote_address, device->remote_name,
+		  device->r_class, device->icon, device->address_type, device->rssi);
 
-	//print_bt_class(device->r_class);
+	// print_bt_class(device->r_class);
 
 	{
 		if (GET_MAJOR_CLASS(device->r_class) == 0x04) { // Audio/Video
-			if(!btmg_dev_list_find_device(discovered_audiodev, device->remote_address))
+			if (!btmg_dev_list_find_device(discovered_audiodev, device->remote_address))
 				btmg_dev_list_add_device(discovered_audiodev, device->remote_name, device->remote_address);
 		}
 		if (GET_MAJOR_CLASS(device->r_class) == 0x05) { // Peripheral
-			if(!btmg_dev_list_find_device(discovered_controllers, device->remote_address))
+			if (!btmg_dev_list_find_device(discovered_controllers, device->remote_address))
 				btmg_dev_list_add_device(discovered_controllers, device->remote_name, device->remote_address);
 		}
 	}
@@ -3452,8 +3434,8 @@ static void bt_test_dev_add_cb(btmg_bt_device_t *device)
 
 static void bt_test_dev_remove_cb(btmg_bt_device_t *device)
 {
-	btlog("address:%s,name:%s,class:%d,address type:%s\n", device->remote_address,
-			device->remote_name, device->r_class,device->address_type);
+	btlog("address:%s,name:%s,class:%d,address type:%s\n", device->remote_address, device->remote_name, device->r_class,
+		  device->address_type);
 
 	{
 		btmg_dev_list_remove_device(discovered_audiodev, device->remote_address);
@@ -3463,21 +3445,21 @@ static void bt_test_dev_remove_cb(btmg_bt_device_t *device)
 
 static void bt_test_update_rssi_cb(const char *address, int rssi)
 {
-	//dev_node_t *dev_node = NULL;
+	// dev_node_t *dev_node = NULL;
 
-	//pthread_mutex_lock(&discovered_devices_mtx);
-	//dev_node = btmg_dev_list_find_device(discovered_devices, address);
-	//if (dev_node) {
-		// too spammy
-		//LOG_info("address:%s,name:%s,rssi:%d\n", dev_node->dev_addr, dev_node->dev_name, rssi);
+	// pthread_mutex_lock(&discovered_devices_mtx);
+	// dev_node = btmg_dev_list_find_device(discovered_devices, address);
+	// if (dev_node) {
+	//  too spammy
+	// LOG_info("address:%s,name:%s,rssi:%d\n", dev_node->dev_addr, dev_node->dev_name, rssi);
 	//}
-	//pthread_mutex_unlock(&discovered_devices_mtx);
+	// pthread_mutex_unlock(&discovered_devices_mtx);
 }
 
-static void bt_test_bond_state_cb(btmg_bond_state_t state,const  char *bd_addr,const char *name)
+static void bt_test_bond_state_cb(btmg_bond_state_t state, const char *bd_addr, const char *name)
 {
 	btlog("bonded device state:%d, addr:%s, name:%s\n", state, bd_addr, name);
-	
+
 	{
 		dev_node_t *dev_bonded_node = NULL;
 		dev_bonded_node = btmg_dev_list_find_device(bonded_devices, bd_addr);
@@ -3487,11 +3469,11 @@ static void bt_test_bond_state_cb(btmg_bond_state_t state,const  char *bd_addr,c
 				btmg_dev_list_add_device(bonded_devices, name, bd_addr);
 			}
 
-			if(btmg_dev_list_find_device(discovered_audiodev, bd_addr)) {
+			if (btmg_dev_list_find_device(discovered_audiodev, bd_addr)) {
 				btmg_dev_list_remove_device(discovered_audiodev, bd_addr);
 			}
 
-			if(btmg_dev_list_find_device(discovered_controllers, bd_addr)) {
+			if (btmg_dev_list_find_device(discovered_controllers, bd_addr)) {
 				btmg_dev_list_remove_device(discovered_controllers, bd_addr);
 			}
 
@@ -3507,85 +3489,82 @@ static void bt_test_bond_state_cb(btmg_bond_state_t state,const  char *bd_addr,c
 	}
 }
 #define BUFFER_SIZE 17
-static void bt_test_pair_ask(const char *prompt,char *buffer)
+static void bt_test_pair_ask(const char *prompt, char *buffer)
 {
 	btlog("%s", prompt);
-	if (fgets(buffer, BUFFER_SIZE, stdin)  == NULL)
+	if (fgets(buffer, BUFFER_SIZE, stdin) == NULL)
 		btlog("cmd fgets error\n");
 }
 
-void bt_test_gap_request_pincode_cb(void *handle,char *device)
+void bt_test_gap_request_pincode_cb(void *handle, char *device)
 {
 	char buffer[BUFFER_SIZE] = {0};
 
-	btlog("AGENT:Request pincode (%s)\n",device);
+	btlog("AGENT:Request pincode (%s)\n", device);
 
-	bt_test_pair_ask("Enter PIN Code: ",buffer);
+	bt_test_pair_ask("Enter PIN Code: ", buffer);
 
-	bt_manager_gap_send_pincode(handle,buffer);
+	bt_manager_gap_send_pincode(handle, buffer);
 }
 
-void bt_test_gap_display_pin_code_cb(char *device,char *pincode)
+void bt_test_gap_display_pin_code_cb(char *device, char *pincode)
 {
 	btlog("AGENT: Pincode %s\n", pincode);
 }
 
-void bt_test_gap_request_passkey_cb(void *handle,char *device)
+void bt_test_gap_request_passkey_cb(void *handle, char *device)
 {
 	unsigned long passkey;
 	char buffer[BUFFER_SIZE] = {0};
 
-	btlog("AGENT: Request passkey (%s)\n",device);
-	//bt_test_pair_ask("Enter passkey (1~999999): ",buffer);
-	//passkey = strtoul(buffer, NULL, 10);
-	//if ((passkey > 0) && (passkey < 999999))
-		bt_manager_gap_send_passkey(handle,passkey);
-	//else
+	btlog("AGENT: Request passkey (%s)\n", device);
+	// bt_test_pair_ask("Enter passkey (1~999999): ",buffer);
+	// passkey = strtoul(buffer, NULL, 10);
+	// if ((passkey > 0) && (passkey < 999999))
+	bt_manager_gap_send_passkey(handle, passkey);
+	// else
 	//	fprintf(stdout, "AGENT: get passkey error\n");
 }
 
-void bt_test_gap_display_passkey_cb(char *device,unsigned int passkey,
-		unsigned int entered)
+void bt_test_gap_display_passkey_cb(char *device, unsigned int passkey, unsigned int entered)
 {
 	btlog("AGENT: Passkey %06u\n", passkey);
 }
 
-void bt_test_gap_confirm_passkey_cb(void *handle,char *device,unsigned int passkey)
+void bt_test_gap_confirm_passkey_cb(void *handle, char *device, unsigned int passkey)
 {
 	char buffer[BUFFER_SIZE] = {0};
 
-	btlog("AGENT: Request confirmation (%s)\nPasskey: %06u\n",
-		device, passkey);
-	//bt_test_pair_ask("Confirm passkey? (yes/no): ",buffer);
-	//if (!strncmp(buffer, "yes", 3))
-		bt_manager_gap_pair_send_empty_response(handle);
-	//else
+	btlog("AGENT: Request confirmation (%s)\nPasskey: %06u\n", device, passkey);
+	// bt_test_pair_ask("Confirm passkey? (yes/no): ",buffer);
+	// if (!strncmp(buffer, "yes", 3))
+	bt_manager_gap_pair_send_empty_response(handle);
+	// else
 	//	bt_manager_gap_send_pair_error(handle,BT_PAIR_REQUEST_REJECTED,"");
 }
 
-void bt_test_gap_authorize_cb(void *handle,char *device)
+void bt_test_gap_authorize_cb(void *handle, char *device)
 {
-
 	char buffer[BUFFER_SIZE] = {0};
-	btlog("AGENT: Request authorization (%s)\n",device);
+	btlog("AGENT: Request authorization (%s)\n", device);
 
-	bt_test_pair_ask("Authorize? (yes/no): ",buffer);
+	bt_test_pair_ask("Authorize? (yes/no): ", buffer);
 
-	//if (!strncmp(buffer, "yes", 3))
-		bt_manager_gap_pair_send_empty_response(handle);
-	//else
+	// if (!strncmp(buffer, "yes", 3))
+	bt_manager_gap_pair_send_empty_response(handle);
+	// else
 	//	bt_manager_gap_send_pair_error(handle,BT_PAIR_REQUEST_REJECTED,"");
 }
 
-void bt_test_gap_authorize_service_cb(void *handle,char *device,char *uuid)
+void bt_test_gap_authorize_service_cb(void *handle, char *device, char *uuid)
 {
 	char buffer[BUFFER_SIZE] = {0};
 	btlog("AGENT: Authorize Service (%s, %s)\n", device, uuid);
-	//if(is_background == 0) {
+	// if(is_background == 0) {
 	//	bt_test_pair_ask("Authorize connection? (yes/no): ",buffer);
 
 	//	if (!strncmp(buffer, "yes", 3))
-			bt_manager_gap_pair_send_empty_response(handle);
+	bt_manager_gap_pair_send_empty_response(handle);
 	//	else
 	//		bt_manager_gap_send_pair_error(handle,BT_PAIR_REQUEST_REJECTED,"");
 	//}else {
@@ -3595,7 +3574,6 @@ void bt_test_gap_authorize_service_cb(void *handle,char *device,char *uuid)
 
 static void bt_test_a2dp_sink_connection_state_cb(const char *bd_addr, btmg_a2dp_sink_connection_state_t state)
 {
-
 	if (state == BTMG_A2DP_SINK_DISCONNECTED) {
 		btlog("A2DP sink disconnected with device: %s", bd_addr);
 		bt_manager_set_discovery_mode(BTMG_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
@@ -3678,23 +3656,24 @@ static void bt_test_avrcp_audio_volume_cb(const char *bd_addr, unsigned int volu
 
 static btmg_callback_t *bt_callback = NULL;
 
-void PLAT_bluetoothInit() {
+void PLAT_bluetoothInit()
+{
 	LOG_info("BT init\n");
 
-	if(bt_callback) {
+	if (bt_callback) {
 		LOG_error("BT is already initialized.\n");
 		return;
 	}
 	// Needs to be set before starting bluetooth manager
 	PLAT_bluetoothDiagnosticsEnable(CFG_getBluetoothDiagnostics());
 
-	if(bt_manager_preinit(&bt_callback) != 0) {
+	if (bt_manager_preinit(&bt_callback) != 0) {
 		LOG_error("bt preinit failed!\n");
 		return;
 	}
 
 	// Only BT audio here for now
-	//bt_manager_set_enable_default(true);
+	// bt_manager_set_enable_default(true);
 	bt_manager_enable_profile(BTMG_A2DP_SOUCE_ENABLE | BTMG_AVRCP_ENABLE);
 
 	bt_callback->btmg_manager_cb.bt_mg_cb = bt_test_manager_cb;
@@ -3704,7 +3683,7 @@ void PLAT_bluetoothInit() {
 	bt_callback->btmg_gap_cb.gap_disc_status_cb = bt_test_discovery_status_cb;
 	bt_callback->btmg_gap_cb.gap_device_add_cb = bt_test_dev_add_cb;
 	bt_callback->btmg_gap_cb.gap_device_remove_cb = bt_test_dev_remove_cb;
-	bt_callback->btmg_gap_cb.gap_update_rssi_cb =	bt_test_update_rssi_cb;
+	bt_callback->btmg_gap_cb.gap_update_rssi_cb = bt_test_update_rssi_cb;
 	bt_callback->btmg_gap_cb.gap_bond_state_cb = bt_test_bond_state_cb;
 	bt_callback->btmg_gap_cb.gap_connect_changed = bt_test_gap_connected_changed_cb;
 
@@ -3714,12 +3693,12 @@ void PLAT_bluetoothInit() {
 	bt_callback->btmg_gap_cb.gap_request_passkey = bt_test_gap_request_passkey_cb;
 	bt_callback->btmg_gap_cb.gap_display_passkey = bt_test_gap_display_passkey_cb;
 	bt_callback->btmg_gap_cb.gap_confirm_passkey = bt_test_gap_confirm_passkey_cb;
-	bt_callback->btmg_gap_cb.gap_authorize  = bt_test_gap_authorize_cb;
+	bt_callback->btmg_gap_cb.gap_authorize = bt_test_gap_authorize_cb;
 	bt_callback->btmg_gap_cb.gap_authorize_service = bt_test_gap_authorize_service_cb;
 
 	/* bt a2dp sink callback*/
-	//bt_callback->btmg_a2dp_sink_cb.a2dp_sink_connection_state_cb = bt_test_a2dp_sink_connection_state_cb;
-	//bt_callback->btmg_a2dp_sink_cb.a2dp_sink_audio_state_cb = bt_test_a2dp_sink_audio_state_cb;
+	// bt_callback->btmg_a2dp_sink_cb.a2dp_sink_connection_state_cb = bt_test_a2dp_sink_connection_state_cb;
+	// bt_callback->btmg_a2dp_sink_cb.a2dp_sink_audio_state_cb = bt_test_a2dp_sink_audio_state_cb;
 
 	/* bt a2dp source callback*/
 	bt_callback->btmg_a2dp_source_cb.a2dp_source_connection_state_cb = bt_test_a2dp_source_connection_state_cb;
@@ -3728,28 +3707,28 @@ void PLAT_bluetoothInit() {
 	/* bt avrcp callback*/
 	bt_callback->btmg_avrcp_cb.avrcp_audio_volume_cb = bt_test_avrcp_audio_volume_cb;
 
-	if(bt_manager_init(bt_callback) != 0) {
+	if (bt_manager_init(bt_callback) != 0) {
 		LOG_error("bt manager init failed.\n");
 		bt_manager_deinit(bt_callback);
 		return;
 	}
 
 	bonded_devices = btmg_dev_list_new();
-	if(bonded_devices == NULL) {
+	if (bonded_devices == NULL) {
 		LOG_error("btmg_dev_list_new failed.\n");
 		bt_manager_deinit(bt_callback);
 		return;
 	}
 
-	discovered_audiodev= btmg_dev_list_new();
-	if(discovered_audiodev == NULL) {
+	discovered_audiodev = btmg_dev_list_new();
+	if (discovered_audiodev == NULL) {
 		LOG_error("btmg_dev_list_new failed.\n");
 		bt_manager_deinit(bt_callback);
 		return;
 	}
 
-	discovered_controllers= btmg_dev_list_new();
-	if(discovered_controllers == NULL) {
+	discovered_controllers = btmg_dev_list_new();
+	if (discovered_controllers == NULL) {
 		LOG_error("btmg_dev_list_new failed.\n");
 		bt_manager_deinit(bt_callback);
 		return;
@@ -3760,7 +3739,7 @@ void PLAT_bluetoothInit() {
 
 void PLAT_bluetoothDeinit()
 {
-	if(bt_callback) {
+	if (bt_callback) {
 		bt_manager_deinit(bt_callback);
 		btmg_dev_list_free(discovered_audiodev);
 		btmg_dev_list_free(discovered_controllers);
@@ -3769,51 +3748,50 @@ void PLAT_bluetoothDeinit()
 	}
 }
 
-void PLAT_bluetoothEnable(bool shouldBeOn) {
-
-	if(bt_callback) {
+void PLAT_bluetoothEnable(bool shouldBeOn)
+{
+	if (bt_callback) {
 		// go through the manager
 		btmg_state_t bt_state = bt_manager_get_state();
 		// dont turn on if BT is already on/urning on or still turning off
-		if(shouldBeOn && bt_state == BTMG_STATE_OFF) {		
+		if (shouldBeOn && bt_state == BTMG_STATE_OFF) {
 			btlog("turning BT on...\n");
 			system("rfkill.elf unblock bluetooth");
-			if(bt_manager_enable(true) < 0) {
+			if (bt_manager_enable(true) < 0) {
 				LOG_error("bt_manager_enable failed\n");
 				return;
 			}
 			bt_manager_set_name("Trimui Brick (NextUI)");
-		}
-		else if(!shouldBeOn && bt_state == BTMG_STATE_ON ) {
+		} else if (!shouldBeOn && bt_state == BTMG_STATE_ON) {
 			btlog("turning BT off...\n");
-			if(bt_manager_enable(false) < 0) {
+			if (bt_manager_enable(false) < 0) {
 				LOG_error("bt_manager_enable failed\n");
 				return;
 			}
 			system("rfkill.elf block bluetooth");
 		}
-	}
-	else {
+	} else {
 		// lightweight
-		if(shouldBeOn) {
+		if (shouldBeOn) {
 			btlog("turning BT on...\n");
-			//system("rfkill.elf unblock bluetooth");
+			// system("rfkill.elf unblock bluetooth");
 			system("/etc/bluetooth/bt_init.sh start &");
-		}
-		else {
+		} else {
 			btlog("turning BT off...\n");
 			system("/etc/bluetooth/bt_init.sh stop &");
-			//system("rfkill.elf block bluetooth");
+			// system("rfkill.elf block bluetooth");
 		}
 	}
 	CFG_setBluetooth(shouldBeOn);
 }
 
-bool PLAT_bluetoothDiagnosticsEnabled() { 
-	return CFG_getBluetoothDiagnostics(); 
+bool PLAT_bluetoothDiagnosticsEnabled()
+{
+	return CFG_getBluetoothDiagnostics();
 }
 
-void PLAT_bluetoothDiagnosticsEnable(bool on) {
+void PLAT_bluetoothDiagnosticsEnable(bool on)
+{
 	bt_manager_set_loglevel(on ? BTMG_LOG_LEVEL_DEBUG : BTMG_LOG_LEVEL_INFO);
 	CFG_setBluetoothDiagnostics(on);
 }
@@ -3824,12 +3802,11 @@ void PLAT_bluetoothDiscovery(int on)
 	scan_filter.type = BTMG_SCAN_BR_EDR;
 	scan_filter.rssi = -90;
 
-	if(on) {
+	if (on) {
 		btlog("Starting BT discovery.\n");
 		bt_manager_discovery_filter(&scan_filter);
 		bt_manager_start_discovery();
-	}
-	else {
+	} else {
 		btlog("Stopping BT discovery.\n");
 		bt_manager_cancel_discovery();
 	}
@@ -3875,7 +3852,7 @@ int PLAT_bluetoothScan(struct BT_device *devices, int max)
 		}
 	}
 
-	//btlog("Scan yielded %d devices\n", count);
+	// btlog("Scan yielded %d devices\n", count);
 
 	return count;
 }
@@ -3885,25 +3862,25 @@ int PLAT_bluetoothPaired(struct BT_devicePaired *paired, int max)
 	bt_paried_device *devices = NULL;
 	int pairCnt = -1;
 
-	bt_manager_get_paired_devices(&devices,&pairCnt);
+	bt_manager_get_paired_devices(&devices, &pairCnt);
 	bt_paried_device *iter = devices;
 	int count = 0;
-	if(iter) {
-		while(iter && count < max) {
+	if (iter) {
+		while (iter && count < max) {
 			struct BT_devicePaired *device = &paired[count];
 			strcpy(device->remote_addr, iter->remote_address);
 			strcpy(device->remote_name, iter->remote_name);
 			device->rssi = iter->rssi;
 			device->is_bonded = iter->is_bonded;
 			device->is_connected = iter->is_connected;
-			//device->uuid_len = iter->uuid_length;
+			// device->uuid_len = iter->uuid_length;
 
 			count++;
 			iter = iter->next;
 		}
 		bt_manager_free_paired_devices(devices);
 	}
-	//btlog("Paired %d devices\n", count);
+	// btlog("Paired %d devices\n", count);
 
 	return count;
 }
@@ -3929,16 +3906,16 @@ void PLAT_bluetoothConnect(char *addr)
 	if (ret)
 		LOG_error("BT connect generic failed: %d\n", ret);
 	LOG_info("BT connect generic returned: %d\n", ret);
-	//int ret = bt_manager_profile_connect(addr, BTMG_A2DP_SINK);
-	//if (ret)
+	// int ret = bt_manager_profile_connect(addr, BTMG_A2DP_SINK);
+	// if (ret)
 	//	LOG_error("BT connect A2DP_SINK failed: %d\n", ret);
 
-	//ret = bt_manager_profile_connect(addr, BTMG_AVRCP);
-	//if (ret)
+	// ret = bt_manager_profile_connect(addr, BTMG_AVRCP);
+	// if (ret)
 	//	LOG_error("BT connect AVRCP failed: %d\n", ret);
 
-	//PLAT_bluetoothStreamInit(2, 48000);
-	//PLAT_bluetoothStreamBegin(0);
+	// PLAT_bluetoothStreamInit(2, 48000);
+	// PLAT_bluetoothStreamBegin(0);
 }
 
 void PLAT_bluetoothDisconnect(char *addr)
@@ -3947,54 +3924,54 @@ void PLAT_bluetoothDisconnect(char *addr)
 	int ret = bt_manager_disconnect(addr);
 	if (ret)
 		LOG_error("BT disconnect failed: %d\n", ret);
-	//int ret = bt_manager_profile_disconnect(addr, BTMG_A2DP_SINK);
-	//if (ret)
+	// int ret = bt_manager_profile_disconnect(addr, BTMG_A2DP_SINK);
+	// if (ret)
 	//	LOG_error("BT disconnect BTMG_A2DP_SINK failed: %d\n", ret);
-	//ret = bt_manager_profile_disconnect(addr, BTMG_AVRCP);
-	//if (ret)
+	// ret = bt_manager_profile_disconnect(addr, BTMG_AVRCP);
+	// if (ret)
 	//	LOG_error("BT disconnect BTMG_AVRCP failed: %d\n", ret);
 }
 
 bool PLAT_bluetoothConnected()
 {
-	//bt_paried_device *devices = NULL;
-	//int pairCnt = -1;
-	//bool connected = false;
-//
-	//bt_manager_get_paired_devices(&devices,&pairCnt);
-	//bt_paried_device *iter = devices;
-	//if(iter) {
+	// bt_paried_device *devices = NULL;
+	// int pairCnt = -1;
+	// bool connected = false;
+	//
+	// bt_manager_get_paired_devices(&devices,&pairCnt);
+	// bt_paried_device *iter = devices;
+	// if(iter) {
 	//	while(iter) {
 	//		if(iter->is_connected) {
 	//			connected = true;
 	//			break;
 	//		}
-//
+	//
 	//		iter = iter->next;
 	//	}
 	//	bt_manager_free_paired_devices(devices);
 	//}
-	
+
 	// no btmgr here!
 
 	FILE *fp;
-    char buffer[256];
+	char buffer[256];
 	bool connected = false;
 
 	fp = popen("hcitool con", "r");
-    if (fp == NULL) {
-        perror("Failed to run hcitool");
-        return 1;
-    }
+	if (fp == NULL) {
+		perror("Failed to run hcitool");
+		return 1;
+	}
 
-    while (fgets(buffer, sizeof(buffer), fp) != NULL) {
-        if (strstr(buffer, "ACL")) {
-            connected = true;
-            break;
-        }
-    }
+	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
+		if (strstr(buffer, "ACL")) {
+			connected = true;
+			break;
+		}
+	}
 
-    pclose(fp);
+	pclose(fp);
 
 	return connected;
 }
@@ -4040,179 +4017,189 @@ static char watched_dir[MAX_PATH];
 static char watched_file_path[MAX_PATH];
 
 // Function to detect audio device type from .asoundrc content
-static int detect_audio_device_type() {
-    FILE *file = fopen(watched_file_path, "r");
-    if (!file) {
-		//LOG_info("detect_audio_device_type: .asoundrc not found, defaulting to AUDIO_SINK_DEFAULT\n");
-        return AUDIO_SINK_DEFAULT;
-    }
-    
-    char line[256];
-    int is_bluetooth = 0;
-    int is_usb_dac = 0;
-    
-    while (fgets(line, sizeof(line), file)) {
-        if (strstr(line, "type bluealsa") || strstr(line, "defaults.bluealsa.device")) {
-            //LOG_info("detect_audio_device_type: found bluealsa\n");
-            is_bluetooth = 1;
-            break;
-        }
-        if (strstr(line, "type hw")) {
-			//LOG_info("detect_audio_device_type: found hw card\n");
-            is_usb_dac = 1;
-            break;
-        }
-    }
-    
-    fclose(file);
-    
-    if (is_bluetooth) {
-        return AUDIO_SINK_BLUETOOTH;
-    } else if (is_usb_dac) {
-        return AUDIO_SINK_USBDAC;
-    } else {
-        return AUDIO_SINK_DEFAULT;
-    }
-}
-
-static void add_file_watch() {
-    if (file_watch_fd >= 0) return; // already watching
-
-    file_watch_fd = inotify_add_watch(inotify_fd, watched_file_path,
-                                      IN_MODIFY | IN_CLOSE_WRITE | IN_DELETE_SELF);
-    if (file_watch_fd < 0) {
-        if (errno != ENOENT) // ENOENT means file doesn't exist yet - no error needed
-            LOG_error("PLAT_audioDeviceWatchRegister: failed to add file watch: %s\n", strerror(errno));
-    } else {
-        LOG_info("Watching file: %s\n", watched_file_path);
-    }
-}
-
-static void remove_file_watch() {
-    if (file_watch_fd >= 0) {
-        inotify_rm_watch(inotify_fd, file_watch_fd);
-        file_watch_fd = -1;
-        LOG_info("Stopped watching file: %s\n", watched_file_path);
-    }
-}
-
-static void *watcher_thread_func(void *arg) {
-    char buffer[EVENT_BUF_LEN];
-
-    // At start try to watch file if exists
-    add_file_watch();
-
-    while (running) {
-        int length = read(inotify_fd, buffer, EVENT_BUF_LEN);
-        if (length < 0) {
-            if (errno == EAGAIN || errno == EINTR) {
-                sleep(1);
-                continue;
-            }
-            LOG_error("inotify read error: %s\n", strerror(errno));
-            break;
-        }
-
-        for (int i = 0; i < length;) {
-            struct inotify_event *event = (struct inotify_event *)&buffer[i];
-
-            if (event->wd == dir_watch_fd) {
-                if (event->len > 0 && strcmp(event->name, WATCHED_FILE) == 0) {
-                    if (event->mask & IN_CREATE) {
-                        add_file_watch();
-                        int device_type = detect_audio_device_type();
-                        if (callback_fn) callback_fn(device_type, DIRWATCH_CREATE);
-                    }
+static int detect_audio_device_type()
+{
+	FILE *file = fopen(watched_file_path, "r");
+	if (!file) {
+		// LOG_info("detect_audio_device_type: .asoundrc not found, defaulting to AUDIO_SINK_DEFAULT\n");
+		return AUDIO_SINK_DEFAULT;
+	}
+
+	char line[256];
+	int is_bluetooth = 0;
+	int is_usb_dac = 0;
+
+	while (fgets(line, sizeof(line), file)) {
+		if (strstr(line, "type bluealsa") || strstr(line, "defaults.bluealsa.device")) {
+			// LOG_info("detect_audio_device_type: found bluealsa\n");
+			is_bluetooth = 1;
+			break;
+		}
+		if (strstr(line, "type hw")) {
+			// LOG_info("detect_audio_device_type: found hw card\n");
+			is_usb_dac = 1;
+			break;
+		}
+	}
+
+	fclose(file);
+
+	if (is_bluetooth) {
+		return AUDIO_SINK_BLUETOOTH;
+	} else if (is_usb_dac) {
+		return AUDIO_SINK_USBDAC;
+	} else {
+		return AUDIO_SINK_DEFAULT;
+	}
+}
+
+static void add_file_watch()
+{
+	if (file_watch_fd >= 0)
+		return; // already watching
+
+	file_watch_fd = inotify_add_watch(inotify_fd, watched_file_path, IN_MODIFY | IN_CLOSE_WRITE | IN_DELETE_SELF);
+	if (file_watch_fd < 0) {
+		if (errno != ENOENT) // ENOENT means file doesn't exist yet - no error needed
+			LOG_error("PLAT_audioDeviceWatchRegister: failed to add file watch: %s\n", strerror(errno));
+	} else {
+		LOG_info("Watching file: %s\n", watched_file_path);
+	}
+}
+
+static void remove_file_watch()
+{
+	if (file_watch_fd >= 0) {
+		inotify_rm_watch(inotify_fd, file_watch_fd);
+		file_watch_fd = -1;
+		LOG_info("Stopped watching file: %s\n", watched_file_path);
+	}
+}
+
+static void *watcher_thread_func(void *arg)
+{
+	char buffer[EVENT_BUF_LEN];
+
+	// At start try to watch file if exists
+	add_file_watch();
+
+	while (running) {
+		int length = read(inotify_fd, buffer, EVENT_BUF_LEN);
+		if (length < 0) {
+			if (errno == EAGAIN || errno == EINTR) {
+				sleep(1);
+				continue;
+			}
+			LOG_error("inotify read error: %s\n", strerror(errno));
+			break;
+		}
+
+		for (int i = 0; i < length;) {
+			struct inotify_event *event = (struct inotify_event *)&buffer[i];
+
+			if (event->wd == dir_watch_fd) {
+				if (event->len > 0 && strcmp(event->name, WATCHED_FILE) == 0) {
+					if (event->mask & IN_CREATE) {
+						add_file_watch();
+						int device_type = detect_audio_device_type();
+						if (callback_fn)
+							callback_fn(device_type, DIRWATCH_CREATE);
+					}
 					// No need to react to this, we handle it via file watch
-                    //else if (event->mask & IN_DELETE) {
-                    //    remove_file_watch();
-                    //    if (callback_fn) callback_fn(AUDIO_SINK_DEFAULT, DIRWATCH_DELETE);
-                    //}
-                }
-            }
-            else if (event->wd == file_watch_fd) {
-                if (event->mask & (IN_MODIFY | IN_CLOSE_WRITE | IN_DELETE_SELF)) {
-                    if (event->mask & IN_DELETE_SELF) {
-                        remove_file_watch();
-						if (callback_fn) callback_fn(AUDIO_SINK_DEFAULT, FILEWATCH_DELETE);
-                    }
+					// else if (event->mask & IN_DELETE) {
+					//    remove_file_watch();
+					//    if (callback_fn) callback_fn(AUDIO_SINK_DEFAULT, DIRWATCH_DELETE);
+					//}
+				}
+			} else if (event->wd == file_watch_fd) {
+				if (event->mask & (IN_MODIFY | IN_CLOSE_WRITE | IN_DELETE_SELF)) {
+					if (event->mask & IN_DELETE_SELF) {
+						remove_file_watch();
+						if (callback_fn)
+							callback_fn(AUDIO_SINK_DEFAULT, FILEWATCH_DELETE);
+					}
 					// No need to react to this, it usually comes paired with FILEWATCH_MODIFY
-					//else if (event->mask & IN_CLOSE_WRITE) {
+					// else if (event->mask & IN_CLOSE_WRITE) {
 					//	if (callback_fn) callback_fn(AUDIO_SINK_BLUETOOTH, FILEWATCH_CLOSE_WRITE);
 					//}
 					else if (event->mask & IN_MODIFY) {
 						int device_type = detect_audio_device_type();
-						if (callback_fn) callback_fn(device_type, FILEWATCH_MODIFY);
+						if (callback_fn)
+							callback_fn(device_type, FILEWATCH_MODIFY);
 					}
-                }
-            }
+				}
+			}
 
-            i += sizeof(struct inotify_event) + event->len;
-        }
-    }
+			i += sizeof(struct inotify_event) + event->len;
+		}
+	}
 
-    return NULL;
+	return NULL;
 }
 
-void PLAT_audioDeviceWatchRegister(void (*cb)(int device, int event)) {
-    if (running) return; // Already running
+void PLAT_audioDeviceWatchRegister(void (*cb)(int device, int event))
+{
+	if (running)
+		return; // Already running
 
-    callback_fn = cb;
+	callback_fn = cb;
 
-    const char *home = getenv("HOME");
-    if (!home) {
-        LOG_error("PLAT_audioDeviceWatchRegister: HOME environment variable not set\n");
-        return;
-    }
+	const char *home = getenv("HOME");
+	if (!home) {
+		LOG_error("PLAT_audioDeviceWatchRegister: HOME environment variable not set\n");
+		return;
+	}
 
-    snprintf(watched_dir, MAX_PATH, WATCHED_DIR_FMT, home);
-    snprintf(watched_file_path, MAX_PATH, "%s/%s", watched_dir, WATCHED_FILE);
+	snprintf(watched_dir, MAX_PATH, WATCHED_DIR_FMT, home);
+	snprintf(watched_file_path, MAX_PATH, "%s/%s", watched_dir, WATCHED_FILE);
 
-    LOG_info("PLAT_audioDeviceWatchRegister: Watching directory %s\n", watched_dir);
-    LOG_info("PLAT_audioDeviceWatchRegister: Watching file %s\n", watched_file_path);
+	LOG_info("PLAT_audioDeviceWatchRegister: Watching directory %s\n", watched_dir);
+	LOG_info("PLAT_audioDeviceWatchRegister: Watching file %s\n", watched_file_path);
 
-    inotify_fd = inotify_init1(IN_NONBLOCK);
-    if (inotify_fd < 0) {
-        LOG_error("PLAT_audioDeviceWatchRegister: failed to initialize inotify\n");
-        return;
-    }
+	inotify_fd = inotify_init1(IN_NONBLOCK);
+	if (inotify_fd < 0) {
+		LOG_error("PLAT_audioDeviceWatchRegister: failed to initialize inotify\n");
+		return;
+	}
 
-    dir_watch_fd = inotify_add_watch(inotify_fd, watched_dir, IN_CREATE | IN_DELETE);
-    if (dir_watch_fd < 0) {
-        LOG_error("PLAT_audioDeviceWatchRegister: failed to add directory watch\n");
-        close(inotify_fd);
-        inotify_fd = -1;
-        return;
-    }
+	dir_watch_fd = inotify_add_watch(inotify_fd, watched_dir, IN_CREATE | IN_DELETE);
+	if (dir_watch_fd < 0) {
+		LOG_error("PLAT_audioDeviceWatchRegister: failed to add directory watch\n");
+		close(inotify_fd);
+		inotify_fd = -1;
+		return;
+	}
 
-    file_watch_fd = -1;
+	file_watch_fd = -1;
 
-    running = 1;
-    if (pthread_create(&watcher_thread, NULL, watcher_thread_func, NULL) != 0) {
-        LOG_error("PLAT_audioDeviceWatchRegister: failed to create thread\n");
-        inotify_rm_watch(inotify_fd, dir_watch_fd);
-        close(inotify_fd);
-        inotify_fd = -1;
-        dir_watch_fd = -1;
-        running = 0;
-    }
+	running = 1;
+	if (pthread_create(&watcher_thread, NULL, watcher_thread_func, NULL) != 0) {
+		LOG_error("PLAT_audioDeviceWatchRegister: failed to create thread\n");
+		inotify_rm_watch(inotify_fd, dir_watch_fd);
+		close(inotify_fd);
+		inotify_fd = -1;
+		dir_watch_fd = -1;
+		running = 0;
+	}
 }
 
-void PLAT_audioDeviceWatchUnregister(void) {
-    if (!running) return;
+void PLAT_audioDeviceWatchUnregister(void)
+{
+	if (!running)
+		return;
 
-    running = 0;
-    pthread_join(watcher_thread, NULL);
+	running = 0;
+	pthread_join(watcher_thread, NULL);
 
-    if (file_watch_fd >= 0)
-        inotify_rm_watch(inotify_fd, file_watch_fd);
-    if (dir_watch_fd >= 0)
-        inotify_rm_watch(inotify_fd, dir_watch_fd);
-    if (inotify_fd >= 0)
-        close(inotify_fd);
+	if (file_watch_fd >= 0)
+		inotify_rm_watch(inotify_fd, file_watch_fd);
+	if (dir_watch_fd >= 0)
+		inotify_rm_watch(inotify_fd, dir_watch_fd);
+	if (inotify_fd >= 0)
+		close(inotify_fd);
 
-    inotify_fd = -1;
-    dir_watch_fd = -1;
-    file_watch_fd = -1;
-    callback_fn = NULL;
+	inotify_fd = -1;
+	dir_watch_fd = -1;
+	file_watch_fd = -1;
+	callback_fn = NULL;
 }
diff --git a/workspace/tg5040/platform/platform.h b/workspace/tg5040/platform/platform.h
index 410438404..428f45e00 100644
--- a/workspace/tg5040/platform/platform.h
+++ b/workspace/tg5040/platform/platform.h
@@ -13,118 +13,118 @@ extern int is_brick;
 
 ///////////////////////////////
 
-#define BUTTON_UP		BUTTON_NA
-#define BUTTON_DOWN		BUTTON_NA
-#define BUTTON_LEFT		BUTTON_NA
-#define BUTTON_RIGHT	BUTTON_NA
-
-#define BUTTON_SELECT	BUTTON_NA
-#define BUTTON_START	BUTTON_NA
-
-#define BUTTON_A		BUTTON_NA
-#define BUTTON_B		BUTTON_NA
-#define BUTTON_X		BUTTON_NA
-#define BUTTON_Y		BUTTON_NA
-
-#define BUTTON_L1		BUTTON_NA
-#define BUTTON_R1		BUTTON_NA
-#define BUTTON_L2		BUTTON_NA
-#define BUTTON_R2		BUTTON_NA
-#define BUTTON_L3		BUTTON_NA
-#define BUTTON_R3		BUTTON_NA
-
-#define BUTTON_MENU		BUTTON_NA
-#define BUTTON_MENU_ALT	BUTTON_NA
-#define	BUTTON_POWER	116 // BUTTON_NA
-#define	BUTTON_PLUS		BUTTON_NA
-#define	BUTTON_MINUS	BUTTON_NA
+#define BUTTON_UP BUTTON_NA
+#define BUTTON_DOWN BUTTON_NA
+#define BUTTON_LEFT BUTTON_NA
+#define BUTTON_RIGHT BUTTON_NA
+
+#define BUTTON_SELECT BUTTON_NA
+#define BUTTON_START BUTTON_NA
+
+#define BUTTON_A BUTTON_NA
+#define BUTTON_B BUTTON_NA
+#define BUTTON_X BUTTON_NA
+#define BUTTON_Y BUTTON_NA
+
+#define BUTTON_L1 BUTTON_NA
+#define BUTTON_R1 BUTTON_NA
+#define BUTTON_L2 BUTTON_NA
+#define BUTTON_R2 BUTTON_NA
+#define BUTTON_L3 BUTTON_NA
+#define BUTTON_R3 BUTTON_NA
+
+#define BUTTON_MENU BUTTON_NA
+#define BUTTON_MENU_ALT BUTTON_NA
+#define BUTTON_POWER 116 // BUTTON_NA
+#define BUTTON_PLUS BUTTON_NA
+#define BUTTON_MINUS BUTTON_NA
 
 ///////////////////////////////
 
-#define CODE_UP			CODE_NA
-#define CODE_DOWN		CODE_NA
-#define CODE_LEFT		CODE_NA
-#define CODE_RIGHT		CODE_NA
+#define CODE_UP CODE_NA
+#define CODE_DOWN CODE_NA
+#define CODE_LEFT CODE_NA
+#define CODE_RIGHT CODE_NA
 
-#define CODE_SELECT		CODE_NA
-#define CODE_START		CODE_NA
+#define CODE_SELECT CODE_NA
+#define CODE_START CODE_NA
 
-#define CODE_A			CODE_NA
-#define CODE_B			CODE_NA
-#define CODE_X			CODE_NA
-#define CODE_Y			CODE_NA
+#define CODE_A CODE_NA
+#define CODE_B CODE_NA
+#define CODE_X CODE_NA
+#define CODE_Y CODE_NA
 
-#define CODE_L1			CODE_NA
-#define CODE_R1			CODE_NA
-#define CODE_L2			CODE_NA
-#define CODE_R2			CODE_NA
-#define CODE_L3			CODE_NA
-#define CODE_R3			CODE_NA
+#define CODE_L1 CODE_NA
+#define CODE_R1 CODE_NA
+#define CODE_L2 CODE_NA
+#define CODE_R2 CODE_NA
+#define CODE_L3 CODE_NA
+#define CODE_R3 CODE_NA
 
-#define CODE_MENU		CODE_NA
-#define CODE_POWER		102
+#define CODE_MENU CODE_NA
+#define CODE_POWER 102
 
-#define CODE_PLUS		128
-#define CODE_MINUS		129
+#define CODE_PLUS 128
+#define CODE_MINUS 129
 
 ///////////////////////////////
-						// HATS
-#define JOY_UP			JOY_NA
-#define JOY_DOWN		JOY_NA
-#define JOY_LEFT		JOY_NA
-#define JOY_RIGHT		JOY_NA
+// HATS
+#define JOY_UP JOY_NA
+#define JOY_DOWN JOY_NA
+#define JOY_LEFT JOY_NA
+#define JOY_RIGHT JOY_NA
 
-#define JOY_SELECT		6
-#define JOY_START		7
+#define JOY_SELECT 6
+#define JOY_START 7
 
 // TODO: these ended up swapped in the first public release of stock :sob:
-#define JOY_A			1
-#define JOY_B			0
-#define JOY_X			3
-#define JOY_Y			2
-
-#define JOY_L1			4
-#define JOY_R1			5
-#define JOY_L2			JOY_NA
-#define JOY_R2			JOY_NA
-#define JOY_L3			(is_brick?9:JOY_NA)
-#define JOY_R3			(is_brick?10:JOY_NA)
-
-#define JOY_MENU		8
-#define JOY_POWER		102
-#define JOY_PLUS		(is_brick?14:128)
-#define JOY_MINUS		(is_brick?13:129)
+#define JOY_A 1
+#define JOY_B 0
+#define JOY_X 3
+#define JOY_Y 2
+
+#define JOY_L1 4
+#define JOY_R1 5
+#define JOY_L2 JOY_NA
+#define JOY_R2 JOY_NA
+#define JOY_L3 (is_brick ? 9 : JOY_NA)
+#define JOY_R3 (is_brick ? 10 : JOY_NA)
+
+#define JOY_MENU 8
+#define JOY_POWER 102
+#define JOY_PLUS (is_brick ? 14 : 128)
+#define JOY_MINUS (is_brick ? 13 : 129)
 
 ///////////////////////////////
 
-#define AXIS_L2			2 // ABSZ
-#define AXIS_R2			5 // RABSZ
+#define AXIS_L2 2 // ABSZ
+#define AXIS_R2 5 // RABSZ
 
-#define AXIS_LX			0 // ABS_X, -30k (left) to 30k (right)
-#define AXIS_LY			1 // ABS_Y, -30k (up) to 30k (down)
-#define AXIS_RX			3 // ABS_RX, -30k (left) to 30k (right)
-#define AXIS_RY			4 // ABS_RY, -30k (up) to 30k (down)
+#define AXIS_LX 0 // ABS_X, -30k (left) to 30k (right)
+#define AXIS_LY 1 // ABS_Y, -30k (up) to 30k (down)
+#define AXIS_RX 3 // ABS_RX, -30k (left) to 30k (right)
+#define AXIS_RY 4 // ABS_RY, -30k (up) to 30k (down)
 
 ///////////////////////////////
 
-#define BTN_RESUME			BTN_X
-#define BTN_SLEEP 			BTN_POWER
-#define BTN_WAKE 			BTN_POWER
-#define BTN_MOD_VOLUME 		BTN_NONE
-#define BTN_MOD_BRIGHTNESS 	BTN_MENU
-#define BTN_MOD_COLORTEMP 	BTN_SELECT
-#define BTN_MOD_PLUS 		BTN_PLUS
-#define BTN_MOD_MINUS 		BTN_MINUS
+#define BTN_RESUME BTN_X
+#define BTN_SLEEP BTN_POWER
+#define BTN_WAKE BTN_POWER
+#define BTN_MOD_VOLUME BTN_NONE
+#define BTN_MOD_BRIGHTNESS BTN_MENU
+#define BTN_MOD_COLORTEMP BTN_SELECT
+#define BTN_MOD_PLUS BTN_PLUS
+#define BTN_MOD_MINUS BTN_MINUS
 
 ///////////////////////////////
 
-#define FIXED_SCALE 	(is_brick?3:2)
-#define FIXED_WIDTH		(is_brick?1024:1280)
-#define FIXED_HEIGHT	(is_brick?768:720)
-#define FIXED_BPP		2
-#define FIXED_DEPTH		(FIXED_BPP * 8)
-#define FIXED_PITCH		(FIXED_WIDTH * FIXED_BPP)
-#define FIXED_SIZE		(FIXED_PITCH * FIXED_HEIGHT)
+#define FIXED_SCALE (is_brick ? 3 : 2)
+#define FIXED_WIDTH (is_brick ? 1024 : 1280)
+#define FIXED_HEIGHT (is_brick ? 768 : 720)
+#define FIXED_BPP 2
+#define FIXED_DEPTH (FIXED_BPP * 8)
+#define FIXED_PITCH (FIXED_WIDTH * FIXED_BPP)
+#define FIXED_SIZE (FIXED_PITCH * FIXED_HEIGHT)
 
 ///////////////////////////////
 
diff --git a/workspace/tg5040/rfkill/rfkill.c b/workspace/tg5040/rfkill/rfkill.c
index 3a35feae4..098f62648 100644
--- a/workspace/tg5040/rfkill/rfkill.c
+++ b/workspace/tg5040/rfkill/rfkill.c
@@ -10,108 +10,118 @@
 #include <stdint.h>
 #include <dirent.h>
 
-void show_usage(const char *prog) {
-    fprintf(stderr,
-        "Usage:\n"
-        "  %s list [INDEX|TYPE]\n"
-        "  %s block INDEX|TYPE\n"
-        "  %s unblock INDEX|TYPE\n", prog, prog, prog);
-    exit(EXIT_FAILURE);
+void show_usage(const char *prog)
+{
+	fprintf(stderr,
+			"Usage:\n"
+			"  %s list [INDEX|TYPE]\n"
+			"  %s block INDEX|TYPE\n"
+			"  %s unblock INDEX|TYPE\n",
+			prog, prog, prog);
+	exit(EXIT_FAILURE);
 }
 
-int get_rfkill_type(const char *name) {
-    static const char *types[] = {
-        "all", "wlan", "bluetooth", "uwb", "wimax", "wwan", "gps", "fm", NULL
-    };
-    if (strcmp(name, "wifi") == 0) name = "wlan";
-    if (strcmp(name, "ultrawideband") == 0) name = "uwb";
-
-    for (int i = 0; types[i]; ++i) {
-        if (strcmp(name, types[i]) == 0)
-            return i;
-    }
-    return -1;
+int get_rfkill_type(const char *name)
+{
+	static const char *types[] = {"all", "wlan", "bluetooth", "uwb", "wimax", "wwan", "gps", "fm", NULL};
+	if (strcmp(name, "wifi") == 0)
+		name = "wlan";
+	if (strcmp(name, "ultrawideband") == 0)
+		name = "uwb";
+
+	for (int i = 0; types[i]; ++i) {
+		if (strcmp(name, types[i]) == 0)
+			return i;
+	}
+	return -1;
 }
 
-void list_devices(const char *filter) {
-    int fd = open("/dev/rfkill", O_RDONLY | O_NONBLOCK);
-    if (fd < 0) {
-        perror("/dev/rfkill");
-        exit(EXIT_FAILURE);
-    }
-
-    struct rfkill_event ev;
-    ssize_t len;
-
-    int rf_type = -1, rf_idx = -1;
-    if (filter) {
-        rf_type = get_rfkill_type(filter);
-        if (rf_type < 0)
-            rf_idx = atoi(filter);
-    }
-
-    while ((len = read(fd, &ev, sizeof(ev))) == sizeof(ev)) {
-        if ((rf_type >= 0 && ev.type != rf_type) ||
-            (rf_idx >= 0 && ev.idx != rf_idx))
-            continue;
-
-        char path[128], line[128], name[64] = "", type[64] = "";
-        snprintf(path, sizeof(path), "/sys/class/rfkill/rfkill%u/uevent", ev.idx);
-        FILE *f = fopen(path, "r");
-        if (!f) continue;
-
-        while (fgets(line, sizeof(line), f)) {
-            if (sscanf(line, "RFKILL_NAME=%63s", name) == 1) continue;
-            if (sscanf(line, "RFKILL_TYPE=%63s", type) == 1) continue;
-        }
-        fclose(f);
-
-        printf("%u: %s: %s\n", ev.idx, name, type);
-        printf("\tSoft blocked: %s\n", ev.soft ? "yes" : "no");
-        printf("\tHard blocked: %s\n", ev.hard ? "yes" : "no");
-    }
-
-    close(fd);
+void list_devices(const char *filter)
+{
+	int fd = open("/dev/rfkill", O_RDONLY | O_NONBLOCK);
+	if (fd < 0) {
+		perror("/dev/rfkill");
+		exit(EXIT_FAILURE);
+	}
+
+	struct rfkill_event ev;
+	ssize_t len;
+
+	int rf_type = -1, rf_idx = -1;
+	if (filter) {
+		rf_type = get_rfkill_type(filter);
+		if (rf_type < 0)
+			rf_idx = atoi(filter);
+	}
+
+	while ((len = read(fd, &ev, sizeof(ev))) == sizeof(ev)) {
+		if ((rf_type >= 0 && ev.type != rf_type) || (rf_idx >= 0 && ev.idx != rf_idx))
+			continue;
+
+		char path[128], line[128], name[64] = "", type[64] = "";
+		snprintf(path, sizeof(path), "/sys/class/rfkill/rfkill%u/uevent", ev.idx);
+		FILE *f = fopen(path, "r");
+		if (!f)
+			continue;
+
+		while (fgets(line, sizeof(line), f)) {
+			if (sscanf(line, "RFKILL_NAME=%63s", name) == 1)
+				continue;
+			if (sscanf(line, "RFKILL_TYPE=%63s", type) == 1)
+				continue;
+		}
+		fclose(f);
+
+		printf("%u: %s: %s\n", ev.idx, name, type);
+		printf("\tSoft blocked: %s\n", ev.soft ? "yes" : "no");
+		printf("\tHard blocked: %s\n", ev.hard ? "yes" : "no");
+	}
+
+	close(fd);
 }
 
-void change_block(const char *target, int block) {
-    int fd = open("/dev/rfkill", O_WRONLY);
-    if (fd < 0) {
-        perror("/dev/rfkill");
-        exit(EXIT_FAILURE);
-    }
-
-    struct rfkill_event ev = {0};
-    int type = get_rfkill_type(target);
-    int idx = (type < 0) ? atoi(target) : -1;
-
-    ev.op = (idx >= 0) ? RFKILL_OP_CHANGE : RFKILL_OP_CHANGE_ALL;
-    ev.soft = block;
-    if (type >= 0) ev.type = type;
-    if (idx >= 0) ev.idx = idx;
-
-    if (write(fd, &ev, sizeof(ev)) != sizeof(ev)) {
-        perror("write");
-        close(fd);
-        exit(EXIT_FAILURE);
-    }
-
-    close(fd);
+void change_block(const char *target, int block)
+{
+	int fd = open("/dev/rfkill", O_WRONLY);
+	if (fd < 0) {
+		perror("/dev/rfkill");
+		exit(EXIT_FAILURE);
+	}
+
+	struct rfkill_event ev = {0};
+	int type = get_rfkill_type(target);
+	int idx = (type < 0) ? atoi(target) : -1;
+
+	ev.op = (idx >= 0) ? RFKILL_OP_CHANGE : RFKILL_OP_CHANGE_ALL;
+	ev.soft = block;
+	if (type >= 0)
+		ev.type = type;
+	if (idx >= 0)
+		ev.idx = idx;
+
+	if (write(fd, &ev, sizeof(ev)) != sizeof(ev)) {
+		perror("write");
+		close(fd);
+		exit(EXIT_FAILURE);
+	}
+
+	close(fd);
 }
 
-int main(int argc, char **argv) {
-    if (argc < 2 || argc > 3)
-        show_usage(argv[0]);
-
-    if (strcmp(argv[1], "list") == 0) {
-        list_devices(argv[2]);
-    } else if (strcmp(argv[1], "block") == 0 && argc == 3) {
-        change_block(argv[2], 1);
-    } else if (strcmp(argv[1], "unblock") == 0 && argc == 3) {
-        change_block(argv[2], 0);
-    } else {
-        show_usage(argv[0]);
-    }
-
-    return 0;
+int main(int argc, char **argv)
+{
+	if (argc < 2 || argc > 3)
+		show_usage(argv[0]);
+
+	if (strcmp(argv[1], "list") == 0) {
+		list_devices(argv[2]);
+	} else if (strcmp(argv[1], "block") == 0 && argc == 3) {
+		change_block(argv[2], 1);
+	} else if (strcmp(argv[1], "unblock") == 0 && argc == 3) {
+		change_block(argv[2], 0);
+	} else {
+		show_usage(argv[0]);
+	}
+
+	return 0;
 }
\ No newline at end of file
diff --git a/workspace/tg5040/show/show.c b/workspace/tg5040/show/show.c
index 956ef22b4..3f8355c79 100644
--- a/workspace/tg5040/show/show.c
+++ b/workspace/tg5040/show/show.c
@@ -4,36 +4,38 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
 
-SDL_Window* window;
-SDL_Surface* screen;
+SDL_Window *window;
+SDL_Surface *screen;
 
-int main(int argc , char* argv[]) {
-	if (argc<2) {
+int main(int argc, char *argv[])
+{
+	if (argc < 2) {
 		puts("Usage: show.elf image.png delay");
 		return 0;
 	}
-	
+
 	char path[256];
-	strncpy(path,argv[1],256);
-	if (access(path, F_OK)!=0) return 0; // nothing to show :(
-	
-	int delay = argc>2 ? atoi(argv[2]) : 2;
-	
+	strncpy(path, argv[1], 256);
+	if (access(path, F_OK) != 0)
+		return 0; // nothing to show :(
+
+	int delay = argc > 2 ? atoi(argv[2]) : 2;
+
 	SDL_Init(SDL_INIT_VIDEO);
 	SDL_ShowCursor(0);
-	
-	window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 0,0, SDL_WINDOW_SHOWN);
+
+	window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 0, 0, SDL_WINDOW_SHOWN);
 	puts("");
-	
-	screen = SDL_GetWindowSurface(window); 
+
+	screen = SDL_GetWindowSurface(window);
 	SDL_FillRect(screen, NULL, 0);
-	 
-	SDL_Surface* img = IMG_Load(path); 
-	SDL_BlitSurface(img, NULL, screen, &(SDL_Rect){(screen->w-img->w)/2,(screen->h-img->h)/2});
-	
+
+	SDL_Surface *img = IMG_Load(path);
+	SDL_BlitSurface(img, NULL, screen, &(SDL_Rect){(screen->w - img->w) / 2, (screen->h - img->h) / 2});
+
 	SDL_UpdateWindowSurface(window);
 	sleep(delay);
-	
+
 	SDL_FreeSurface(img);
 	SDL_DestroyWindow(window);
 	SDL_Quit();
diff --git a/workspace/tg5040/wifimanager/daemon/wifi_daemon.c b/workspace/tg5040/wifimanager/daemon/wifi_daemon.c
index 47afce1ec..dd229a344 100644
--- a/workspace/tg5040/wifimanager/daemon/wifi_daemon.c
+++ b/workspace/tg5040/wifimanager/daemon/wifi_daemon.c
@@ -1,11 +1,11 @@
 /*
-  * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-  * Filename    wifi_daemon.c
-  * Author        laumy
-  * Version       0.0.1
-  * Date           2018.11.05
-  *
-  */
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ * Filename    wifi_daemon.c
+ * Author        laumy
+ * Version       0.0.1
+ * Date           2018.11.05
+ *
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,44 +25,39 @@
 
 static void wifi_state_handle(struct Manager *w, int event_label)
 {
-    wmg_printf(MSG_DEBUG,"event_label 0x%x\n", event_label);
-
-    switch(w->StaEvt.state)
-    {
-		 case CONNECTING:
-		 {
-			 wmg_printf(MSG_INFO,"Connecting to the network......\n");
-			 break;
-		 }
-		 case CONNECTED:
-		 {
-			 wmg_printf(MSG_INFO,"Connected to the AP\n");
-			 start_udhcpc();
-			 break;
-		 }
-
-		 case OBTAINING_IP:
-		 {
-			 wmg_printf(MSG_INFO,"Getting ip address......\n");
-			 break;
-		 }
-
-		 case NETWORK_CONNECTED:
-		 {
-			 wmg_printf(MSG_INFO,"Successful network connection\n");
-			 break;
-		 }
-		case DISCONNECTED:
-		{
-		    wmg_printf(MSG_ERROR,"Disconnected,the reason:%s\n",wmg_event_txt(w->StaEvt.event));
-		    break;
-		}
-    }
+	wmg_printf(MSG_DEBUG, "event_label 0x%x\n", event_label);
+
+	switch (w->StaEvt.state) {
+	case CONNECTING: {
+		wmg_printf(MSG_INFO, "Connecting to the network......\n");
+		break;
+	}
+	case CONNECTED: {
+		wmg_printf(MSG_INFO, "Connected to the AP\n");
+		start_udhcpc();
+		break;
+	}
+
+	case OBTAINING_IP: {
+		wmg_printf(MSG_INFO, "Getting ip address......\n");
+		break;
+	}
+
+	case NETWORK_CONNECTED: {
+		wmg_printf(MSG_INFO, "Successful network connection\n");
+		break;
+	}
+	case DISCONNECTED: {
+		wmg_printf(MSG_ERROR, "Disconnected,the reason:%s\n", wmg_event_txt(w->StaEvt.event));
+		break;
+	}
+	}
 }
-static void ctl_loop_stop(int sig) {
+static void ctl_loop_stop(int sig)
+{
 	/* Call to this handler restores the default action, so on the
 	 * second call the program will be forcefully terminated. */
-	struct sigaction sigact = { .sa_handler = SIG_DFL };
+	struct sigaction sigact = {.sa_handler = SIG_DFL};
 	sigaction(sig, &sigact, NULL);
 	da_ctl_free();
 }
@@ -74,73 +69,75 @@ static void usage()
 	printf("  -h = show this help text\n");
 }
 
-int main(int argc, char *argv[]){
-    int ret = 0, len = 0;
-    int times = 0, event_label = 0;;
-    char ssid[256] = {0}, scan_results[4096] = {0};
+int main(int argc, char *argv[])
+{
+	int ret = 0, len = 0;
+	int times = 0, event_label = 0;
+	;
+	char ssid[256] = {0}, scan_results[4096] = {0};
 	int debug_syslog = 0;
 	const char *debug_file_path = NULL;
 	int debug_level = 0;
 	int c;
 
-	int i,connect_wpa_time = 0;
+	int i, connect_wpa_time = 0;
 
-    const aw_wifi_interface_t *p_wifi_interface = NULL;
+	const aw_wifi_interface_t *p_wifi_interface = NULL;
 	for (;;) {
-		c = getopt(argc, argv,"hf:sd");
-		if(c < 0)
+		c = getopt(argc, argv, "hf:sd");
+		if (c < 0)
+			break;
+		switch (c) {
+		case 'h':
+			usage();
+			return 0;
+		case 'f':
+			debug_file_path = optarg;
+			break;
+		case 's':
+			debug_syslog++;
+			break;
+		case 'd':
+			debug_level++;
 			break;
-		switch(c){
-			case 'h':
-				usage();
-				return 0;
-			case 'f':
-				debug_file_path = optarg;
-				break;
-			case 's':
-				debug_syslog ++;
-				break;
-			case 'd':
-				debug_level ++;
-				break;
-			default:
-				usage();
-				return 0;
+		default:
+			usage();
+			return 0;
 		}
 	}
 	if (NULL != debug_file_path) {
-		printf("debug output file:%s\n",debug_file_path);
+		printf("debug output file:%s\n", debug_file_path);
 		wmg_debug_open_file(debug_file_path);
 	}
 	if (debug_syslog)
 		wmg_debug_open_syslog();
 
-	printf("debug levle:%d\n",MSG_INFO+debug_level);
+	printf("debug levle:%d\n", MSG_INFO + debug_level);
 
-	wmg_set_debug_level(MSG_INFO+debug_level);
-	if(wifi_daemon_ctl_init() < 0){
-		wmg_printf(MSG_ERROR,"Failed to start wifi daemon.\n");
+	wmg_set_debug_level(MSG_INFO + debug_level);
+	if (wifi_daemon_ctl_init() < 0) {
+		wmg_printf(MSG_ERROR, "Failed to start wifi daemon.\n");
 		return 0;
 	}
 
-    event_label = rand();
-	for (i = 0 ; i<= TRY_CONNECT_WPA_MAX_TIME ;i++) {
+	event_label = rand();
+	for (i = 0; i <= TRY_CONNECT_WPA_MAX_TIME; i++) {
 		p_wifi_interface = aw_wifi_on(wifi_state_handle, event_label);
-		if(p_wifi_interface != NULL) {
-			wmg_printf(MSG_DEBUG,"connect wpa_supplicant Successful.\n");
+		if (p_wifi_interface != NULL) {
+			wmg_printf(MSG_DEBUG, "connect wpa_supplicant Successful.\n");
 			break;
 		}
 		ms_sleep(1000);
-		wmg_printf(MSG_DEBUG,"try connect wpa_supplicant :%d times\n",i+1);
+		wmg_printf(MSG_DEBUG, "try connect wpa_supplicant :%d times\n", i + 1);
 	}
-	if(p_wifi_interface == NULL){
-	    wmg_printf(MSG_ERROR,"wifi on failed\n");
+	if (p_wifi_interface == NULL) {
+		wmg_printf(MSG_ERROR, "wifi on failed\n");
 		goto failed;
 	}
 	/* In order to receive EPIPE while writing to the pipe whose reading end
 	 * is closed, the SIGPIPE signal has to be handled. For more information
 	 * see the msg_pipe_write() function. */
-	struct sigaction sigact = { .sa_handler = SIG_IGN };
+	struct sigaction sigact = {.sa_handler = SIG_IGN};
 	sigaction(SIGPIPE, &sigact, NULL);
 
 	/* free ctl resource */
@@ -149,8 +146,8 @@ int main(int argc, char *argv[]){
 	sigaction(SIGINT, &sigact, NULL);
 
 	ctl_loop(p_wifi_interface);
-	wmg_printf(MSG_DEBUG,"Exiting ctl loop\n");
-    return 0;
+	wmg_printf(MSG_DEBUG, "Exiting ctl loop\n");
+	return 0;
 failed:
 	da_ctl_free();
 	return -1;
diff --git a/workspace/tg5040/wifimanager/daemon/wifid_cmd.h b/workspace/tg5040/wifimanager/daemon/wifid_cmd.h
index 3041a5450..8e9666a36 100644
--- a/workspace/tg5040/wifimanager/daemon/wifid_cmd.h
+++ b/workspace/tg5040/wifimanager/daemon/wifid_cmd.h
@@ -23,13 +23,13 @@ enum cn_event {
 #define SCAN_MAX 16384
 #define LIST_NETWORK_MAX 16384
 
-int aw_wifid_connect_ap(const char *ssid, const char *passwd,enum cn_event *ptrEvent);
-int aw_wifid_get_scan_results(char *results,int len);
+int aw_wifid_connect_ap(const char *ssid, const char *passwd, enum cn_event *ptrEvent);
+int aw_wifid_get_scan_results(char *results, int len);
 int aw_wifid_list_networks(char *reply, size_t len);
 int aw_wifid_get_status(struct wifi_status *sptr);
 int aw_wifid_get_connection(struct connection_status *sptr);
 int aw_wifid_remove_networks(char *pssid, int len);
-const char* connect_event_txt(enum cn_event event);
+const char *connect_event_txt(enum cn_event event);
 void aw_wifid_open(void);
 void aw_wifid_close(void);
 
diff --git a/workspace/tg5040/wifimanager/daemon/wifid_cmd_handle.c b/workspace/tg5040/wifimanager/daemon/wifid_cmd_handle.c
index ac40b9329..02a397c0f 100644
--- a/workspace/tg5040/wifimanager/daemon/wifid_cmd_handle.c
+++ b/workspace/tg5040/wifimanager/daemon/wifid_cmd_handle.c
@@ -1,11 +1,11 @@
 /*
-  * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-  * Filename    wifid_cmd_handle.c
-  * Author        laumy <liumingyuan@allwinnertech.com>
-  * Version       0.0.1
-  * Date           2018.11.05
-  *
-  */
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ * Filename    wifid_cmd_handle.c
+ * Author        laumy <liumingyuan@allwinnertech.com>
+ * Version       0.0.1
+ * Date           2018.11.05
+ *
+ */
 
 #include <stdbool.h>
 #include <stdlib.h>
@@ -16,7 +16,7 @@
 #include "wifid_cmd.h"
 #include "wifid_cmd_iface.h"
 #include "tool.h"
-const char* connect_event_txt(enum cn_event event)
+const char *connect_event_txt(enum cn_event event)
 {
 	switch (event) {
 	case DA_CONNECTED:
@@ -42,7 +42,7 @@ const char* connect_event_txt(enum cn_event event)
 	}
 }
 
-int aw_wifid_get_scan_results(char *results,int len)
+int aw_wifid_get_scan_results(char *results, int len)
 {
 	struct da_requst req = {
 		.command = DA_COMMAND_SCAN,
@@ -59,11 +59,11 @@ int aw_wifid_get_scan_results(char *results,int len)
 		goto end;
 
 	if (cli.enable_pipe)
-		ret = read_command_message(cli.pipe_fd,results,len);
+		ret = read_command_message(cli.pipe_fd, results, len);
 
 end:
 	handle_command_free(&cli);
-	return ret ;
+	return ret;
 }
 
 int aw_wifid_get_status(struct wifi_status *sptr)
@@ -80,13 +80,13 @@ int aw_wifid_get_status(struct wifi_status *sptr)
 	int ret = handle_command(&req, &cli);
 	if (ret < 0)
 		goto end;
-		
-	if(cli.enable_pipe)
-		ret = read_command_message(cli.pipe_fd,(char*)sptr,sizeof(struct wifi_status));
+
+	if (cli.enable_pipe)
+		ret = read_command_message(cli.pipe_fd, (char *)sptr, sizeof(struct wifi_status));
 
 end:
 	handle_command_free(&cli);
-	return ret ;
+	return ret;
 }
 
 int aw_wifid_get_connection(struct connection_status *sptr)
@@ -104,17 +104,16 @@ int aw_wifid_get_connection(struct connection_status *sptr)
 	if (ret < 0)
 		goto end;
 
-	if(cli.enable_pipe)
-		ret = read_command_message(cli.pipe_fd,(char*)sptr,sizeof(struct connection_status));
+	if (cli.enable_pipe)
+		ret = read_command_message(cli.pipe_fd, (char *)sptr, sizeof(struct connection_status));
 
 end:
 	handle_command_free(&cli);
-	return ret ;
+	return ret;
 }
 
-int aw_wifid_connect_ap(const char *ssid, const char *passwd,enum cn_event *ptrEvent)
+int aw_wifid_connect_ap(const char *ssid, const char *passwd, enum cn_event *ptrEvent)
 {
-
 	struct da_requst req = {
 		.command = DA_COMMAND_CONNECT,
 		.ssid = {0},
@@ -125,24 +124,24 @@ int aw_wifid_connect_ap(const char *ssid, const char *passwd,enum cn_event *ptrE
 	};
 
 	if (NULL != ssid)
-		strncpy(req.ssid,ssid,strlen(ssid));
+		strncpy(req.ssid, ssid, strlen(ssid));
 
 	if (NULL != passwd)
-		strncpy(req.pwd,passwd,strlen(passwd));
+		strncpy(req.pwd, passwd, strlen(passwd));
 
 	int ret = handle_command(&req, &cli);
 	if (ret < 0)
 		goto end;
 
-	if(cli.enable_pipe)
-		ret = read_command_message(cli.pipe_fd,(char*)ptrEvent,sizeof(enum cn_event));
-	
+	if (cli.enable_pipe)
+		ret = read_command_message(cli.pipe_fd, (char *)ptrEvent, sizeof(enum cn_event));
+
 end:
 	handle_command_free(&cli);
 	return ret;
 }
 
-int aw_wifid_remove_networks(char *pssid,int len)
+int aw_wifid_remove_networks(char *pssid, int len)
 {
 	struct da_requst req = {
 		.command = DA_COMMAND_REMOVE_NET,
@@ -154,7 +153,7 @@ int aw_wifid_remove_networks(char *pssid,int len)
 	};
 
 	if (NULL != pssid)
-		strncpy(req.ssid,pssid,len);
+		strncpy(req.ssid, pssid, len);
 
 	int ret = handle_command(&req, &cli);
 	if (ret < 0)
@@ -180,27 +179,27 @@ int aw_wifid_list_networks(char *reply, size_t len)
 	if (ret < 0)
 		goto end;
 
-	ret = read_command_message(cli.pipe_fd,reply,len);
+	ret = read_command_message(cli.pipe_fd, reply, len);
 
 end:
 	handle_command_free(&cli);
-	return ret ;
+	return ret;
 }
 
 void aw_wifid_open(void)
 {
-	if (get_process_state("wifi_daemon",11) == -1){
-		wmg_printf(MSG_DEBUG,"opening wifi daemon......\n");
+	if (get_process_state("wifi_daemon", 11) == -1) {
+		wmg_printf(MSG_DEBUG, "opening wifi daemon......\n");
 		system("/mnt/SDCARD/.system/tg5040/bin/wifi_daemon -s &");
 		sleep(2);
 	} else {
-		wmg_printf(MSG_INFO,"Wifi daemon is already open\n");
+		wmg_printf(MSG_INFO, "Wifi daemon is already open\n");
 	}
 }
 
 void aw_wifid_close(void)
 {
-	wmg_printf(MSG_DEBUG,"closing wifi daemon......\n");
+	wmg_printf(MSG_DEBUG, "closing wifi daemon......\n");
 	system("killall -q wifi_daemon");
 	sleep(1);
 }
diff --git a/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.c b/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.c
index 938fdceff..be8af31f1 100644
--- a/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.c
+++ b/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.c
@@ -1,11 +1,11 @@
 /*
-  * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-  * Filename    wifid_cmd_iface.c
-  * Author        laumy <liumingyuan@allwinnertech.com>
-  * Version       0.0.1
-  * Date           2018.11.05
-  *
-  */
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ * Filename    wifid_cmd_iface.c
+ * Author        laumy <liumingyuan@allwinnertech.com>
+ * Version       0.0.1
+ * Date           2018.11.05
+ *
+ */
 
 #include <errno.h>
 #include <string.h>
@@ -27,31 +27,32 @@
 
 #define CLT_CLIENT_VERSION "181025"
 
-static int wifid_cmd_status(const enum cmd_status status) {
+static int wifid_cmd_status(const enum cmd_status status)
+{
 	switch (status) {
 	case DA_CMD_SUCCESS:
-		wmg_printf(MSG_DEBUG,"daemon reply code success\n");
+		wmg_printf(MSG_DEBUG, "daemon reply code success\n");
 		return 0;
 	case DA_CODE_FAILED:
-		wmg_printf(MSG_DEBUG,"daemon reply code error unkown\n");
+		wmg_printf(MSG_DEBUG, "daemon reply code error unkown\n");
 		return -1;
 	case DA_CMD_ERROR:
 	default:
-		wmg_printf(MSG_DEBUG,"daemon reply code failed\n");
+		wmg_printf(MSG_DEBUG, "daemon reply code failed\n");
 		return -1;
 	}
 }
 
-static int wifid_send_request(int fd, const struct da_requst *req_ptr) {
-
-	enum cmd_status  status = { 0xAB };
+static int wifid_send_request(int fd, const struct da_requst *req_ptr)
+{
+	enum cmd_status status = {0xAB};
 
-	if (send(fd,req_ptr, sizeof(struct da_requst), MSG_NOSIGNAL) == -1){
-		wmg_printf(MSG_ERROR,"send command %d error:%s\n",req_ptr->command,strerror(errno));
+	if (send(fd, req_ptr, sizeof(struct da_requst), MSG_NOSIGNAL) == -1) {
+		wmg_printf(MSG_ERROR, "send command %d error:%s\n", req_ptr->command, strerror(errno));
 		return -1;
 	}
-	if (read(fd, &status, sizeof(status)) == -1){
-		wmg_printf(MSG_ERROR,"read command %d error:%s\n",req_ptr->command,strerror(errno));
+	if (read(fd, &status, sizeof(status)) == -1) {
+		wmg_printf(MSG_ERROR, "read command %d error:%s\n", req_ptr->command, strerror(errno));
 		return -1;
 	}
 	return wifid_cmd_status(status);
@@ -66,7 +67,7 @@ static int get_cmd_msg_transport(int fd)
 	};
 	char buf[256] = "";
 	int msg_fd = -1;
-	enum cmd_status  status = { 0xAB };
+	enum cmd_status status = {0xAB};
 
 	struct iovec io = {
 		.iov_base = &status,
@@ -80,14 +81,14 @@ static int get_cmd_msg_transport(int fd)
 	};
 	ssize_t len;
 
-	if(fd <= 0){
-		wmg_printf(MSG_ERROR,"damon socket fd is illegal\n");
+	if (fd <= 0) {
+		wmg_printf(MSG_ERROR, "damon socket fd is illegal\n");
 		return -1;
 	}
-	wmg_printf(MSG_DEBUG,"get command message reply fd\n");
+	wmg_printf(MSG_DEBUG, "get command message reply fd\n");
 
-	if (send(fd,&req, sizeof(req), MSG_NOSIGNAL) == -1){
-		wmg_printf(MSG_ERROR,"send command error:%s\n",strerror(errno));
+	if (send(fd, &req, sizeof(req), MSG_NOSIGNAL) == -1) {
+		wmg_printf(MSG_ERROR, "send command error:%s\n", strerror(errno));
 		return -1;
 	}
 
@@ -95,54 +96,51 @@ static int get_cmd_msg_transport(int fd)
 		return -1;
 
 	struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
-	if (cmsg == NULL ||
-			cmsg->cmsg_level == IPPROTO_IP ||
-			cmsg->cmsg_type == IP_TTL) {
+	if (cmsg == NULL || cmsg->cmsg_level == IPPROTO_IP || cmsg->cmsg_type == IP_TTL) {
 		/* in case of error, status message is returned */
-		wmg_printf(MSG_ERROR,"cmsg error\n");
+		wmg_printf(MSG_ERROR, "cmsg error\n");
 		return -1;
 	}
 
-	if (read(fd, &status, sizeof(status)) == -1){
-		wmg_printf(MSG_ERROR,"read command error:%s\n",strerror(errno));
+	if (read(fd, &status, sizeof(status)) == -1) {
+		wmg_printf(MSG_ERROR, "read command error:%s\n", strerror(errno));
 		return -1;
 	}
 
-	if(wifid_cmd_status(status) != 0)
+	if (wifid_cmd_status(status) != 0)
 		return -1;
 
 	msg_fd = *((int *)CMSG_DATA(cmsg));
-	wmg_printf(MSG_DEBUG,"get message reply fd:%d\n",msg_fd);
-	return  msg_fd;
+	wmg_printf(MSG_DEBUG, "get message reply fd:%d\n", msg_fd);
+	return msg_fd;
 }
 
-static int wifi_connect_daemon(const char *interface,struct client *c)
+static int wifi_connect_daemon(const char *interface, struct client *c)
 {
 	int fd, err;
 
-	struct sockaddr_un saddr = { .sun_family = AF_UNIX };
-	snprintf(saddr.sun_path, sizeof(saddr.sun_path) - 1,
-			WIFIDAEMOIN_RUN_STATE_DIR "/%s", interface);
+	struct sockaddr_un saddr = {.sun_family = AF_UNIX};
+	snprintf(saddr.sun_path, sizeof(saddr.sun_path) - 1, WIFIDAEMOIN_RUN_STATE_DIR "/%s", interface);
 
 	if ((fd = socket(PF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0)) == -1)
 		return -1;
 
-	wmg_printf(MSG_DEBUG,"Connecting to socket: %s\n", saddr.sun_path);
+	wmg_printf(MSG_DEBUG, "Connecting to socket: %s\n", saddr.sun_path);
 	if (connect(fd, (struct sockaddr *)(&saddr), sizeof(saddr)) == -1) {
 		err = errno;
 		close(fd);
 		errno = err;
-		wmg_printf(MSG_ERROR,"wifi daemon has been closed,Please open wifi daemon first.\n", saddr.sun_path);
+		wmg_printf(MSG_ERROR, "wifi daemon has been closed,Please open wifi daemon first.\n", saddr.sun_path);
 		return -1;
 	}
-	wmg_printf(MSG_DEBUG,"client fd :%d\n",fd);
+	wmg_printf(MSG_DEBUG, "client fd :%d\n", fd);
 
 	c->da_fd = fd;
 
-	if(c->enable_pipe){
+	if (c->enable_pipe) {
 		c->pipe_fd = get_cmd_msg_transport(fd);
-		if(c->pipe_fd < 0){
-			wmg_printf(MSG_DEBUG,"get message pipe fd failed\n");
+		if (c->pipe_fd < 0) {
+			wmg_printf(MSG_DEBUG, "get message pipe fd failed\n");
 			return -1;
 		}
 	}
@@ -151,31 +149,29 @@ static int wifi_connect_daemon(const char *interface,struct client *c)
 
 void handle_command_free(struct client *c)
 {
-	if(c->da_fd != -1)
+	if (c->da_fd != -1)
 		close(c->da_fd);
-	if(c->enable_pipe && c->pipe_fd != -1)
+	if (c->enable_pipe && c->pipe_fd != -1)
 		close(c->pipe_fd);
-	wmg_printf(MSG_DEBUG,"disconnect from daemon\n");
+	wmg_printf(MSG_DEBUG, "disconnect from daemon\n");
 }
-int handle_command(struct da_requst *ptr_req,struct client *c)
+int handle_command(struct da_requst *ptr_req, struct client *c)
 {
-
-	if(wifi_connect_daemon(CLT_CLIENT_VERSION,c) < 0)
+	if (wifi_connect_daemon(CLT_CLIENT_VERSION, c) < 0)
 		return -1;
 
-	if(wifid_send_request(c->da_fd,ptr_req) < 0)
+	if (wifid_send_request(c->da_fd, ptr_req) < 0)
 		return -1;
-
 }
-int read_command_message(int fd,char *buffer,int len)
+int read_command_message(int fd, char *buffer, int len)
 {
 	int ret = -1;
-	while ((ret = read(fd, buffer,len)) == -1 && errno == EINTR)
+	while ((ret = read(fd, buffer, len)) == -1 && errno == EINTR)
 		continue;
-	if(ret == 0) {
-		wmg_printf(MSG_DEBUG,"message FIFO has been closed:%d\n",fd);
+	if (ret == 0) {
+		wmg_printf(MSG_DEBUG, "message FIFO has been closed:%d\n", fd);
 	}
-	if(errno == EBADF)
+	if (errno == EBADF)
 		ret = 0;
 	return ret;
 }
diff --git a/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.h b/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.h
index 52fd0ab74..eb117bb61 100644
--- a/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.h
+++ b/workspace/tg5040/wifimanager/daemon/wifid_cmd_iface.h
@@ -11,8 +11,8 @@ struct client {
 	bool enable_pipe;
 };
 
-int read_command_message(int fd,char *buffer,int len);
-int handle_command(struct da_requst *ptr_req,struct client *c);
+int read_command_message(int fd, char *buffer, int len);
+int handle_command(struct da_requst *ptr_req, struct client *c);
 void handle_command_free(struct client *c);
 
 #if __cplusplus
diff --git a/workspace/tg5040/wifimanager/daemon/wifid_ctrl.c b/workspace/tg5040/wifimanager/daemon/wifid_ctrl.c
index a4a41f96e..5eee0417e 100644
--- a/workspace/tg5040/wifimanager/daemon/wifid_ctrl.c
+++ b/workspace/tg5040/wifimanager/daemon/wifid_ctrl.c
@@ -1,11 +1,11 @@
 /*
-  * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
-  * Filename    wifid_ctrl.c
-  * Author        laumy <liumingyuan@allwinnertech.com>
-  * Version       0.0.1
-  * Date           2018.11.05
-  *
-  */
+ * Copyright (c) 2018 Allwinner Technology. All Rights Reserved.
+ * Filename    wifid_ctrl.c
+ * Author        laumy <liumingyuan@allwinnertech.com>
+ * Version       0.0.1
+ * Date           2018.11.05
+ *
+ */
 
 #include <stdbool.h>
 #include <errno.h>
@@ -27,41 +27,41 @@
 
 struct da_ctl ctl = {
 	.socket_created = false,
-	.msg_pipe_fd = {-1,-1},
+	.msg_pipe_fd = {-1, -1},
 	.enable = false,
 };
 static int msg_pipe_close(void)
 {
 	int ret = 0;
-	if(ctl.msg_pipe_fd[0] != -1) {
+	if (ctl.msg_pipe_fd[0] != -1) {
 		ret = close(ctl.msg_pipe_fd[0]);
-		if(ret != 0){
-			wmg_printf(MSG_ERROR,"close msg pipe 0:%s\n",strerror(errno));
-		}else {
+		if (ret != 0) {
+			wmg_printf(MSG_ERROR, "close msg pipe 0:%s\n", strerror(errno));
+		} else {
 			ctl.msg_pipe_fd[0] = -1;
 		}
 	}
-	if(ctl.msg_pipe_fd[1] != -1) {
+	if (ctl.msg_pipe_fd[1] != -1) {
 		ret = close(ctl.msg_pipe_fd[1]);
-		if(ret != 0){
-			wmg_printf(MSG_ERROR,"close msg pipe 1:%s\n",strerror(errno));
-		}else {
+		if (ret != 0) {
+			wmg_printf(MSG_ERROR, "close msg pipe 1:%s\n", strerror(errno));
+		} else {
 			ctl.msg_pipe_fd[1] = -1;
 		}
 	}
-	return ret ;
+	return ret;
 }
-static int msg_pipe_write(const char *buffer,size_t len)
+static int msg_pipe_write(const char *buffer, size_t len)
 {
 	int ret = -1;
 	const uint8_t *head = (uint8_t *)buffer;
 	do {
-		ret = write(ctl.msg_pipe_fd[1],head,len);
-		if(ret == -1) {
-			if(errno == EINTR)
+		ret = write(ctl.msg_pipe_fd[1], head, len);
+		if (ret == -1) {
+			if (errno == EINTR)
 				continue;
-			if(errno == EPIPE) {
-				wmg_printf(MSG_ERROR,"FIFO endpoint has been closed: %d\n",ctl.msg_pipe_fd[1]);
+			if (errno == EPIPE) {
+				wmg_printf(MSG_ERROR, "FIFO endpoint has been closed: %d\n", ctl.msg_pipe_fd[1]);
 				goto end;
 			}
 		}
@@ -72,24 +72,24 @@ static int msg_pipe_write(const char *buffer,size_t len)
 end:
 	return ret;
 }
-static void wifid_msg_transport(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface,int fd)
+static void wifid_msg_transport(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
-	wmg_printf(MSG_DEBUG,"ctl msg fd reply start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl msg fd reply start -+- \n");
 
 	if (pipe(ctl.msg_pipe_fd) == -1) {
-		wmg_printf(MSG_ERROR,"Couldn't create FIFO: %s", strerror(errno));
+		wmg_printf(MSG_ERROR, "Couldn't create FIFO: %s", strerror(errno));
 		status = DA_CODE_FAILED;
 		goto final;
 	}
-	wmg_printf(MSG_DEBUG,"created pipe fd[0]=%d,fd[1]=%d\n",ctl.msg_pipe_fd[0],ctl.msg_pipe_fd[1]);
+	wmg_printf(MSG_DEBUG, "created pipe fd[0]=%d,fd[1]=%d\n", ctl.msg_pipe_fd[0], ctl.msg_pipe_fd[1]);
 
 	union {
 		char buf[CMSG_SPACE(sizeof(int))];
 		struct cmsghdr _align;
 	} control_un;
 
-	struct iovec io = { .iov_base = "", .iov_len = 1};
+	struct iovec io = {.iov_base = "", .iov_len = 1};
 	struct msghdr msg = {
 		.msg_iov = &io,
 		.msg_iovlen = 1,
@@ -105,7 +105,7 @@ static void wifid_msg_transport(const struct da_requst *r, const aw_wifi_interfa
 	/*pipe fd[1] must write, pipe fd[0] must read*/
 	*fdptr = ctl.msg_pipe_fd[0];
 
-	if (sendmsg(fd,&msg,0) == -1)
+	if (sendmsg(fd, &msg, 0) == -1)
 		goto fail;
 
 	/*client will read this fd,so close it */
@@ -114,117 +114,115 @@ static void wifid_msg_transport(const struct da_requst *r, const aw_wifi_interfa
 	goto final;
 
 fail:
-	wmg_printf(MSG_ERROR,"send ctl cmd msg fd failed\n");
+	wmg_printf(MSG_ERROR, "send ctl cmd msg fd failed\n");
 	msg_pipe_close();
 final:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl msg fd reply end -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl msg fd reply end -+- \n");
 }
 
-static void wifid_connect(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface,int fd)
+static void wifid_connect(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
 	enum cn_event event = DA_UNKNOWN;
 	enum wmgEvent wmg_event;
 
-	wmg_printf(MSG_DEBUG,"ctl command: connecet start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl command: connecet start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if(r->ssid[0] != '\0') {
-		if(r->pwd[0] != '\0') {
-			p_wifi_interface->connect_ap(r->ssid,r->pwd,fd);
-		}
-		else {
-			char net_id[10]="";
+	if (r->ssid[0] != '\0') {
+		if (r->pwd[0] != '\0') {
+			p_wifi_interface->connect_ap(r->ssid, r->pwd, fd);
+		} else {
+			char net_id[10] = "";
 			int id_len = sizeof(net_id);
 			int ret = p_wifi_interface->get_netid(r->ssid, WIFIMG_WPA2_PSK, net_id, &id_len);
-			if(ret == 0)
+			if (ret == 0)
 				// connect with stored credentials
 				p_wifi_interface->connect_ap_with_netid(net_id, fd);
-			else 
+			else
 				// try empty password
-				p_wifi_interface->connect_ap(r->ssid,r->pwd,fd);
+				p_wifi_interface->connect_ap(r->ssid, r->pwd, fd);
 		}
-	}
-	else {
+	} else {
 		p_wifi_interface->disconnect_ap(fd);
 	}
 
-	if(aw_wifi_get_wifi_state() == NETWORK_CONNECTED){
+	if (aw_wifi_get_wifi_state() == NETWORK_CONNECTED) {
 		event = DA_CONNECTED;
 	} else {
 		wmg_event = aw_wifi_get_wifi_event();
-		wmg_printf(MSG_DEBUG,"wifi manager event:%s\n",wmg_event_txt(wmg_event));
-		switch(wmg_event){
-			case WSE_CONNECTED_TIMEOUT:
-				event = DA_CONNECTED_TIMEOUT;
-				break;
-			case WSE_AP_ASSOC_REJECT:
-				event = DA_AP_ASSOC_REJECT;
-				break;
-			case WSE_NETWORK_NOT_EXIST:
-				event = DA_NETWORK_NOT_FOUND;
-				break;
-			case WSE_PASSWORD_INCORRECT:
-				event = DA_PASSWORD_INCORRECT;
-				break;
-			case WSE_OBTAINED_IP_TIMEOUT:
-				event = DA_OBTAINED_IP_TIMEOUT;
-				break;
-			case WSE_DEV_BUSING:
-				event = DA_DEV_BUSING;
-				break;
-			case WSE_CMD_OR_PARAMS_ERROR:
-				event = DA_CMD_OR_PARAMS_ERROR;
-				break;
-			case WSE_KEYMT_NO_SUPPORT:
-				event = DA_KEYMT_NO_SUPPORT;
-				break;
-			case WSE_WPA_TERMINATING:
-			default:
-				event  = DA_UNKNOWN;
-				break;
+		wmg_printf(MSG_DEBUG, "wifi manager event:%s\n", wmg_event_txt(wmg_event));
+		switch (wmg_event) {
+		case WSE_CONNECTED_TIMEOUT:
+			event = DA_CONNECTED_TIMEOUT;
+			break;
+		case WSE_AP_ASSOC_REJECT:
+			event = DA_AP_ASSOC_REJECT;
+			break;
+		case WSE_NETWORK_NOT_EXIST:
+			event = DA_NETWORK_NOT_FOUND;
+			break;
+		case WSE_PASSWORD_INCORRECT:
+			event = DA_PASSWORD_INCORRECT;
+			break;
+		case WSE_OBTAINED_IP_TIMEOUT:
+			event = DA_OBTAINED_IP_TIMEOUT;
+			break;
+		case WSE_DEV_BUSING:
+			event = DA_DEV_BUSING;
+			break;
+		case WSE_CMD_OR_PARAMS_ERROR:
+			event = DA_CMD_OR_PARAMS_ERROR;
+			break;
+		case WSE_KEYMT_NO_SUPPORT:
+			event = DA_KEYMT_NO_SUPPORT;
+			break;
+		case WSE_WPA_TERMINATING:
+		default:
+			event = DA_UNKNOWN;
+			break;
 		}
 	}
 
-	if(msg_pipe_write((char*)&event,sizeof(event)) >= 0)
+	if (msg_pipe_write((char *)&event, sizeof(event)) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl command: connecet end -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl command: connecet end -+- \n");
 }
-static void wifid_net_status(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface,int fd)
+static void wifid_net_status(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
 	struct wifi_status s = {
-		.state = STATE_UNKNOWN ,
+		.state = STATE_UNKNOWN,
 		.ssid = {'\0'},
 	};
 
-	wmg_printf(MSG_DEBUG,"ctl cmd: status start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: status start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if(p_wifi_interface->get_status(&s) < 0)
+	if (p_wifi_interface->get_status(&s) < 0)
 		goto code_failed;
 
-	if(msg_pipe_write((char*)&s,sizeof(s)) >= 0)
+	if (msg_pipe_write((char *)&s, sizeof(s)) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl cmd: status end -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: status end -+- \n");
 }
 
-static void wifid_connection_info(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface,int fd)
+static void wifid_connection_info(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
 	struct connection_status s = {
@@ -236,47 +234,46 @@ static void wifid_connection_info(const struct da_requst *r, const aw_wifi_inter
 		.noise = -1,
 	};
 
-	wmg_printf(MSG_DEBUG,"ctl cmd: info start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: info start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if(p_wifi_interface->get_connection_info(&s) < 0)
+	if (p_wifi_interface->get_connection_info(&s) < 0)
 		goto code_failed;
 
-	if(msg_pipe_write((char*)&s,sizeof(s)) >= 0)
+	if (msg_pipe_write((char *)&s, sizeof(s)) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl cmd: info end -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: info end -+- \n");
 }
 
-static void wifid_scan(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface,int fd)
+static void wifid_scan(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
 	char scan_results[SCAN_MAX] = {0};
 	int len = SCAN_MAX;
 
-	wmg_printf(MSG_DEBUG,"ctl cmd: scan start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: scan start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if( p_wifi_interface->get_scan_results(scan_results,&len) < 0)
+	if (p_wifi_interface->get_scan_results(scan_results, &len) < 0)
 		goto code_failed;
 
-	if(msg_pipe_write(scan_results,len) >= 0)
+	if (msg_pipe_write(scan_results, len) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl cmd: scan end -+- \n");
-
+	wmg_printf(MSG_DEBUG, "ctl cmd: scan end -+- \n");
 }
 
 static void wifid_list_network(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
@@ -284,43 +281,41 @@ static void wifid_list_network(const struct da_requst *r, const aw_wifi_interfac
 	enum cmd_status status = DA_CMD_SUCCESS;
 	char list_network_results[LIST_NETWORK_MAX] = {0};
 
-	wmg_printf(MSG_DEBUG,"ctl cmd: list network start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl cmd: list network start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if(p_wifi_interface->list_networks(list_network_results,LIST_NETWORK_MAX,fd) < 0)
+	if (p_wifi_interface->list_networks(list_network_results, LIST_NETWORK_MAX, fd) < 0)
 		goto code_failed;
 
-	if(msg_pipe_write(list_network_results,LIST_NETWORK_MAX) >= 0)
+	if (msg_pipe_write(list_network_results, LIST_NETWORK_MAX) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl cmd: list network end -+- \n");
-
+	wmg_printf(MSG_DEBUG, "ctl cmd: list network end -+- \n");
 }
 static void wifid_remove_net(const struct da_requst *r, const aw_wifi_interface_t *p_wifi_interface, int fd)
 {
 	enum cmd_status status = DA_CMD_SUCCESS;
-	struct WmgStaEvt StaEvt = {CONNECTED,WSE_UNKNOWN};
+	struct WmgStaEvt StaEvt = {CONNECTED, WSE_UNKNOWN};
 
-	wmg_printf(MSG_DEBUG,"ctl command: disconnect start -+- \n");
+	wmg_printf(MSG_DEBUG, "ctl command: disconnect start -+- \n");
 
-	if(NULL == p_wifi_interface)
+	if (NULL == p_wifi_interface)
 		goto code_failed;
 
-	if( p_wifi_interface->clear_network(r->ssid) >= 0)
+	if (p_wifi_interface->clear_network(r->ssid) >= 0)
 		goto end;
 
 code_failed:
 	status = DA_CODE_FAILED;
 end:
 	send(fd, &status, sizeof(status), MSG_NOSIGNAL);
-	wmg_printf(MSG_DEBUG,"ctl command: disconnect end -+- \n");
-
+	wmg_printf(MSG_DEBUG, "ctl command: disconnect end -+- \n");
 }
 void da_ctl_free(void)
 {
@@ -351,9 +346,8 @@ int wifi_daemon_ctl_init(void)
 		ctl.pfds[i].fd = -1;
 	}
 
-	struct sockaddr_un saddr = { .sun_family = AF_UNIX };
-	snprintf(saddr.sun_path, sizeof(saddr.sun_path) - 1,
-			WIFIDAEMOIN_RUN_STATE_DIR "/%s", CLT_VERSION);
+	struct sockaddr_un saddr = {.sun_family = AF_UNIX};
+	snprintf(saddr.sun_path, sizeof(saddr.sun_path) - 1, WIFIDAEMOIN_RUN_STATE_DIR "/%s", CLT_VERSION);
 
 	if (mkdir(WIFIDAEMOIN_RUN_STATE_DIR, 0755) == -1 && errno != EEXIST)
 		goto fail;
@@ -376,7 +370,7 @@ int wifi_daemon_ctl_init(void)
 
 void ctl_loop(const aw_wifi_interface_t *p_wifi_interface)
 {
-	static void (*commands[__DA_COMMAND_MAX])(const struct da_requst *,const aw_wifi_interface_t * ,int) = {
+	static void (*commands[__DA_COMMAND_MAX])(const struct da_requst *, const aw_wifi_interface_t *, int) = {
 		[DA_COMMAND_CONNECT] = wifid_connect,
 		[DA_COMMAND_SCAN] = wifid_scan,
 		[DA_COMMAND_REMOVE_NET] = wifid_remove_net,
@@ -386,12 +380,12 @@ void ctl_loop(const aw_wifi_interface_t *p_wifi_interface)
 		[DA_COMMAND_CONNECTION_INFO] = wifid_connection_info,
 	};
 
-	wmg_printf(MSG_INFO,"Starting controller loop\n");
-	while(ctl.enable){
+	wmg_printf(MSG_INFO, "Starting controller loop\n");
+	while (ctl.enable) {
 		if (poll(ctl.pfds, ARRAYSIZE(ctl.pfds), -1) == -1) {
 			if (errno == EINTR)
 				continue;
-			wmg_printf(MSG_ERROR,"Controller poll error: %s", strerror(errno));
+			wmg_printf(MSG_ERROR, "Controller poll error: %s", strerror(errno));
 			break;
 		}
 
@@ -402,50 +396,46 @@ void ctl_loop(const aw_wifi_interface_t *p_wifi_interface)
 		for (i = __CTL_IDX_MAX; i < __CTL_IDX_MAX + WIFI_MAX_CLIENTS; i++) {
 			const int fd = ctl.pfds[i].fd;
 
-			if(fd == -1) {
+			if (fd == -1) {
 				/*pointed to clt.pfds */
 				pfd = &ctl.pfds[i];
 				continue;
 			}
 			if (ctl.pfds[i].revents & POLLIN) {
-
 				struct da_requst request;
 				ssize_t len;
 				if ((len = recv(fd, &request, sizeof(request), MSG_DONTWAIT)) != sizeof(request)) {
 					/* if the request cannot be retrieved, release resources */
 					if (len == 0)
-						wmg_printf(MSG_DEBUG,"Client closed connection: %d\n", fd);
+						wmg_printf(MSG_DEBUG, "Client closed connection: %d\n", fd);
 					else
-						wmg_printf(MSG_DEBUG,"Invalid request length: %zd != %zd\n", len, sizeof(request));
+						wmg_printf(MSG_DEBUG, "Invalid request length: %zd != %zd\n", len, sizeof(request));
 
 					close(fd);
 					ctl.pfds[i].fd = -1;
 
 					/*when client is closed,pipe closed*/
 					msg_pipe_close();
-					wmg_printf(MSG_DEBUG,"+-+-+-+-+-+-+-+-+-+-+-+-+-+-\n\n");
+					wmg_printf(MSG_DEBUG, "+-+-+-+-+-+-+-+-+-+-+-+-+-+-\n\n");
 					continue;
 				}
 
 				/* validate and execute requested command */
 				if (request.command < __DA_COMMAND_MAX && commands[request.command] != NULL)
-					commands[request.command](&request, p_wifi_interface,fd);
+					commands[request.command](&request, p_wifi_interface, fd);
 				else
-					wmg_printf(MSG_WARNING,"Invalid command: %u\n", request.command);
-
+					wmg_printf(MSG_WARNING, "Invalid command: %u\n", request.command);
 			}
-
 		}
 
 		/* process new connections to our controller */
 		if (ctl.pfds[CTL_IDX_SRV].revents & POLLIN && pfd != NULL) {
-
-			struct pollfd fd = { -1, POLLIN, 0 };
+			struct pollfd fd = {-1, POLLIN, 0};
 			uint16_t ver = 0;
 			fd.fd = accept(ctl.pfds[CTL_IDX_SRV].fd, NULL, NULL);
-			wmg_printf(MSG_DEBUG,"+-+-+-+-+-+-+-+-+-+-+-+-+-+-\n");
-			wmg_printf(MSG_DEBUG,"Received new connection: %d\n", fd.fd);
-			//add poll waiting queue
+			wmg_printf(MSG_DEBUG, "+-+-+-+-+-+-+-+-+-+-+-+-+-+-\n");
+			wmg_printf(MSG_DEBUG, "Received new connection: %d\n", fd.fd);
+			// add poll waiting queue
 			pfd->fd = fd.fd;
 		}
 	}
diff --git a/workspace/tg5040/wifimanager/src/core/include/scan.h b/workspace/tg5040/wifimanager/src/core/include/scan.h
old mode 100755
new mode 100644
index 0d8d1cec2..f386daa0c
--- a/workspace/tg5040/wifimanager/src/core/include/scan.h
+++ b/workspace/tg5040/wifimanager/src/core/include/scan.h
@@ -6,11 +6,11 @@
 extern "C" {
 #endif
 
-#define SCAN_BUF_LEN      4096
-#define KEY_NONE_INDEX    0
+#define SCAN_BUF_LEN 4096
+#define KEY_NONE_INDEX 0
 #define KEY_WPA_PSK_INDEX 1
-#define KEY_WEP_INDEX     2
-#define KEY_UNKOWN		  3
+#define KEY_WEP_INDEX 2
+#define KEY_UNKOWN 3
 
 struct net_scan {
 	/* store scan results */
@@ -19,13 +19,13 @@ struct net_scan {
 	unsigned int try_scan_count;
 	bool enable;
 };
-int direct_get_scan_results_inner(char *results,int *len);
+int direct_get_scan_results_inner(char *results, int *len);
 int get_key_mgmt(const char *ssid, int key_mgmt_info[]);
 int isScanEnable();
 
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif /* __NETWORK_MANAGER_H */
diff --git a/workspace/tg5040/wifimanager/src/core/include/status_info.h b/workspace/tg5040/wifimanager/src/core/include/status_info.h
old mode 100755
new mode 100644
index f87dfe01b..40360d896
--- a/workspace/tg5040/wifimanager/src/core/include/status_info.h
+++ b/workspace/tg5040/wifimanager/src/core/include/status_info.h
@@ -6,11 +6,11 @@
 extern "C" {
 #endif
 
-#define WPA_STA_MAX_SSID	 32
+#define WPA_STA_MAX_SSID 32
 /*for compatibility of chinese ssid*/
-#define WPA_STA_MAX_PSSID	 512
-#define WPA_STA_MAX_BSSID	 18
-#define WPA_STA_MAX_IP_ADDR  16
+#define WPA_STA_MAX_PSSID 512
+#define WPA_STA_MAX_BSSID 18
+#define WPA_STA_MAX_IP_ADDR 16
 #define WPA_STA_MAX_KEY_MGMT 16
 #define WPA_STA_MAX_MAC_ADDR 18
 
@@ -28,15 +28,15 @@ enum wpa_states {
 	WPA_GROUP_HANDSHAKE,
 };
 
-struct wpa_status{
-    int id;
-    char bssid[WPA_STA_MAX_BSSID];
-    int freq;
-    char ssid[WPA_STA_MAX_PSSID];
-    enum wpa_states wpa_state;
-    char ip_address[WPA_STA_MAX_IP_ADDR];
-    char key_mgmt[WPA_STA_MAX_KEY_MGMT];
-    char mac_address[WPA_STA_MAX_MAC_ADDR];
+struct wpa_status {
+	int id;
+	char bssid[WPA_STA_MAX_BSSID];
+	int freq;
+	char ssid[WPA_STA_MAX_PSSID];
+	enum wpa_states wpa_state;
+	char ip_address[WPA_STA_MAX_IP_ADDR];
+	char key_mgmt[WPA_STA_MAX_KEY_MGMT];
+	char mac_address[WPA_STA_MAX_MAC_ADDR];
 };
 
 typedef struct signal_status {
@@ -53,7 +53,7 @@ void print_wpa_status();
 void wpa_status_info_free();
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif /* __STATUS_INFO_H */
diff --git a/workspace/tg5040/wifimanager/src/core/include/tool.h b/workspace/tg5040/wifimanager/src/core/include/tool.h
old mode 100755
new mode 100644
index f9daf7ba5..e42c46e53
--- a/workspace/tg5040/wifimanager/src/core/include/tool.h
+++ b/workspace/tg5040/wifimanager/src/core/include/tool.h
@@ -26,15 +26,15 @@ struct sys_time {
 	sys_time_t usec;
 };
 
-extern int get_process_state(const char *process_nae,int length);
+extern int get_process_state(const char *process_nae, int length);
 extern int sys_get_time(struct sys_time *t);
-void * wgos_zalloc(size_t size);
-void * wgos_malloc(size_t size);
+void *wgos_zalloc(size_t size);
+void *wgos_malloc(size_t size);
 
 void ms_sleep(unsigned long ms);
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/wifimanager/src/core/include/wifi.h b/workspace/tg5040/wifimanager/src/core/include/wifi.h
old mode 100755
new mode 100644
index 197a5857c..bfe181688
--- a/workspace/tg5040/wifimanager/src/core/include/wifi.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wifi.h
@@ -122,8 +122,7 @@ int wifi_command(const char *command, char *reply, size_t reply_len);
  *
  * @return 0 if successful, < 0 if error.
  */
-int do_dhcp_request(int *ipaddr, int *gateway, int *mask,
-                   int *dns1, int *dns2, int *server, int *lease);
+int do_dhcp_request(int *ipaddr, int *gateway, int *mask, int *dns1, int *dns2, int *server, int *lease);
 
 /**
  * Return the error string of the last do_dhcp_request().
@@ -133,9 +132,9 @@ const char *get_dhcp_error_string();
 /**
  * Return the path to requested firmware
  */
-#define WIFI_GET_FW_PATH_STA	0
-#define WIFI_GET_FW_PATH_AP	1
-#define WIFI_GET_FW_PATH_P2P	2
+#define WIFI_GET_FW_PATH_STA 0
+#define WIFI_GET_FW_PATH_AP 1
+#define WIFI_GET_FW_PATH_P2P 2
 const char *wifi_get_fw_path(int fw_type);
 
 /**
@@ -146,7 +145,7 @@ int wifi_change_fw_path(const char *fwpath);
 /**
  * Check and create if necessary initial entropy file
  */
-#define WIFI_ENTROPY_FILE	"/data/misc/wifi/entropy.bin"
+#define WIFI_ENTROPY_FILE "/data/misc/wifi/entropy.bin"
 int ensure_entropy_file_exists();
 
 /**
@@ -157,18 +156,20 @@ int ensure_entropy_file_exists();
 #endif
 
 /* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno'
-    set to EINTR.  */
+	set to EINTR.  */
 #ifndef TEMP_FAILURE_RETRY
-#define TEMP_FAILURE_RETRY(expression) \
-   (__extension__                                                              \
-     ({ long int __result;                                                     \
-        do __result = (long int) (expression);                                 \
-        while (__result == -1L && errno == EINTR);                             \
-        __result; }))
+#define TEMP_FAILURE_RETRY(expression)                                                                                 \
+	(__extension__({                                                                                                   \
+		long int __result;                                                                                             \
+		do                                                                                                             \
+			__result = (long int)(expression);                                                                         \
+		while (__result == -1L && errno == EINTR);                                                                     \
+		__result;                                                                                                      \
+	}))
 #endif
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
-#endif  // _WIFI_H
+#endif // _WIFI_H
diff --git a/workspace/tg5040/wifimanager/src/core/include/wifi_event.h b/workspace/tg5040/wifimanager/src/core/include/wifi_event.h
old mode 100755
new mode 100644
index 0c4095bd8..4979cf2f7
--- a/workspace/tg5040/wifimanager/src/core/include/wifi_event.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wifi_event.h
@@ -9,28 +9,28 @@
 extern "C" {
 #endif
 
-#define MAX_ASSOC_REJECT_COUNT  5
+#define MAX_ASSOC_REJECT_COUNT 5
 #define MAX_RETRIES_ON_AUTHENTICATION_FAILURE 2
 
-enum wpaEvent{
-    WPAE_CONNECTED = 1,
-    WPAE_DISCONNECTED,
-    WPAE_STATE_CHANGE,
-    WPAE_SCAN_FAILED,
-    WPAE_SCAN_RESULTS,
-    WPAE_LINK_SPEED,
-    WPAE_TERMINATING,
-    WPAE_DRIVER_STATE,
-    WPAE_EAP_FAILURE,
-    WPAE_ASSOC_REJECT,
-    WPAE_NETWORK_NOT_FOUND,
-    WPAE_PASSWORD_INCORRECT,
-    WPAE_UNKNOWN,
+enum wpaEvent {
+	WPAE_CONNECTED = 1,
+	WPAE_DISCONNECTED,
+	WPAE_STATE_CHANGE,
+	WPAE_SCAN_FAILED,
+	WPAE_SCAN_RESULTS,
+	WPAE_LINK_SPEED,
+	WPAE_TERMINATING,
+	WPAE_DRIVER_STATE,
+	WPAE_EAP_FAILURE,
+	WPAE_ASSOC_REJECT,
+	WPAE_NETWORK_NOT_FOUND,
+	WPAE_PASSWORD_INCORRECT,
+	WPAE_UNKNOWN,
 };
 
 #define NET_ID_LEN 10
 
-struct wpaManager{
+struct wpaManager {
 	enum wpaEvent evt;
 	int evtFd[2];
 	bool EvtSocketEnable;
@@ -49,7 +49,7 @@ void wifi_stop_event_loop();
 void start_wifi_on_check_connect_timeout();
 void start_check_connect_timeout();
 void set_scan_start_flag();
-int  get_scan_status();
+int get_scan_status();
 int add_wifi_state_callback_inner(tWifi_state_callback pcb);
 int call_state_callback_function(struct Manager *w, int state_label);
 int reset_wifi_state_callback();
@@ -63,7 +63,7 @@ int evtSend(enum wpaEvent event);
 int evtRead(enum wpaEvent *event);
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif /*__WIFI_EVENT_H*/
diff --git a/workspace/tg5040/wifimanager/src/core/include/wifi_intf.h b/workspace/tg5040/wifimanager/src/core/include/wifi_intf.h
old mode 100755
new mode 100644
index f41395b18..35bcb931d
--- a/workspace/tg5040/wifimanager/src/core/include/wifi_intf.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wifi_intf.h
@@ -8,14 +8,14 @@
 #if __cplusplus
 extern "C" {
 #endif
-#define MAX_CALLBCAKS_COUNT  1024
+#define MAX_CALLBCAKS_COUNT 1024
 
 typedef enum {
 	WIFIMG_NONE = 0,
 	WIFIMG_WPA_PSK,
 	WIFIMG_WPA2_PSK,
 	WIFIMG_WEP,
-}tKEY_MGMT;
+} tKEY_MGMT;
 
 enum wmgState {
 	NETWORK_CONNECTED = 0x01,
@@ -26,7 +26,7 @@ enum wmgState {
 	STATE_UNKNOWN,
 };
 
-enum wmgEvent{
+enum wmgEvent {
 	WSE_UNKNOWN = 0x20,
 
 	WSE_STARTUP_AUTO_CONNECT,
@@ -50,7 +50,7 @@ enum wmgEvent{
 };
 
 #define SSID_MAX 64
-#define PWD	 48
+#define PWD 48
 
 struct WmgStaEvt {
 	enum wmgState state;
@@ -69,9 +69,9 @@ struct Manager {
 };
 
 typedef struct connection_status {
-    char ssid[SSID_MAX];
-    char ip_address[32];
-    int freq;
+	char ssid[SSID_MAX];
+	char ip_address[32];
+	int freq;
 	int rssi;
 	int link_speed;
 	int noise;
@@ -79,9 +79,9 @@ typedef struct connection_status {
 
 extern struct Manager *w;
 
-typedef void (*tWifi_state_callback)(struct Manager *wmg,int state_label);
+typedef void (*tWifi_state_callback)(struct Manager *wmg, int state_label);
 
-typedef struct{
+typedef struct {
 	int (*add_state_callback)(tWifi_state_callback pcb);
 	int (*ssid_is_connected_ap)(char *ssid);
 	int (*is_ap_connected)(char *ssid, int *len);
@@ -100,9 +100,9 @@ typedef struct{
 	int (*get_status)(struct wifi_status *s);
 	int (*clear_network)(const char *ssid);
 	int (*wps_pbc)(int event_label);
-}aw_wifi_interface_t;
+} aw_wifi_interface_t;
 
-const aw_wifi_interface_t * aw_wifi_on(tWifi_state_callback pcb,int event_label);
+const aw_wifi_interface_t *aw_wifi_on(tWifi_state_callback pcb, int event_label);
 int aw_wifi_off(const aw_wifi_interface_t *p_wifi_interface_t);
 int state_event_change(int event_label);
 const char *wmg_event_txt(enum wmgEvent event);
@@ -113,7 +113,7 @@ enum wmgState aw_wifi_get_wifi_state();
 enum wmgEvent aw_wifi_get_wifi_event();
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/wifimanager/src/core/include/wifi_udhcpc.h b/workspace/tg5040/wifimanager/src/core/include/wifi_udhcpc.h
old mode 100755
new mode 100644
index e61501a1d..6d0aac00c
--- a/workspace/tg5040/wifimanager/src/core/include/wifi_udhcpc.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wifi_udhcpc.h
@@ -9,7 +9,7 @@ void start_udhcpc();
 int is_ip_exist();
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/wifimanager/src/core/include/wmg_debug.h b/workspace/tg5040/wifimanager/src/core/include/wmg_debug.h
old mode 100755
new mode 100644
index f0e5b67de..11c0bfce7
--- a/workspace/tg5040/wifimanager/src/core/include/wmg_debug.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wmg_debug.h
@@ -10,22 +10,26 @@ extern int wmg_debug_show_keys;
 extern int wmg_debug_timestap;
 
 #ifdef __GNUC__
-#define PRINTF_FORMAT(a,b) __attribute__ ((format (printf, (a), (b))))
-#define STRUCT_PACKED __attribute__ ((packed))
+#define PRINTF_FORMAT(a, b) __attribute__((format(printf, (a), (b))))
+#define STRUCT_PACKED __attribute__((packed))
 #else
-#define PRINTF_FORMAT(a,b)
+#define PRINTF_FORMAT(a, b)
 #define STRUCT_PACKED
 #endif
 
-enum {
-	MSG_ERROR=0, MSG_WARNING, MSG_INFO,MSG_DEBUG, MSG_MSGDUMP, MSG_EXCESSIVE
-};
+enum { MSG_ERROR = 0, MSG_WARNING, MSG_INFO, MSG_DEBUG, MSG_MSGDUMP, MSG_EXCESSIVE };
 
 #ifdef CONFIG_NO_STDOUT_DEBUG
 
-#define wmg_printf(args...) do { } while (0)
-#define wmg_debug_open_file(p) do { } while (0)
-#define wmg_debug_close_file() do { } while (0)
+#define wmg_printf(args...)                                                                                            \
+	do {                                                                                                               \
+	} while (0)
+#define wmg_debug_open_file(p)                                                                                         \
+	do {                                                                                                               \
+	} while (0)
+#define wmg_debug_close_file()                                                                                         \
+	do {                                                                                                               \
+	} while (0)
 
 #else
 int wmg_debug_open_file(const char *path);
@@ -37,20 +41,17 @@ int wmg_get_debug_level();
 
 
 #ifdef CONFIG_DEBUG_FUNCTION_LINE
-#define wmg_printf(level,fmt,arg...) \
-	wmg_print(level,"<%s:%u>:" fmt "",__FUNCTION__,__LINE__,##arg)
+#define wmg_printf(level, fmt, arg...) wmg_print(level, "<%s:%u>:" fmt "", __FUNCTION__, __LINE__, ##arg)
 #else
-#define wmg_printf(level,fmt,arg...) \
-	wmg_print(level,fmt,##arg)
+#define wmg_printf(level, fmt, arg...) wmg_print(level, fmt, ##arg)
 #endif /*CONFIG_DEBUG_FUNCTION_LINE*/
 
-void wmg_print(int level, const char *fmt, ...)
-PRINTF_FORMAT(2, 3);
+void wmg_print(int level, const char *fmt, ...) PRINTF_FORMAT(2, 3);
 
-#endif/* CONFIG_NO_STDOUT_DEBUG */
+#endif /* CONFIG_NO_STDOUT_DEBUG */
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif
diff --git a/workspace/tg5040/wifimanager/src/core/include/wpa_ctrl.h b/workspace/tg5040/wifimanager/src/core/include/wpa_ctrl.h
old mode 100755
new mode 100644
index 725d5d631..741ef6ca5
--- a/workspace/tg5040/wifimanager/src/core/include/wpa_ctrl.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wpa_ctrl.h
@@ -9,7 +9,7 @@
 #ifndef WPA_CTRL_H
 #define WPA_CTRL_H
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -218,25 +218,25 @@ extern "C" {
 
 /* BSS command information masks */
 
-#define WPA_BSS_MASK_ALL		0xFFFDFFFF
-#define WPA_BSS_MASK_ID			BIT(0)
-#define WPA_BSS_MASK_BSSID		BIT(1)
-#define WPA_BSS_MASK_FREQ		BIT(2)
-#define WPA_BSS_MASK_BEACON_INT		BIT(3)
-#define WPA_BSS_MASK_CAPABILITIES	BIT(4)
-#define WPA_BSS_MASK_QUAL		BIT(5)
-#define WPA_BSS_MASK_NOISE		BIT(6)
-#define WPA_BSS_MASK_LEVEL		BIT(7)
-#define WPA_BSS_MASK_TSF		BIT(8)
-#define WPA_BSS_MASK_AGE		BIT(9)
-#define WPA_BSS_MASK_IE			BIT(10)
-#define WPA_BSS_MASK_FLAGS		BIT(11)
-#define WPA_BSS_MASK_SSID		BIT(12)
-#define WPA_BSS_MASK_WPS_SCAN		BIT(13)
-#define WPA_BSS_MASK_P2P_SCAN		BIT(14)
-#define WPA_BSS_MASK_INTERNETW		BIT(15)
-#define WPA_BSS_MASK_WIFI_DISPLAY	BIT(16)
-#define WPA_BSS_MASK_DELIM		BIT(17)
+#define WPA_BSS_MASK_ALL 0xFFFDFFFF
+#define WPA_BSS_MASK_ID BIT(0)
+#define WPA_BSS_MASK_BSSID BIT(1)
+#define WPA_BSS_MASK_FREQ BIT(2)
+#define WPA_BSS_MASK_BEACON_INT BIT(3)
+#define WPA_BSS_MASK_CAPABILITIES BIT(4)
+#define WPA_BSS_MASK_QUAL BIT(5)
+#define WPA_BSS_MASK_NOISE BIT(6)
+#define WPA_BSS_MASK_LEVEL BIT(7)
+#define WPA_BSS_MASK_TSF BIT(8)
+#define WPA_BSS_MASK_AGE BIT(9)
+#define WPA_BSS_MASK_IE BIT(10)
+#define WPA_BSS_MASK_FLAGS BIT(11)
+#define WPA_BSS_MASK_SSID BIT(12)
+#define WPA_BSS_MASK_WPS_SCAN BIT(13)
+#define WPA_BSS_MASK_P2P_SCAN BIT(14)
+#define WPA_BSS_MASK_INTERNETW BIT(15)
+#define WPA_BSS_MASK_WIFI_DISPLAY BIT(16)
+#define WPA_BSS_MASK_DELIM BIT(17)
 
 
 /* wpa_supplicant/hostapd control interface access */
@@ -251,7 +251,7 @@ extern "C" {
  * is configured in wpa_supplicant/hostapd and other progras using the control
  * interface need to use matching path configuration.
  */
-struct wpa_ctrl * wpa_ctrl_open(const char *ctrl_path);
+struct wpa_ctrl *wpa_ctrl_open(const char *ctrl_path);
 
 
 /**
@@ -289,9 +289,8 @@ void wpa_ctrl_close(struct wpa_ctrl *ctrl);
  * receiving event messages, in other words, call wpa_ctrl_attach() only for
  * the control interface connection that will be used for event messages.
  */
-int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len,
-		     char *reply, size_t *reply_len,
-		     void (*msg_cb)(char *msg, size_t len));
+int wpa_ctrl_request(struct wpa_ctrl *ctrl, const char *cmd, size_t cmd_len, char *reply, size_t *reply_len,
+					 void (*msg_cb)(char *msg, size_t len));
 
 
 /**
@@ -363,7 +362,7 @@ int wpa_ctrl_pending(struct wpa_ctrl *ctrl);
  */
 int wpa_ctrl_get_fd(struct wpa_ctrl *ctrl);
 
-char * wpa_ctrl_get_remote_ifnae(struct wpa_ctrl *ctrl);
+char *wpa_ctrl_get_remote_ifnae(struct wpa_ctrl *ctrl);
 
 #ifdef ANDROID
 /**
@@ -382,10 +381,10 @@ void wpa_ctrl_cleanup(void);
 #define WPA_CTRL_IFACE_PORT_LIMIT 50 /* decremented from start */
 #define WPA_GLOBAL_CTRL_IFACE_PORT 9878
 #define WPA_GLOBAL_CTRL_IFACE_PORT_LIMIT 20 /* incremented from start */
-#endif /* CONFIG_CTRL_IFACE_UDP */
+#endif										/* CONFIG_CTRL_IFACE_UDP */
 
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/workspace/tg5040/wifimanager/src/core/include/wpa_supplicant_conf.h b/workspace/tg5040/wifimanager/src/core/include/wpa_supplicant_conf.h
old mode 100755
new mode 100644
index 1f348b31f..deea94a7a
--- a/workspace/tg5040/wifimanager/src/core/include/wpa_supplicant_conf.h
+++ b/workspace/tg5040/wifimanager/src/core/include/wpa_supplicant_conf.h
@@ -7,7 +7,7 @@ extern "C" {
 
 #include "wifi_intf.h"
 
-#define CMD_LEN        255
+#define CMD_LEN 255
 #define REPLY_BUF_SIZE 4096 // wpa_supplicant's maximum size.
 
 
@@ -23,7 +23,7 @@ int wpa_conf_remove_all_networks();
 int wpa_conf_remove_maxnetid_network();
 
 #if __cplusplus
-};  // extern "C"
+}; // extern "C"
 #endif
 
 #endif /* __WPA_SUPPLICANT_CONF_H */
diff --git a/workspace/tg5040/wifimanager/src/core/scan.c b/workspace/tg5040/wifimanager/src/core/scan.c
old mode 100755
new mode 100644
index 3834caa4b..d8c4b84eb
--- a/workspace/tg5040/wifimanager/src/core/scan.c
+++ b/workspace/tg5040/wifimanager/src/core/scan.c
@@ -1,8 +1,8 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<unistd.h>
-#include<errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include "wifi_event.h"
 #include "scan.h"
@@ -10,8 +10,8 @@
 #include "wifi.h"
 #include "wmg_debug.h"
 #include "tool.h"
-#define WAITING_CLK_COUNTS   50
-#define SSID_LEN	512
+#define WAITING_CLK_COUNTS 50
+#define SSID_LEN 512
 #define TRY_SAN_MAX 6
 
 static struct net_scan scan = {
@@ -22,64 +22,58 @@ static struct net_scan scan = {
 
 int remove_slash_from_scan_results()
 {
-    char *ptr = NULL;
-    char *ptr_s = NULL;
-    char *ftr = NULL;
-
-    ptr_s = scan.results;
-    while(1)
-    {
-        ptr = strchr(ptr_s,'\"');
-	if(ptr == NULL)
-	    break;
-
-        ptr_s = ptr;
-        if((*(ptr-1)) == '\\')
-	{
-            ftr = ptr;
-            ptr -= 1;
-            while(*ftr != '\0')
-                *(ptr++) = *(ftr++);
-            *ptr = '\0';
-            continue; //restart new search at ptr_s after removing slash
+	char *ptr = NULL;
+	char *ptr_s = NULL;
+	char *ftr = NULL;
+
+	ptr_s = scan.results;
+	while (1) {
+		ptr = strchr(ptr_s, '\"');
+		if (ptr == NULL)
+			break;
+
+		ptr_s = ptr;
+		if ((*(ptr - 1)) == '\\') {
+			ftr = ptr;
+			ptr -= 1;
+			while (*ftr != '\0')
+				*(ptr++) = *(ftr++);
+			*ptr = '\0';
+			continue; // restart new search at ptr_s after removing slash
+		} else
+			ptr_s++; // restart new search at ptr_s++
 	}
-        else
-            ptr_s++; //restart new search at ptr_s++
-    }
-
-    ptr_s = scan.results;
-    while(1)
-    {
-        ptr = strchr(ptr_s,'\\');
-	if(ptr == NULL)
-	    break;
-
-        ptr_s = ptr;
-        if((*(ptr-1)) == '\\')
-	{
-            ftr = ptr;
-            ptr -= 1;
-            while(*ftr != '\0')
-                *(ptr++) = *(ftr++);
-            *ptr = '\0';
-            continue; //restart new search at ptr_s after removing slash
+
+	ptr_s = scan.results;
+	while (1) {
+		ptr = strchr(ptr_s, '\\');
+		if (ptr == NULL)
+			break;
+
+		ptr_s = ptr;
+		if ((*(ptr - 1)) == '\\') {
+			ftr = ptr;
+			ptr -= 1;
+			while (*ftr != '\0')
+				*(ptr++) = *(ftr++);
+			*ptr = '\0';
+			continue; // restart new search at ptr_s after removing slash
+		} else
+			ptr_s++; // restart new search at ptr_s++
 	}
-        else
-            ptr_s++; //restart new search at ptr_s++
-    }
 
-    return 0;
+	return 0;
 }
 
 int isScanEnable()
 {
-	if(scan.enable)
+	if (scan.enable)
 		return 1;
 	else
 		return 0;
 }
 
-int direct_get_scan_results_inner(char *results,int *len)
+int direct_get_scan_results_inner(char *results, int *len)
 {
 	char cmd[16] = {0};
 	char reply[16] = {0};
@@ -89,19 +83,19 @@ int direct_get_scan_results_inner(char *results,int *len)
 	int index;
 	int flags;
 	enum wpaEvent event;
-	while(1) {
+	while (1) {
 		/* clear scan.sockets data before sending scan command*/
 
 		clearEvtSocket();
 
 		scan.enable = true;
 
-		strncpy(cmd,"SCAN",15);
+		strncpy(cmd, "SCAN", 15);
 		ret = wifi_command(cmd, reply, sizeof(reply));
-		if(ret) {
-			wmg_printf(MSG_DEBUG,"wifimanger send scan error:%s\n",reply);
-			if(strncmp(reply,"FAIL-BUSY",9) == 0) {
-				wmg_printf(MSG_DEBUG,"wpa_supplicant is scanning internally\n");
+		if (ret) {
+			wmg_printf(MSG_DEBUG, "wifimanger send scan error:%s\n", reply);
+			if (strncmp(reply, "FAIL-BUSY", 9) == 0) {
+				wmg_printf(MSG_DEBUG, "wpa_supplicant is scanning internally\n");
 				event = WPAE_SCAN_RESULTS;
 				/*Wpa_supplicant is scanning internally ,so get he scan results directly*/
 				goto scan_resluts;
@@ -110,54 +104,54 @@ int direct_get_scan_results_inner(char *results,int *len)
 			}
 		}
 
-read_event:
+	read_event:
 		ret = evtRead(&event);
 
 		/*read the non-scan event ,try to read event again.*/
-		if((event == WPAE_DISCONNECTED) || (event == WPAE_NETWORK_NOT_FOUND)) {
-			wmg_printf(MSG_WARNING,"read event again......\n");
+		if ((event == WPAE_DISCONNECTED) || (event == WPAE_NETWORK_NOT_FOUND)) {
+			wmg_printf(MSG_WARNING, "read event again......\n");
 			goto read_event;
 		}
 
 		/*send scan command failed ,try to scan again.*/
-		if(event == WPAE_SCAN_FAILED) {
-			wmg_printf(MSG_WARNING,"scan again......\n");
-			scan.try_scan_count ++;
-			if(scan.try_scan_count > TRY_SAN_MAX){
-				wmg_printf(MSG_WARNING,"send scan cmd failed\n");
+		if (event == WPAE_SCAN_FAILED) {
+			wmg_printf(MSG_WARNING, "scan again......\n");
+			scan.try_scan_count++;
+			if (scan.try_scan_count > TRY_SAN_MAX) {
+				wmg_printf(MSG_WARNING, "send scan cmd failed\n");
 				return -1;
 			}
 			sleep(1);
 			continue;
 		}
-scan_resluts:
-		if(event == WPAE_SCAN_RESULTS){
-			strncpy(cmd,"SCAN_RESULTS",15);
-			cmd[15]= '\0';
-			ret = wifi_command(cmd,scan.results,sizeof(scan.results));
-			if(ret) {
-				wmg_printf(MSG_ERROR,"do scan results error!\n");
+	scan_resluts:
+		if (event == WPAE_SCAN_RESULTS) {
+			strncpy(cmd, "SCAN_RESULTS", 15);
+			cmd[15] = '\0';
+			ret = wifi_command(cmd, scan.results, sizeof(scan.results));
+			if (ret) {
+				wmg_printf(MSG_ERROR, "do scan results error!\n");
 				return -1;
 			}
 			remove_slash_from_scan_results();
-			scan.results_len =  strlen(scan.results);
+			scan.results_len = strlen(scan.results);
 		} else {
-			wmg_printf(MSG_ERROR,"read scan data is failed\n");
+			wmg_printf(MSG_ERROR, "read scan data is failed\n");
 			return -1;
 		}
 
 		scan.enable = false;
 
-		if(NULL == results || NULL == len)
+		if (NULL == results || NULL == len)
 			return 0;
 
-		if(*len <= scan.results_len) {
-			wmg_printf(MSG_WARNING,"Scan result overflow,%d < %d\n",*len,scan.results_len);
-			strncpy(results, scan.results, *len-1);
-			index = *len -1;
+		if (*len <= scan.results_len) {
+			wmg_printf(MSG_WARNING, "Scan result overflow,%d < %d\n", *len, scan.results_len);
+			strncpy(results, scan.results, *len - 1);
+			index = *len - 1;
 			results[index] = '\0';
-			ptr=strrchr(results, '\n');
-			if(ptr != NULL) {
+			ptr = strrchr(results, '\n');
+			if (ptr != NULL) {
 				*ptr = '\0';
 			}
 		} else {
@@ -172,110 +166,107 @@ int direct_get_scan_results_inner(char *results,int *len)
 
 int is_network_exist(const char *ssid, tKEY_MGMT key_mgmt)
 {
-    int ret = 0, i = 0, key[4] = {0};
-
-    for(i=0; i<4; i++){
-        key[i]=0;
-    }
-
-    get_key_mgmt(ssid, key);
-    if(key_mgmt == WIFIMG_NONE){
-        if(key[0] == 1){
-            ret = 1;
-        }
-    }else if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
-        if(key[1] == 1){
-            ret = 1;
-        }
-    }else if(key_mgmt == WIFIMG_WEP){
-        if(key[2] == 1){
-            ret = 1;
-        }
-    }else{
-        ;
-    }
-
-    return ret;
+	int ret = 0, i = 0, key[4] = {0};
+
+	for (i = 0; i < 4; i++) {
+		key[i] = 0;
+	}
+
+	get_key_mgmt(ssid, key);
+	if (key_mgmt == WIFIMG_NONE) {
+		if (key[0] == 1) {
+			ret = 1;
+		}
+	} else if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
+		if (key[1] == 1) {
+			ret = 1;
+		}
+	} else if (key_mgmt == WIFIMG_WEP) {
+		if (key[2] == 1) {
+			ret = 1;
+		}
+	} else {
+		;
+	}
+
+	return ret;
 }
 
 int get_key_mgmt(const char *ssid, int key_mgmt_info[])
 {
-    char *ptr = NULL, *pssid_start = NULL, *pssid_end = NULL;
-    char *pst = NULL, *pend = NULL;
-    char *pflag = NULL;
-    char flag[128], pssid[SSID_LEN + 1];
-    int  len = 0, i = 0;
+	char *ptr = NULL, *pssid_start = NULL, *pssid_end = NULL;
+	char *pst = NULL, *pend = NULL;
+	char *pflag = NULL;
+	char flag[128], pssid[SSID_LEN + 1];
+	int len = 0, i = 0;
 
-    wmg_printf(MSG_DEBUG,"enter get_key_mgmt, ssid %s\n", ssid);
+	wmg_printf(MSG_DEBUG, "enter get_key_mgmt, ssid %s\n", ssid);
 
-    key_mgmt_info[KEY_NONE_INDEX] = 0;
-    key_mgmt_info[KEY_WEP_INDEX] = 0;
-    key_mgmt_info[KEY_WPA_PSK_INDEX] = 0;
+	key_mgmt_info[KEY_NONE_INDEX] = 0;
+	key_mgmt_info[KEY_WEP_INDEX] = 0;
+	key_mgmt_info[KEY_WPA_PSK_INDEX] = 0;
 	key_mgmt_info[KEY_UNKOWN] = 0;
-    /* first line end */
-	if(direct_get_scan_results_inner(NULL,NULL) != 0) {
-		wmg_printf(MSG_WARNING,"get scan result is null\n");
+	/* first line end */
+	if (direct_get_scan_results_inner(NULL, NULL) != 0) {
+		wmg_printf(MSG_WARNING, "get scan result is null\n");
 		return 0;
 	}
 
 	len = strlen(scan.results);
 
-	if(len <= 48) {
-		wmg_printf(MSG_ERROR,"get scan results is null\n");
+	if (len <= 48) {
+		wmg_printf(MSG_ERROR, "get scan results is null\n");
 		return 0;
 	}
 
-    ptr = strchr(scan.results, '\n');
-	ptr ++;
-    while(1){
-        /* line end */
-        pend = strchr(ptr, '\n');
-        if (pend != NULL){
-            *pend = '\0';
-        }
-
-        /* line start */
-        pst = ptr;
-
-        /* abstract ssid */
-        pssid_start = strrchr(pst, '\t') + 1;
-        strncpy(pssid, pssid_start, SSID_LEN);
-        pssid[SSID_LEN] = '\0';
-
-        /* find ssid in scan results */
-	if(strcmp(pssid, ssid) == 0){
-	    pflag = pst;
-            for(i=0; i<3; i++){
-                pflag = strchr(pflag, '\t');
-                pflag++;
-            }
-
-            len = pssid_start - pflag;
-            len = len - 1;
-            strncpy(flag, pflag, len);
-            flag[len] = '\0';
-            wmg_printf(MSG_DEBUG,"ssid %s, flag %s\n", ssid, flag);
-            if((strstr(flag, "WPA-PSK-") != NULL)
-	    || (strstr(flag, "WPA2-PSK-") != NULL)){
-                key_mgmt_info[KEY_WPA_PSK_INDEX] = 1;
-            }else if(strstr(flag, "WEP") != NULL){
-                key_mgmt_info[KEY_WEP_INDEX] = 1;
-            }else if((strcmp(flag, "[ESS]") == 0) || (strcmp(flag, "[WPS][ESS]") == 0)){
-                key_mgmt_info[KEY_NONE_INDEX] = 1;
-            }else{
-                key_mgmt_info[KEY_UNKOWN] = 1;
-	    }
-        }
-
-        if(pend != NULL){
-            *pend = '\n';
-            //point next line
-            ptr = pend+1;
-        }else{
-            break;
-        }
-    }
-    return 0;
+	ptr = strchr(scan.results, '\n');
+	ptr++;
+	while (1) {
+		/* line end */
+		pend = strchr(ptr, '\n');
+		if (pend != NULL) {
+			*pend = '\0';
+		}
 
+		/* line start */
+		pst = ptr;
 
+		/* abstract ssid */
+		pssid_start = strrchr(pst, '\t') + 1;
+		strncpy(pssid, pssid_start, SSID_LEN);
+		pssid[SSID_LEN] = '\0';
+
+		/* find ssid in scan results */
+		if (strcmp(pssid, ssid) == 0) {
+			pflag = pst;
+			for (i = 0; i < 3; i++) {
+				pflag = strchr(pflag, '\t');
+				pflag++;
+			}
+
+			len = pssid_start - pflag;
+			len = len - 1;
+			strncpy(flag, pflag, len);
+			flag[len] = '\0';
+			wmg_printf(MSG_DEBUG, "ssid %s, flag %s\n", ssid, flag);
+			if ((strstr(flag, "WPA-PSK-") != NULL) || (strstr(flag, "WPA2-PSK-") != NULL)) {
+				key_mgmt_info[KEY_WPA_PSK_INDEX] = 1;
+			} else if (strstr(flag, "WEP") != NULL) {
+				key_mgmt_info[KEY_WEP_INDEX] = 1;
+			} else if ((strcmp(flag, "[ESS]") == 0) || (strcmp(flag, "[WPS][ESS]") == 0)) {
+				key_mgmt_info[KEY_NONE_INDEX] = 1;
+			} else {
+				key_mgmt_info[KEY_UNKOWN] = 1;
+			}
+		}
+
+		if (pend != NULL) {
+			*pend = '\n';
+			// point next line
+			ptr = pend + 1;
+		} else {
+			break;
+		}
+	}
+	return 0;
 }
diff --git a/workspace/tg5040/wifimanager/src/core/status_info.c b/workspace/tg5040/wifimanager/src/core/status_info.c
old mode 100755
new mode 100644
index 49d87007f..1d925af3d
--- a/workspace/tg5040/wifimanager/src/core/status_info.c
+++ b/workspace/tg5040/wifimanager/src/core/status_info.c
@@ -1,7 +1,7 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 #include "status_info.h"
 #include "wifi_intf.h"
@@ -11,39 +11,39 @@
 static struct wpa_status *ptrStaInfo;
 enum wpa_states wpa_supplicant_state_convert(char *str)
 {
-	if(!strncmp(str,"DISCONNECTED",16)){
+	if (!strncmp(str, "DISCONNECTED", 16)) {
 		return WPA_DISCONNECTED;
 	}
-	if(!strncmp(str,"INTERFACE_DISABLED",22)){
+	if (!strncmp(str, "INTERFACE_DISABLED", 22)) {
 		return WPA_INTERFACE_DISABLED;
 	}
-	if(!strncmp(str,"INACTIVE",12)){
+	if (!strncmp(str, "INACTIVE", 12)) {
 		return WPA_INACTIVE;
 	}
-	if(!strncmp(str,"SCANNING",12)){
+	if (!strncmp(str, "SCANNING", 12)) {
 		return WPA_SCANNING;
 	}
-	if(!strncmp(str,"AUTHENTICATING",18)){
+	if (!strncmp(str, "AUTHENTICATING", 18)) {
 		return WPA_AUTHENTICATING;
 	}
-	if(!strncmp(str,"ASSOCIATED",14)){
+	if (!strncmp(str, "ASSOCIATED", 14)) {
 		return WPA_ASSOCIATED;
 	}
-	if(!strncmp(str,"4WAY_HANDSHAKE",19)){
+	if (!strncmp(str, "4WAY_HANDSHAKE", 19)) {
 		return WPA_4WAY_HANDSHAKE;
 	}
-	if(!strncmp(str,"GROUP_HANDSHAKE",19)){
+	if (!strncmp(str, "GROUP_HANDSHAKE", 19)) {
 		return WPA_GROUP_HANDSHAKE;
 	}
-	if(!strncmp(str,"COMPLETED",13)){
+	if (!strncmp(str, "COMPLETED", 13)) {
 		return WPA_COMPLETED;
 	}
-	if(!strncmp(str,"DISCONNECTED",16)){
+	if (!strncmp(str, "DISCONNECTED", 16)) {
 		return WPA_DISCONNECTED;
 	}
 	return WPA_UNKNOWN;
 }
-static const char * wpa_supplicant_state_txt(enum wpa_states state)
+static const char *wpa_supplicant_state_txt(enum wpa_states state)
 {
 	switch (state) {
 	case WPA_DISCONNECTED:
@@ -72,158 +72,157 @@ static const char * wpa_supplicant_state_txt(enum wpa_states state)
 }
 void print_wpa_status()
 {
-	wmg_printf(MSG_DEBUG,"obtained wpa_supplicant status,as follow:\n");
-    wmg_printf(MSG_DEBUG,"==============================\n");
-    if(ptrStaInfo->id >= 0)
-        wmg_printf(MSG_DEBUG,"id:%d\n",ptrStaInfo->id);
-    if(ptrStaInfo->bssid)
-        wmg_printf(MSG_DEBUG,"bssid:%s\n",ptrStaInfo->bssid);
-    if(ptrStaInfo->freq >=0)
-        wmg_printf(MSG_DEBUG,"freq:%d\n",ptrStaInfo->freq);
-    if(ptrStaInfo->ssid)
-        wmg_printf(MSG_DEBUG,"ssid:%s\n",ptrStaInfo->ssid);
-    if(ptrStaInfo->wpa_state)
-        wmg_printf(MSG_DEBUG,"wpa_state:%s\n",wpa_supplicant_state_txt(ptrStaInfo->wpa_state));
-    if(ptrStaInfo->ip_address)
-        wmg_printf(MSG_DEBUG,"ip_address:%s\n",ptrStaInfo->ip_address);
-    if(ptrStaInfo->key_mgmt)
-        wmg_printf(MSG_DEBUG,"key_mgmt:%s\n",ptrStaInfo->key_mgmt);
-    if(ptrStaInfo->mac_address)
-        wmg_printf(MSG_DEBUG,"mac_address:%s\n",ptrStaInfo->mac_address);
-    wmg_printf(MSG_DEBUG,"==============================\n");
+	wmg_printf(MSG_DEBUG, "obtained wpa_supplicant status,as follow:\n");
+	wmg_printf(MSG_DEBUG, "==============================\n");
+	if (ptrStaInfo->id >= 0)
+		wmg_printf(MSG_DEBUG, "id:%d\n", ptrStaInfo->id);
+	if (ptrStaInfo->bssid)
+		wmg_printf(MSG_DEBUG, "bssid:%s\n", ptrStaInfo->bssid);
+	if (ptrStaInfo->freq >= 0)
+		wmg_printf(MSG_DEBUG, "freq:%d\n", ptrStaInfo->freq);
+	if (ptrStaInfo->ssid)
+		wmg_printf(MSG_DEBUG, "ssid:%s\n", ptrStaInfo->ssid);
+	if (ptrStaInfo->wpa_state)
+		wmg_printf(MSG_DEBUG, "wpa_state:%s\n", wpa_supplicant_state_txt(ptrStaInfo->wpa_state));
+	if (ptrStaInfo->ip_address)
+		wmg_printf(MSG_DEBUG, "ip_address:%s\n", ptrStaInfo->ip_address);
+	if (ptrStaInfo->key_mgmt)
+		wmg_printf(MSG_DEBUG, "key_mgmt:%s\n", ptrStaInfo->key_mgmt);
+	if (ptrStaInfo->mac_address)
+		wmg_printf(MSG_DEBUG, "mac_address:%s\n", ptrStaInfo->mac_address);
+	wmg_printf(MSG_DEBUG, "==============================\n");
 }
 
-static char *strstr_wpa(const char *src,const char *obj,
-    const char pre_str[2],int pst_len)
+static char *strstr_wpa(const char *src, const char *obj, const char pre_str[2], int pst_len)
 {
-    const char *p=src;
-    int length;
-    int i=0;
-    if(src == NULL || obj == NULL || pre_str ==NULL){
-        wmg_printf(MSG_DEBUG,"src or obj or pre_str is NULL");
-        return NULL;
-    }
-    if(pst_len > strlen(pre_str)){
-        wmg_printf(MSG_ERROR,"pst_len length is illegal");
-        return NULL;
-    }
+	const char *p = src;
+	int length;
+	int i = 0;
+	if (src == NULL || obj == NULL || pre_str == NULL) {
+		wmg_printf(MSG_DEBUG, "src or obj or pre_str is NULL");
+		return NULL;
+	}
+	if (pst_len > strlen(pre_str)) {
+		wmg_printf(MSG_ERROR, "pst_len length is illegal");
+		return NULL;
+	}
 	length = strlen(obj);
-    for(;;p++,i++){
-        p=strchr(p,*obj);
-        if(p == NULL){
-            wmg_printf(MSG_MSGDUMP,"%s is not exist\n",obj);
-            return NULL;
-        }
-        if(strncmp(p,obj,length) == 0){
-            if(i > 1 && *(p-1) != pre_str[0] && *(p-1) != pre_str[1]){
-                    return (char*)p;
-            }
-        }
-    }
+	for (;; p++, i++) {
+		p = strchr(p, *obj);
+		if (p == NULL) {
+			wmg_printf(MSG_MSGDUMP, "%s is not exist\n", obj);
+			return NULL;
+		}
+		if (strncmp(p, obj, length) == 0) {
+			if (i > 1 && *(p - 1) != pre_str[0] && *(p - 1) != pre_str[1]) {
+				return (char *)p;
+			}
+		}
+	}
 }
-static int search_wpa_string(const char *src,const char *obj,int max,char *get_str)
+static int search_wpa_string(const char *src, const char *obj, int max, char *get_str)
 {
-    int i=0;
-    const char *sptr = NULL;
-    const char *pnext = NULL;
-    if(obj == NULL || src == NULL){
-        wmg_printf(MSG_DEBUG,"src or obj is NULL");
-        return 0;
-    }
-    if(!strncmp("id=",obj,3)){
-        sptr = strstr_wpa(src,obj,"su",2);
-    }else if(!strncmp("ssid=",obj,5)){
-        sptr = strstr_wpa(src,obj,"bb",2);
-    }else if(!strncmp("address=",obj,8)){
-        sptr = strstr_wpa(src,obj,"__",2);
-    }else{
-        sptr = strstr(src, obj);
-    }
+	int i = 0;
+	const char *sptr = NULL;
+	const char *pnext = NULL;
+	if (obj == NULL || src == NULL) {
+		wmg_printf(MSG_DEBUG, "src or obj is NULL");
+		return 0;
+	}
+	if (!strncmp("id=", obj, 3)) {
+		sptr = strstr_wpa(src, obj, "su", 2);
+	} else if (!strncmp("ssid=", obj, 5)) {
+		sptr = strstr_wpa(src, obj, "bb", 2);
+	} else if (!strncmp("address=", obj, 8)) {
+		sptr = strstr_wpa(src, obj, "__", 2);
+	} else {
+		sptr = strstr(src, obj);
+	}
 
-    if(sptr != NULL){
-        pnext=sptr+strlen(obj);
-        i=0;
-        while(1){
-            i++;
-            if(i >max ){
-                wmg_printf(MSG_ERROR,"Data overflow, %s, i: %d, max: %d\n", obj, i, max);
-                break;
-            }
-            pnext++;
-            if(*pnext == '\n' || *pnext == '\0')
-                break;
-        }
-        strncpy(get_str,sptr+strlen(obj),i);
-        get_str[i]='\0';
-        return 1;
-    }
-    return -1;
+	if (sptr != NULL) {
+		pnext = sptr + strlen(obj);
+		i = 0;
+		while (1) {
+			i++;
+			if (i > max) {
+				wmg_printf(MSG_ERROR, "Data overflow, %s, i: %d, max: %d\n", obj, i, max);
+				break;
+			}
+			pnext++;
+			if (*pnext == '\n' || *pnext == '\0')
+				break;
+		}
+		strncpy(get_str, sptr + strlen(obj), i);
+		get_str[i] = '\0';
+		return 1;
+	}
+	return -1;
 }
 
 static int clear_wpa_status_info()
 {
 	int i;
-	if(ptrStaInfo == NULL)
+	if (ptrStaInfo == NULL)
 		ptrStaInfo = (struct wpa_status *)wgos_zalloc(sizeof(struct wpa_status));
-	if(ptrStaInfo == NULL){
-		wmg_printf(MSG_WARNING,"malloc status failed!\n");
+	if (ptrStaInfo == NULL) {
+		wmg_printf(MSG_WARNING, "malloc status failed!\n");
 		return -1;
 	}
 	ptrStaInfo->id = -1;
 	ptrStaInfo->freq = -1;
-	for(i = 0;i< WPA_STA_MAX_SSID;i++){
+	for (i = 0; i < WPA_STA_MAX_SSID; i++) {
 		ptrStaInfo->ssid[i] = '\0';
-		if(i < WPA_STA_MAX_BSSID)
+		if (i < WPA_STA_MAX_BSSID)
 			ptrStaInfo->bssid[i] = '\0';
-		if(i < WPA_STA_MAX_IP_ADDR)
+		if (i < WPA_STA_MAX_IP_ADDR)
 			ptrStaInfo->ip_address[i] = '\0';
-		if(i < WPA_STA_MAX_KEY_MGMT)
-			ptrStaInfo->key_mgmt[i]='\0';
-		if(i < WPA_STA_MAX_MAC_ADDR)
-			ptrStaInfo->mac_address[i]='\0';
+		if (i < WPA_STA_MAX_KEY_MGMT)
+			ptrStaInfo->key_mgmt[i] = '\0';
+		if (i < WPA_STA_MAX_MAC_ADDR)
+			ptrStaInfo->mac_address[i] = '\0';
 	}
 	ptrStaInfo->wpa_state = WPA_UNKNOWN;
 	return 0;
 }
 void wpa_status_info_free()
 {
-	if(ptrStaInfo !=NULL){
+	if (ptrStaInfo != NULL) {
 		free(ptrStaInfo);
 		ptrStaInfo = NULL;
 	}
 }
 struct wpa_status *get_wpa_status_info()
 {
-    char reply[4096] = {0};
+	char reply[4096] = {0};
 	char wpa_result[512];
 
 	clear_wpa_status_info();
 
-    wifi_command("STATUS", reply, sizeof(reply));
+	wifi_command("STATUS", reply, sizeof(reply));
 
-    if(reply !=NULL){
-		wmg_printf(MSG_MSGDUMP,"status info:\n%s\n",reply);
-        if(search_wpa_string(reply,"wpa_state=",32,wpa_result) >0)
+	if (reply != NULL) {
+		wmg_printf(MSG_MSGDUMP, "status info:\n%s\n", reply);
+		if (search_wpa_string(reply, "wpa_state=", 32, wpa_result) > 0)
 			ptrStaInfo->wpa_state = wpa_supplicant_state_convert(wpa_result);
-        if(search_wpa_string(reply,"ssid=",512,wpa_result) >0)
-			strncpy(ptrStaInfo->ssid,wpa_result,strlen(wpa_result));
-        if(search_wpa_string(reply,"id=",4,wpa_result) >0)
+		if (search_wpa_string(reply, "ssid=", 512, wpa_result) > 0)
+			strncpy(ptrStaInfo->ssid, wpa_result, strlen(wpa_result));
+		if (search_wpa_string(reply, "id=", 4, wpa_result) > 0)
 			ptrStaInfo->id = atoi(wpa_result);
-        if(search_wpa_string(reply,"freq=",6,wpa_result) >0)
+		if (search_wpa_string(reply, "freq=", 6, wpa_result) > 0)
 			ptrStaInfo->freq = atoi(wpa_result);
-        if(search_wpa_string(reply,"bssid=",18,wpa_result) >0)
-			strncpy(ptrStaInfo->bssid,wpa_result,strlen(wpa_result));
-        if(search_wpa_string(reply,"key_mgmt=",16,wpa_result) >0)
-			strncpy(ptrStaInfo->key_mgmt,wpa_result,strlen(wpa_result));
-        if(search_wpa_string(reply,"address=",18,wpa_result) >0)
-			strncpy(ptrStaInfo->mac_address,wpa_result,strlen(wpa_result));
-        if(search_wpa_string(reply,"ip_address=",16,wpa_result) >0)
-			strncpy(ptrStaInfo->ip_address,wpa_result,strlen(wpa_result));
-    }else{
-		wmg_printf(MSG_DEBUG,"send STATUS,reply is NULL\n");
+		if (search_wpa_string(reply, "bssid=", 18, wpa_result) > 0)
+			strncpy(ptrStaInfo->bssid, wpa_result, strlen(wpa_result));
+		if (search_wpa_string(reply, "key_mgmt=", 16, wpa_result) > 0)
+			strncpy(ptrStaInfo->key_mgmt, wpa_result, strlen(wpa_result));
+		if (search_wpa_string(reply, "address=", 18, wpa_result) > 0)
+			strncpy(ptrStaInfo->mac_address, wpa_result, strlen(wpa_result));
+		if (search_wpa_string(reply, "ip_address=", 16, wpa_result) > 0)
+			strncpy(ptrStaInfo->ip_address, wpa_result, strlen(wpa_result));
+	} else {
+		wmg_printf(MSG_DEBUG, "send STATUS,reply is NULL\n");
 	}
 
-	if(wmg_get_debug_level() >= MSG_MSGDUMP){
+	if (wmg_get_debug_level() >= MSG_MSGDUMP) {
 		print_wpa_status();
 	}
 
@@ -232,26 +231,26 @@ struct wpa_status *get_wpa_status_info()
 
 int get_connection_info_inner(signal_status *signal_info)
 {
-    char reply[4096] = {0};
+	char reply[4096] = {0};
 	char wpa_result[32];
 	int ret = 0;
 
-    wifi_command("SIGNAL_POLL", reply, sizeof(reply));
+	wifi_command("SIGNAL_POLL", reply, sizeof(reply));
 
-    if(reply != NULL){
-		wmg_printf(MSG_MSGDUMP,"signal info:\n%s\n",reply);
+	if (reply != NULL) {
+		wmg_printf(MSG_MSGDUMP, "signal info:\n%s\n", reply);
 
-        if(search_wpa_string(reply, "RSSI=", 8, wpa_result) >0)
+		if (search_wpa_string(reply, "RSSI=", 8, wpa_result) > 0)
 			signal_info->rssi = atoi(wpa_result);
-        if(search_wpa_string(reply, "LINKSPEED=", 8, wpa_result) >0)
+		if (search_wpa_string(reply, "LINKSPEED=", 8, wpa_result) > 0)
 			signal_info->link_speed = atoi(wpa_result);
-        if(search_wpa_string(reply, "NOISE=", 8, wpa_result) >0)
+		if (search_wpa_string(reply, "NOISE=", 8, wpa_result) > 0)
 			signal_info->noise = atoi(wpa_result);
-        if(search_wpa_string(reply, "FREQUENCY=", 8, wpa_result) >0) {
+		if (search_wpa_string(reply, "FREQUENCY=", 8, wpa_result) > 0) {
 			signal_info->frequency = atoi(wpa_result);
 		}
-    }else{
-		wmg_printf(MSG_DEBUG,"SIGNAL_POLL sent,reply is NULL\n");
+	} else {
+		wmg_printf(MSG_DEBUG, "SIGNAL_POLL sent,reply is NULL\n");
 		ret = -1;
 	}
 
diff --git a/workspace/tg5040/wifimanager/src/core/tool.c b/workspace/tg5040/wifimanager/src/core/tool.c
old mode 100755
new mode 100644
index d9e9f4673..d3b9590d9
--- a/workspace/tg5040/wifimanager/src/core/tool.c
+++ b/workspace/tg5040/wifimanager/src/core/tool.c
@@ -4,41 +4,43 @@
 #include <errno.h>
 #include <string.h>
 #include "tool.h"
-void * wgos_malloc(size_t size)
+void *wgos_malloc(size_t size)
 {
-	char *ptr=NULL;
+	char *ptr = NULL;
 	ptr = malloc(size);
 	if (ptr == NULL)
 		return NULL;
 	return ptr;
 }
 
-void * wgos_zalloc(size_t size)
+void *wgos_zalloc(size_t size)
 {
 	return calloc(1, size);
 }
 
-int get_process_state(const char *process_nae,int length){
+int get_process_state(const char *process_nae, int length)
+{
 	int bytes;
 	char buf[10];
 	char cmd[60];
-    FILE   *strea;
-	if(length > 20){
-		wmg_printf(MSG_ERROR,"process nae is too long!\n");
+	FILE *strea;
+	if (length > 20) {
+		wmg_printf(MSG_ERROR, "process nae is too long!\n");
 		return -1;
 	}
-	sprintf(cmd,"ps | grep %s | grep -v grep",process_nae);
-    strea = popen(cmd, "r" ); //CHECK_WIFI_SHELL-->> FILE* strea
-    if(!strea) return -1;
-    bytes = fread( buf, sizeof(char), sizeof(buf), strea);
-    pclose(strea);
-    if(bytes > 0){
-        wmg_printf(MSG_DEBUG,"%s :process exist\n",process_nae);
+	sprintf(cmd, "ps | grep %s | grep -v grep", process_nae);
+	strea = popen(cmd, "r"); // CHECK_WIFI_SHELL-->> FILE* strea
+	if (!strea)
+		return -1;
+	bytes = fread(buf, sizeof(char), sizeof(buf), strea);
+	pclose(strea);
+	if (bytes > 0) {
+		wmg_printf(MSG_DEBUG, "%s :process exist\n", process_nae);
 		return 1;
-    }else {
-        wmg_printf(MSG_DEBUG,"%s :process not exist\n",process_nae);
-        return -1;
-    }
+	} else {
+		wmg_printf(MSG_DEBUG, "%s :process not exist\n", process_nae);
+		return -1;
+	}
 }
 int sys_get_time(struct sys_time *t)
 {
@@ -53,10 +55,10 @@ int sys_get_time(struct sys_time *t)
 void ms_sleep(unsigned long ms)
 {
 	struct timeval tv;
-	tv.tv_sec = ms/1000;
-	tv.tv_usec = (ms%1000)*1000;
+	tv.tv_sec = ms / 1000;
+	tv.tv_usec = (ms % 1000) * 1000;
 	int err;
 	do {
-		err = select(0,NULL,NULL,NULL,&tv);
-	}while(err < 0 && errno == EINTR);
+		err = select(0, NULL, NULL, NULL, &tv);
+	} while (err < 0 && errno == EINTR);
 }
diff --git a/workspace/tg5040/wifimanager/src/core/wifi.c b/workspace/tg5040/wifimanager/src/core/wifi.c
old mode 100755
new mode 100644
index 1944a14c0..451c81b56
--- a/workspace/tg5040/wifimanager/src/core/wifi.c
+++ b/workspace/tg5040/wifimanager/src/core/wifi.c
@@ -21,22 +21,20 @@ static struct wpa_ctrl *monitor_conn;
 /* socket pair used to exit from a blocking read */
 static int exit_sockets[2];
 
-//static const char IFACE_DIR[]           = "/data/misc/wifi/sockets";
-static const char IFACE_DIR[]           = "/var/sockets";
+// static const char IFACE_DIR[]           = "/data/misc/wifi/sockets";
+static const char IFACE_DIR[] = "/var/sockets";
 static char primary_iface[IFACE_VALUE_MAX];
-static const char SUPP_CONFIG_TEMPLATE[]= "/etc/wifi/wpa_supplicant_src.conf";
-static const char SUPP_CONFIG_FILE[]    = "/etc/wifi/wpa_supplicant.conf";
-static const char CONTROL_IFACE_PATH[]  = "/var/sockets";
+static const char SUPP_CONFIG_TEMPLATE[] = "/etc/wifi/wpa_supplicant_src.conf";
+static const char SUPP_CONFIG_FILE[] = "/etc/wifi/wpa_supplicant.conf";
+static const char CONTROL_IFACE_PATH[] = "/var/sockets";
 
-static const char SUPP_ENTROPY_FILE[]   = WIFI_ENTROPY_FILE;
-static unsigned char dummy_key[21] = { 0x02, 0x11, 0xbe, 0x33, 0x43, 0x35,
-                                       0x68, 0x47, 0x84, 0x99, 0xa9, 0x2b,
-                                       0x1c, 0xd3, 0xee, 0xff, 0xf1, 0xe2,
-                                       0xf3, 0xf4, 0xf5 };
+static const char SUPP_ENTROPY_FILE[] = WIFI_ENTROPY_FILE;
+static unsigned char dummy_key[21] = {0x02, 0x11, 0xbe, 0x33, 0x43, 0x35, 0x68, 0x47, 0x84, 0x99, 0xa9,
+									  0x2b, 0x1c, 0xd3, 0xee, 0xff, 0xf1, 0xe2, 0xf3, 0xf4, 0xf5};
 
-static const char IFNAME[]              = "IFNAME=";
-#define IFNAMELEN			(sizeof(IFNAME) - 1)
-static const char WPA_EVENT_IGNORE[]    = "CTRL-EVENT-IGNORE ";
+static const char IFNAME[] = "IFNAME=";
+#define IFNAMELEN (sizeof(IFNAME) - 1)
+static const char WPA_EVENT_IGNORE[] = "CTRL-EVENT-IGNORE ";
 
 static int insmod(const char *filenae, const char *args)
 {
@@ -56,13 +54,13 @@ static int insmod(const char *filenae, const char *args)
 
 #else
 
-    int ret = 0;
-    char cmd[256] = {0};
-    sprintf(cmd,"insmod '%s' '%s'", filenae, args);
-    system(cmd);
+	int ret = 0;
+	char cmd[256] = {0};
+	sprintf(cmd, "insmod '%s' '%s'", filenae, args);
+	system(cmd);
 
 #endif
-    return ret;
+	return ret;
 }
 
 static int rmmod(const char *modnae)
@@ -86,486 +84,480 @@ static int rmmod(const char *modnae)
 
 #else
 
-    int ret = 0;
-    char cmd[256] = {0};
-    sprintf(cmd,"rmmod '%s'", modnae);
-    system(cmd);
+	int ret = 0;
+	char cmd[256] = {0};
+	sprintf(cmd, "rmmod '%s'", modnae);
+	system(cmd);
 
 #endif
-    return ret;
+	return ret;
 }
 
 #define TIME_COUNT 20 // 200ms*20 = 4 seconds for completion
 int wifi_load_driver(const char *path, const char *args)
 {
-	int  count = 0;
-	int  i=0, nae_len = 0;
-	int  ret        = 0;
+	int count = 0;
+	int i = 0, nae_len = 0;
+	int ret = 0;
 	char nae[256] = {0}, tmp_buf[512] = {0};
-    char * p_s = NULL, * p_e = NULL;
-    char *p_strstr_wlan  = NULL;
-    FILE *fp        = NULL;
+	char *p_s = NULL, *p_e = NULL;
+	char *p_strstr_wlan = NULL;
+	FILE *fp = NULL;
 
-    if (!path) {
-        wmg_printf(MSG_ERROR,"driver path is NULL!\n");
-        return -1;
-    }
-
-    p_s = strrchr(path, '/');
-    p_s++;
-
-    p_e = strrchr(path, '.');
-    p_e--;
+	if (!path) {
+		wmg_printf(MSG_ERROR, "driver path is NULL!\n");
+		return -1;
+	}
 
-    i = 0;
-    while(p_s <= p_e){
-        nae[i] = *p_s;
-        i++;
-        p_s++;
-    }
-    nae[i] = '\0';
-    wmg_printf(MSG_DEBUG,"driver nae %s\n", nae);
+	p_s = strrchr(path, '/');
+	p_s++;
 
-    if (insmod(path, args) < 0) {
-        wmg_printf(MSG_ERROR,"insmod %s %s firmware failed!\n", path, args);
-        rmmod(nae);//it may be load driver already,try remove it.
-        return -1;
-    }
+	p_e = strrchr(path, '.');
+	p_e--;
 
-    do{
-        fp=fopen("/proc/net/wireless", "r");
-        if (!fp) {
-            wmg_printf(MSG_ERROR,"failed to fopen file: /proc/net/wireless\n");
-            rmmod(nae); //try remove it.
-            return -1;
-        }
-        ret = fread(tmp_buf, sizeof(tmp_buf), 1, fp);
-        if (ret==0){
-            wmg_printf(MSG_ERROR,"faied to read proc/net/wireless\n");
-        }
-        fclose(fp);
-
-        wmg_printf(MSG_DEBUG,"loading wifi driver...\n");
-        p_strstr_wlan = strstr(tmp_buf, "wlan0");
-        if (p_strstr_wlan != NULL) {
-            break;
-        }
-        usleep(200000);// 200ms
+	i = 0;
+	while (p_s <= p_e) {
+		nae[i] = *p_s;
+		i++;
+		p_s++;
+	}
+	nae[i] = '\0';
+	wmg_printf(MSG_DEBUG, "driver nae %s\n", nae);
 
-    } while (count++ <= TIME_COUNT);
+	if (insmod(path, args) < 0) {
+		wmg_printf(MSG_ERROR, "insmod %s %s firmware failed!\n", path, args);
+		rmmod(nae); // it may be load driver already,try remove it.
+		return -1;
+	}
 
-    if(count > TIME_COUNT) {
-        wmg_printf(MSG_ERROR,"timeout, register netdevice wlan0 failed.\n");
-        rmmod(nae);
-        return -1;
-    }
-    return 0;
+	do {
+		fp = fopen("/proc/net/wireless", "r");
+		if (!fp) {
+			wmg_printf(MSG_ERROR, "failed to fopen file: /proc/net/wireless\n");
+			rmmod(nae); // try remove it.
+			return -1;
+		}
+		ret = fread(tmp_buf, sizeof(tmp_buf), 1, fp);
+		if (ret == 0) {
+			wmg_printf(MSG_ERROR, "faied to read proc/net/wireless\n");
+		}
+		fclose(fp);
+
+		wmg_printf(MSG_DEBUG, "loading wifi driver...\n");
+		p_strstr_wlan = strstr(tmp_buf, "wlan0");
+		if (p_strstr_wlan != NULL) {
+			break;
+		}
+		usleep(200000); // 200ms
+
+	} while (count++ <= TIME_COUNT);
+
+	if (count > TIME_COUNT) {
+		wmg_printf(MSG_ERROR, "timeout, register netdevice wlan0 failed.\n");
+		rmmod(nae);
+		return -1;
+	}
+	return 0;
 }
 
 int wifi_unload_driver(const char *nae)
 {
-    if (rmmod(nae) == 0){
-        usleep(2000000);
-	return 0;
-    }else
-	  return -1;
+	if (rmmod(nae) == 0) {
+		usleep(2000000);
+		return 0;
+	} else
+		return -1;
 }
 
 int ensure_entropy_file_exists()
 {
-    int ret;
-    int destfd;
-
-    ret = access(SUPP_ENTROPY_FILE, R_OK|W_OK);
-    if ((ret == 0) || (errno == EACCES)) {
-        if ((ret != 0) &&
-            (chmod(SUPP_ENTROPY_FILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) != 0)) {
-            wmg_printf(MSG_ERROR,"Cannot set RW to \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
-            return -1;
-        }
-        return 0;
-    }
-    destfd = TEMP_FAILURE_RETRY(open(SUPP_ENTROPY_FILE, O_CREAT|O_RDWR, 0660));
-    if (destfd < 0) {
-        wmg_printf(MSG_DEBUG,"Cannot create \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
-        return -1;
-    }
+	int ret;
+	int destfd;
+
+	ret = access(SUPP_ENTROPY_FILE, R_OK | W_OK);
+	if ((ret == 0) || (errno == EACCES)) {
+		if ((ret != 0) && (chmod(SUPP_ENTROPY_FILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) != 0)) {
+			wmg_printf(MSG_ERROR, "Cannot set RW to \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
+			return -1;
+		}
+		return 0;
+	}
+	destfd = TEMP_FAILURE_RETRY(open(SUPP_ENTROPY_FILE, O_CREAT | O_RDWR, 0660));
+	if (destfd < 0) {
+		wmg_printf(MSG_DEBUG, "Cannot create \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
+		return -1;
+	}
 
-    if (TEMP_FAILURE_RETRY(write(destfd, dummy_key, sizeof(dummy_key))) != sizeof(dummy_key)) {
-        wmg_printf(MSG_ERROR,"Error writing \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
-        close(destfd);
-        return -1;
-    }
-    close(destfd);
+	if (TEMP_FAILURE_RETRY(write(destfd, dummy_key, sizeof(dummy_key))) != sizeof(dummy_key)) {
+		wmg_printf(MSG_ERROR, "Error writing \"%s\": %s\n", SUPP_ENTROPY_FILE, strerror(errno));
+		close(destfd);
+		return -1;
+	}
+	close(destfd);
 
-    /* chmod is needed because open() didn't set permisions properly */
-    if (chmod(SUPP_ENTROPY_FILE, 0660) < 0) {
-        wmg_printf(MSG_ERROR,"Error changing permissions of %s to 0660: %s\n",
-             SUPP_ENTROPY_FILE, strerror(errno));
-        unlink(SUPP_ENTROPY_FILE);
-        return -1;
-    }
+	/* chmod is needed because open() didn't set permisions properly */
+	if (chmod(SUPP_ENTROPY_FILE, 0660) < 0) {
+		wmg_printf(MSG_ERROR, "Error changing permissions of %s to 0660: %s\n", SUPP_ENTROPY_FILE, strerror(errno));
+		unlink(SUPP_ENTROPY_FILE);
+		return -1;
+	}
 
-    return 0;
+	return 0;
 }
 
-int update_ctrl_interface(const char *config_file) {
-
-    int srcfd, destfd;
-    int nread;
-    char ifc[IFACE_VALUE_MAX];
-    char *pbuf;
-    char *sptr;
-    struct stat sb;
-    int ret;
-
-    if (stat(config_file, &sb) != 0)
-        return -1;
+int update_ctrl_interface(const char *config_file)
+{
+	int srcfd, destfd;
+	int nread;
+	char ifc[IFACE_VALUE_MAX];
+	char *pbuf;
+	char *sptr;
+	struct stat sb;
+	int ret;
+
+	if (stat(config_file, &sb) != 0)
+		return -1;
 
-    pbuf = (char *)malloc(sb.st_size + IFACE_VALUE_MAX);
-    if (!pbuf)
-        return 0;
-    srcfd = TEMP_FAILURE_RETRY(open(config_file, O_RDONLY));
-    if (srcfd < 0) {
-        wmg_printf(MSG_ERROR,"Cannot open \"%s\": %s\n", config_file, strerror(errno));
-        free(pbuf);
-        return 0;
-    }
-    nread = TEMP_FAILURE_RETRY(read(srcfd, pbuf, sb.st_size));
-    close(srcfd);
-    if (nread < 0) {
-        wmg_printf(MSG_ERROR,"Cannot read \"%s\": %s\n", config_file, strerror(errno));
-        free(pbuf);
-        return 0;
-    }
+	pbuf = (char *)malloc(sb.st_size + IFACE_VALUE_MAX);
+	if (!pbuf)
+		return 0;
+	srcfd = TEMP_FAILURE_RETRY(open(config_file, O_RDONLY));
+	if (srcfd < 0) {
+		wmg_printf(MSG_ERROR, "Cannot open \"%s\": %s\n", config_file, strerror(errno));
+		free(pbuf);
+		return 0;
+	}
+	nread = TEMP_FAILURE_RETRY(read(srcfd, pbuf, sb.st_size));
+	close(srcfd);
+	if (nread < 0) {
+		wmg_printf(MSG_ERROR, "Cannot read \"%s\": %s\n", config_file, strerror(errno));
+		free(pbuf);
+		return 0;
+	}
 
-    strcpy(ifc, CONTROL_IFACE_PATH);
-
-    /* Assume file is invalid to begin with */
-    ret = -1;
-    /*
-     * if there is a "ctrl_interface=<value>" entry, re-write it ONLY if it is
-     * NOT a directory.  The non-directory value option is an Android add-on
-     * that allows the control interface to be exchanged through an environment
-     * variable (initialized by the "init" progra when it starts a service
-     * with a "socket" option).
-     *
-     * The <value> is deemed to be a directory if the "DIR=" form is used or
-     * the value begins with "/".
-     */
-    if ((sptr = strstr(pbuf, "ctrl_interface="))) {
-        ret = 0;
-        if ((!strstr(pbuf, "ctrl_interface=DIR=")) &&
-                (!strstr(pbuf, "ctrl_interface=/"))) {
-            char *iptr = sptr + strlen("ctrl_interface=");
-            int ilen = 0;
-            int mlen = strlen(ifc);
-            int nwrite;
-            if (strncmp(ifc, iptr, mlen) != 0) {
-                wmg_printf(MSG_DEBUG,"ctrl_interface != %s\n", ifc);
-                while (((ilen + (iptr - pbuf)) < nread) && (iptr[ilen] != '\n'))
-                    ilen++;
-                mlen = ((ilen >= mlen) ? ilen : mlen) + 1;
-                memmove(iptr + mlen, iptr + ilen + 1, nread - (iptr + ilen + 1 - pbuf));
-                memset(iptr, '\n', mlen);
-                memcpy(iptr, ifc, strlen(ifc));
-                destfd = TEMP_FAILURE_RETRY(open(config_file, O_RDWR, 0660));
-                if (destfd < 0) {
-                    wmg_printf(MSG_ERROR,"Cannot update \"%s\": %s\n", config_file, strerror(errno));
-                    free(pbuf);
-                    return -1;
-                }
-                TEMP_FAILURE_RETRY(write(destfd, pbuf, nread + mlen - ilen -1));
-                close(destfd);
-            }
-        }
-    }
-    free(pbuf);
-    return ret;
+	strcpy(ifc, CONTROL_IFACE_PATH);
+
+	/* Assume file is invalid to begin with */
+	ret = -1;
+	/*
+	 * if there is a "ctrl_interface=<value>" entry, re-write it ONLY if it is
+	 * NOT a directory.  The non-directory value option is an Android add-on
+	 * that allows the control interface to be exchanged through an environment
+	 * variable (initialized by the "init" progra when it starts a service
+	 * with a "socket" option).
+	 *
+	 * The <value> is deemed to be a directory if the "DIR=" form is used or
+	 * the value begins with "/".
+	 */
+	if ((sptr = strstr(pbuf, "ctrl_interface="))) {
+		ret = 0;
+		if ((!strstr(pbuf, "ctrl_interface=DIR=")) && (!strstr(pbuf, "ctrl_interface=/"))) {
+			char *iptr = sptr + strlen("ctrl_interface=");
+			int ilen = 0;
+			int mlen = strlen(ifc);
+			int nwrite;
+			if (strncmp(ifc, iptr, mlen) != 0) {
+				wmg_printf(MSG_DEBUG, "ctrl_interface != %s\n", ifc);
+				while (((ilen + (iptr - pbuf)) < nread) && (iptr[ilen] != '\n'))
+					ilen++;
+				mlen = ((ilen >= mlen) ? ilen : mlen) + 1;
+				memmove(iptr + mlen, iptr + ilen + 1, nread - (iptr + ilen + 1 - pbuf));
+				memset(iptr, '\n', mlen);
+				memcpy(iptr, ifc, strlen(ifc));
+				destfd = TEMP_FAILURE_RETRY(open(config_file, O_RDWR, 0660));
+				if (destfd < 0) {
+					wmg_printf(MSG_ERROR, "Cannot update \"%s\": %s\n", config_file, strerror(errno));
+					free(pbuf);
+					return -1;
+				}
+				TEMP_FAILURE_RETRY(write(destfd, pbuf, nread + mlen - ilen - 1));
+				close(destfd);
+			}
+		}
+	}
+	free(pbuf);
+	return ret;
 }
 
 int ensure_config_file_exists(const char *config_file)
 {
-    char buf[2048];
-    int srcfd, destfd;
-    struct stat sb;
-    int nread;
-    int ret;
-
-    ret = access(config_file, R_OK|W_OK);
-    if ((ret == 0) || (errno == EACCES)) {
-        if ((ret != 0) &&
-            (chmod(config_file, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) != 0)) {
-            wmg_printf(MSG_ERROR,"Cannot set RW to \"%s\": %s\n", config_file, strerror(errno));
-            return -1;
-        }
-        /* return if we were able to update control interface properly */
-        if (update_ctrl_interface(config_file) >=0) {
-            return 0;
-        } else {
-            /* This handles the scenario where the file had bad data
-             * for some reason. We continue and recreate the file.
-             */
-        }
-    } else if (errno != ENOENT) {
-        wmg_printf(MSG_ERROR,"Cannot access \"%s\": %s\n", config_file, strerror(errno));
-        return -1;
-    }
+	char buf[2048];
+	int srcfd, destfd;
+	struct stat sb;
+	int nread;
+	int ret;
+
+	ret = access(config_file, R_OK | W_OK);
+	if ((ret == 0) || (errno == EACCES)) {
+		if ((ret != 0) && (chmod(config_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) != 0)) {
+			wmg_printf(MSG_ERROR, "Cannot set RW to \"%s\": %s\n", config_file, strerror(errno));
+			return -1;
+		}
+		/* return if we were able to update control interface properly */
+		if (update_ctrl_interface(config_file) >= 0) {
+			return 0;
+		} else {
+			/* This handles the scenario where the file had bad data
+			 * for some reason. We continue and recreate the file.
+			 */
+		}
+	} else if (errno != ENOENT) {
+		wmg_printf(MSG_ERROR, "Cannot access \"%s\": %s\n", config_file, strerror(errno));
+		return -1;
+	}
 
-    srcfd = TEMP_FAILURE_RETRY(open(SUPP_CONFIG_TEMPLATE, O_RDONLY));
-    if (srcfd < 0) {
-        wmg_printf(MSG_ERROR,"Cannot open \"%s\": %s\n", SUPP_CONFIG_TEMPLATE, strerror(errno));
-        return -1;
-    }
+	srcfd = TEMP_FAILURE_RETRY(open(SUPP_CONFIG_TEMPLATE, O_RDONLY));
+	if (srcfd < 0) {
+		wmg_printf(MSG_ERROR, "Cannot open \"%s\": %s\n", SUPP_CONFIG_TEMPLATE, strerror(errno));
+		return -1;
+	}
 
-    destfd = TEMP_FAILURE_RETRY(open(config_file, O_CREAT|O_RDWR, 0660));
-    if (destfd < 0) {
-        close(srcfd);
-        wmg_printf(MSG_ERROR,"Cannot create \"%s\": %s\n", config_file, strerror(errno));
-        return -1;
-    }
+	destfd = TEMP_FAILURE_RETRY(open(config_file, O_CREAT | O_RDWR, 0660));
+	if (destfd < 0) {
+		close(srcfd);
+		wmg_printf(MSG_ERROR, "Cannot create \"%s\": %s\n", config_file, strerror(errno));
+		return -1;
+	}
 
-    while ((nread = TEMP_FAILURE_RETRY(read(srcfd, buf, sizeof(buf)))) != 0) {
-        if (nread < 0) {
-            wmg_printf(MSG_ERROR,"Error reading \"%s\": %s\n", SUPP_CONFIG_TEMPLATE, strerror(errno));
-            close(srcfd);
-            close(destfd);
-            unlink(config_file);
-            return -1;
-        }
-        TEMP_FAILURE_RETRY(write(destfd, buf, nread));
-    }
+	while ((nread = TEMP_FAILURE_RETRY(read(srcfd, buf, sizeof(buf)))) != 0) {
+		if (nread < 0) {
+			wmg_printf(MSG_ERROR, "Error reading \"%s\": %s\n", SUPP_CONFIG_TEMPLATE, strerror(errno));
+			close(srcfd);
+			close(destfd);
+			unlink(config_file);
+			return -1;
+		}
+		TEMP_FAILURE_RETRY(write(destfd, buf, nread));
+	}
 
-    close(destfd);
-    close(srcfd);
+	close(destfd);
+	close(srcfd);
 
-    /* chmod is needed because open() didn't set permisions properly */
-    if (chmod(config_file, 0660) < 0) {
-        wmg_printf(MSG_ERROR,"Error changing permissions of %s to 0660: %s\n",
-             config_file, strerror(errno));
-        unlink(config_file);
-        return -1;
-    }
+	/* chmod is needed because open() didn't set permisions properly */
+	if (chmod(config_file, 0660) < 0) {
+		wmg_printf(MSG_ERROR, "Error changing permissions of %s to 0660: %s\n", config_file, strerror(errno));
+		unlink(config_file);
+		return -1;
+	}
 
-    return update_ctrl_interface(config_file);
+	return update_ctrl_interface(config_file);
 }
 
 int wifi_start_supplicant(int p2p_supported)
 {
-    char cmd[512] = {0};
+	char cmd[512] = {0};
 
-    /* Before starting the daemon, make sure its config file exists */
-    if (ensure_config_file_exists(SUPP_CONFIG_FILE) < 0) {
-        wmg_printf(MSG_ERROR,"Wi-Fi will not be enabled\n");
-        return -1;
-    }
+	/* Before starting the daemon, make sure its config file exists */
+	if (ensure_config_file_exists(SUPP_CONFIG_FILE) < 0) {
+		wmg_printf(MSG_ERROR, "Wi-Fi will not be enabled\n");
+		return -1;
+	}
 
-    if (ensure_entropy_file_exists() < 0) {
-        wmg_printf(MSG_DEBUG,"Wi-Fi entropy file was not created\n");
-    }
+	if (ensure_entropy_file_exists() < 0) {
+		wmg_printf(MSG_DEBUG, "Wi-Fi entropy file was not created\n");
+	}
 
-    /* Clear out any stale socket files that might be left over. */
-    //wpa_ctrl_cleanup();
+	/* Clear out any stale socket files that might be left over. */
+	// wpa_ctrl_cleanup();
 
-    /* Reset sockets used for exiting from hung state */
-    exit_sockets[0] = exit_sockets[1] = -1;
+	/* Reset sockets used for exiting from hung state */
+	exit_sockets[0] = exit_sockets[1] = -1;
 
-    /* start wpa_supplicant */
-    strncpy(cmd, "/etc/wifi/wifi start", 511);
-    cmd[511] = '\0';
-    system(cmd);
+	/* start wpa_supplicant */
+	strncpy(cmd, "/etc/wifi/wifi start", 511);
+	cmd[511] = '\0';
+	system(cmd);
 
-    return 0;
+	return 0;
 }
 
 int wifi_stop_supplicant(int p2p_supported)
 {
-	  system("/etc/wifi/wifi stop");
-	  return 0;
+	system("/etc/wifi/wifi stop");
+	return 0;
 }
 
-#define SUPPLICANT_TIMEOUT      3000000  // microseconds
-#define SUPPLICANT_TIMEOUT_STEP  100000  // microseconds
+#define SUPPLICANT_TIMEOUT 3000000	   // microseconds
+#define SUPPLICANT_TIMEOUT_STEP 100000 // microseconds
 int wifi_connect_on_socket_path(const char *path)
 {
-    int  supplicant_timeout = SUPPLICANT_TIMEOUT;
+	int supplicant_timeout = SUPPLICANT_TIMEOUT;
 
-    ctrl_conn = wpa_ctrl_open(path);
-    while (ctrl_conn == NULL && supplicant_timeout > 0){
-        usleep(SUPPLICANT_TIMEOUT_STEP);
-        supplicant_timeout -= SUPPLICANT_TIMEOUT_STEP;
-        ctrl_conn = wpa_ctrl_open(path);
-    }
-    if (ctrl_conn == NULL) {
-        wmg_printf(MSG_ERROR,"Unable to open connection to supplicant on \"%s\": %s\n",
-             path, strerror(errno));
-        return -1;
-    }
-    monitor_conn = wpa_ctrl_open(path);
-    if (monitor_conn == NULL) {
-	wmg_printf(MSG_ERROR,"monitor_conn is NULL!\n");
-        wpa_ctrl_close(ctrl_conn);
-        ctrl_conn = NULL;
-        return -1;
-    }
-    if (wpa_ctrl_attach(monitor_conn) != 0) {
-	wmg_printf(MSG_ERROR,"attach monitor_conn error!\n");
-        wpa_ctrl_close(monitor_conn);
-        wpa_ctrl_close(ctrl_conn);
-        ctrl_conn = monitor_conn = NULL;
-        return -1;
-    }
+	ctrl_conn = wpa_ctrl_open(path);
+	while (ctrl_conn == NULL && supplicant_timeout > 0) {
+		usleep(SUPPLICANT_TIMEOUT_STEP);
+		supplicant_timeout -= SUPPLICANT_TIMEOUT_STEP;
+		ctrl_conn = wpa_ctrl_open(path);
+	}
+	if (ctrl_conn == NULL) {
+		wmg_printf(MSG_ERROR, "Unable to open connection to supplicant on \"%s\": %s\n", path, strerror(errno));
+		return -1;
+	}
+	monitor_conn = wpa_ctrl_open(path);
+	if (monitor_conn == NULL) {
+		wmg_printf(MSG_ERROR, "monitor_conn is NULL!\n");
+		wpa_ctrl_close(ctrl_conn);
+		ctrl_conn = NULL;
+		return -1;
+	}
+	if (wpa_ctrl_attach(monitor_conn) != 0) {
+		wmg_printf(MSG_ERROR, "attach monitor_conn error!\n");
+		wpa_ctrl_close(monitor_conn);
+		wpa_ctrl_close(ctrl_conn);
+		ctrl_conn = monitor_conn = NULL;
+		return -1;
+	}
 
-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, exit_sockets) == -1) {
-	wmg_printf(MSG_ERROR,"create socketpair error!\n");
-        wpa_ctrl_close(monitor_conn);
-        wpa_ctrl_close(ctrl_conn);
-        ctrl_conn = monitor_conn = NULL;
-        return -1;
-    }
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, exit_sockets) == -1) {
+		wmg_printf(MSG_ERROR, "create socketpair error!\n");
+		wpa_ctrl_close(monitor_conn);
+		wpa_ctrl_close(ctrl_conn);
+		ctrl_conn = monitor_conn = NULL;
+		return -1;
+	}
 
-    wmg_printf(MSG_DEBUG,"connect to wpa_supplicant ok!\n");
-    return 0;
+	wmg_printf(MSG_DEBUG, "connect to wpa_supplicant ok!\n");
+	return 0;
 }
 
 /* Establishes the control and monitor socket connections on the interface */
 int wifi_connect_to_supplicant()
 {
-    static char path[PATH_MAX];
-	if(get_process_state("wpa_supplicant",14) == -1)
+	static char path[PATH_MAX];
+	if (get_process_state("wpa_supplicant", 14) == -1)
 		return -1;
-    strncpy(primary_iface, "wlan0", IFACE_VALUE_MAX);
-    if (access(IFACE_DIR, F_OK) == 0) {
-        snprintf(path, sizeof(path), "%s/%s", IFACE_DIR, primary_iface);
-    } else {
-		wmg_printf(MSG_ERROR,"wpa_supplicant socket interface not exists\n");
-        return -1;
-    }
-    return wifi_connect_on_socket_path(path);
+	strncpy(primary_iface, "wlan0", IFACE_VALUE_MAX);
+	if (access(IFACE_DIR, F_OK) == 0) {
+		snprintf(path, sizeof(path), "%s/%s", IFACE_DIR, primary_iface);
+	} else {
+		wmg_printf(MSG_ERROR, "wpa_supplicant socket interface not exists\n");
+		return -1;
+	}
+	return wifi_connect_on_socket_path(path);
 }
 
 int wifi_send_command(const char *cmd, char *reply, size_t *reply_len)
 {
-    int ret;
-    if (ctrl_conn == NULL) {
-        wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant - \"%s\" command dropped.\n", cmd);
-        return -1;
-    }
+	int ret;
+	if (ctrl_conn == NULL) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant - \"%s\" command dropped.\n", cmd);
+		return -1;
+	}
 
-    ret = wpa_ctrl_request(ctrl_conn, cmd, strlen(cmd), reply, reply_len, NULL);
-    if (ret == -2) {
-        wmg_printf(MSG_ERROR,"'%s' command timed out.\n", cmd);
-        /* unblocks the monitor receive socket for termination */
-        TEMP_FAILURE_RETRY(write(exit_sockets[0], "T", 1));
-        return -2;
-    } else if (ret < 0 || strncmp(reply, "FAIL", 4) == 0) {
-        return -1;
-    }
-    if (strncmp(cmd, "PING", 4) == 0) {
-        reply[*reply_len] = '\0';
-    }
-    return 0;
+	ret = wpa_ctrl_request(ctrl_conn, cmd, strlen(cmd), reply, reply_len, NULL);
+	if (ret == -2) {
+		wmg_printf(MSG_ERROR, "'%s' command timed out.\n", cmd);
+		/* unblocks the monitor receive socket for termination */
+		TEMP_FAILURE_RETRY(write(exit_sockets[0], "T", 1));
+		return -2;
+	} else if (ret < 0 || strncmp(reply, "FAIL", 4) == 0) {
+		return -1;
+	}
+	if (strncmp(cmd, "PING", 4) == 0) {
+		reply[*reply_len] = '\0';
+	}
+	return 0;
 }
 
 int wifi_ctrl_recv(char *reply, size_t *reply_len)
 {
-    int res;
-    int ctrlfd = wpa_ctrl_get_fd(monitor_conn);
-    struct pollfd rfds[2];
-
-    memset(rfds, 0, 2 * sizeof(struct pollfd));
-    rfds[0].fd = ctrlfd;
-    rfds[0].events |= POLLIN;
-    rfds[1].fd = exit_sockets[1];
-    rfds[1].events |= POLLIN;
-    pthread_testcancel();
-    res = TEMP_FAILURE_RETRY(poll(rfds, 2, -1));
-    pthread_testcancel();
-    if (res < 0) {
-        wmg_printf(MSG_ERROR,"Error poll = %d\n", res);
-        return res;
-    }
-    if (rfds[0].revents & POLLIN) {
-        return wpa_ctrl_recv(monitor_conn, reply, reply_len);
-    }
+	int res;
+	int ctrlfd = wpa_ctrl_get_fd(monitor_conn);
+	struct pollfd rfds[2];
+
+	memset(rfds, 0, 2 * sizeof(struct pollfd));
+	rfds[0].fd = ctrlfd;
+	rfds[0].events |= POLLIN;
+	rfds[1].fd = exit_sockets[1];
+	rfds[1].events |= POLLIN;
+	pthread_testcancel();
+	res = TEMP_FAILURE_RETRY(poll(rfds, 2, -1));
+	pthread_testcancel();
+	if (res < 0) {
+		wmg_printf(MSG_ERROR, "Error poll = %d\n", res);
+		return res;
+	}
+	if (rfds[0].revents & POLLIN) {
+		return wpa_ctrl_recv(monitor_conn, reply, reply_len);
+	}
 
-    /* it is not rfds[0], then it must be rfts[1] (i.e. the exit socket)
-     * or we timed out. In either case, this call has failed ..
-     */
-    return -2;
+	/* it is not rfds[0], then it must be rfts[1] (i.e. the exit socket)
+	 * or we timed out. In either case, this call has failed ..
+	 */
+	return -2;
 }
 
 int wifi_wait_on_socket(char *buf, size_t buflen)
 {
-    size_t nread = buflen - 1;
-    int result;
-    char *match, *match2;
+	size_t nread = buflen - 1;
+	int result;
+	char *match, *match2;
 
-    if (monitor_conn == NULL) {
-        return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed");
-    }
+	if (monitor_conn == NULL) {
+		return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed");
+	}
 
-    result = wifi_ctrl_recv(buf, &nread);
+	result = wifi_ctrl_recv(buf, &nread);
 
-    /* Terminate reception on exit socket */
-    if (result == -2) {
-        return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed");
-    }
+	/* Terminate reception on exit socket */
+	if (result == -2) {
+		return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - connection closed");
+	}
 
-    if (result < 0) {
-        wmg_printf(MSG_ERROR,"wifi_ctrl_recv failed: %s\n", strerror(errno));
-        return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - recv error");
-    }
-    buf[nread] = '\0';
-    /* Check for EOF on the socket */
-    if (result == 0 && nread == 0) {
-        /* Fabricate an event to pass up */
-        wmg_printf(MSG_WARNING,"Received EOF on supplicant socket\n");
-        return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - signal 0 received");
-    }
-    /*
-     * Events strings are in the format
-     *
-     *     IFNAME=iface <N>CTRL-EVENT-XXX
-     *        or
-     *     <N>CTRL-EVENT-XXX
-     *
-     * where N is the message level in numerical form (0=VERBOSE, 1=DEBUG,
-     * etc.) and XXX is the event nae. The level information is not useful
-     * to us, so strip it off.
-     */
-
-    if (strncmp(buf, IFNAME, IFNAMELEN) == 0) {
-        match = strchr(buf, ' ');
-        if (match != NULL) {
-            if (match[1] == '<') {
-                match2 = strchr(match + 2, '>');
-                if (match2 != NULL) {
-                    nread -= (match2 - match);
-                    memmove(match + 1, match2 + 1, nread - (match - buf) + 1);
-                }
-            }
-        } else {
-            return snprintf(buf, buflen, "%s", WPA_EVENT_IGNORE);
-        }
-    } else if (buf[0] == '<') {
-        match = strchr(buf, '>');
-        if (match != NULL) {
-            nread -= (match + 1 - buf);
-            memmove(buf, match + 1, nread + 1);
-            //printf("supplicant generated event without interface - %s\n", buf);
-        }
-    } else {
-        /* let the event go as is! */
-        //printf("supplicant generated event without interface and without message level - %s\n", buf);
-    }
+	if (result < 0) {
+		wmg_printf(MSG_ERROR, "wifi_ctrl_recv failed: %s\n", strerror(errno));
+		return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - recv error");
+	}
+	buf[nread] = '\0';
+	/* Check for EOF on the socket */
+	if (result == 0 && nread == 0) {
+		/* Fabricate an event to pass up */
+		wmg_printf(MSG_WARNING, "Received EOF on supplicant socket\n");
+		return snprintf(buf, buflen, WPA_EVENT_TERMINATING " - signal 0 received");
+	}
+	/*
+	 * Events strings are in the format
+	 *
+	 *     IFNAME=iface <N>CTRL-EVENT-XXX
+	 *        or
+	 *     <N>CTRL-EVENT-XXX
+	 *
+	 * where N is the message level in numerical form (0=VERBOSE, 1=DEBUG,
+	 * etc.) and XXX is the event nae. The level information is not useful
+	 * to us, so strip it off.
+	 */
+
+	if (strncmp(buf, IFNAME, IFNAMELEN) == 0) {
+		match = strchr(buf, ' ');
+		if (match != NULL) {
+			if (match[1] == '<') {
+				match2 = strchr(match + 2, '>');
+				if (match2 != NULL) {
+					nread -= (match2 - match);
+					memmove(match + 1, match2 + 1, nread - (match - buf) + 1);
+				}
+			}
+		} else {
+			return snprintf(buf, buflen, "%s", WPA_EVENT_IGNORE);
+		}
+	} else if (buf[0] == '<') {
+		match = strchr(buf, '>');
+		if (match != NULL) {
+			nread -= (match + 1 - buf);
+			memmove(buf, match + 1, nread + 1);
+			// printf("supplicant generated event without interface - %s\n", buf);
+		}
+	} else {
+		/* let the event go as is! */
+		// printf("supplicant generated event without interface and without message level - %s\n", buf);
+	}
 
-    return nread;
+	return nread;
 }
 
 int wifi_wait_for_event(char *buf, size_t buflen)
 {
-    return wifi_wait_on_socket(buf, buflen);
+	return wifi_wait_on_socket(buf, buflen);
 }
 
 void wifi_close_sockets()
@@ -573,49 +565,49 @@ void wifi_close_sockets()
 	char reply[4096] = {0};
 	int ret = 0;
 
-    if (monitor_conn != NULL) {
-        wpa_ctrl_detach(monitor_conn);
-        wpa_ctrl_close(monitor_conn);
-        monitor_conn = NULL;
-    }
+	if (monitor_conn != NULL) {
+		wpa_ctrl_detach(monitor_conn);
+		wpa_ctrl_close(monitor_conn);
+		monitor_conn = NULL;
+	}
 
-/*
-	ret = wifi_command("TERMINATE", reply, sizeof(reply));
-	if(ret) {
-		wmg_printf(MSG_WARNING,"do terminate error!");
+	/*
+		ret = wifi_command("TERMINATE", reply, sizeof(reply));
+		if(ret) {
+			wmg_printf(MSG_WARNING,"do terminate error!");
+		}
+	*/
+	if (ctrl_conn != NULL) {
+		wpa_ctrl_close(ctrl_conn);
+		ctrl_conn = NULL;
 	}
-*/
-    if (ctrl_conn != NULL) {
-        wpa_ctrl_close(ctrl_conn);
-        ctrl_conn = NULL;
-    }
 
-    if (exit_sockets[0] >= 0) {
-        close(exit_sockets[0]);
-        exit_sockets[0] = -1;
-    }
+	if (exit_sockets[0] >= 0) {
+		close(exit_sockets[0]);
+		exit_sockets[0] = -1;
+	}
 
-    if (exit_sockets[1] >= 0) {
-        close(exit_sockets[1]);
-        exit_sockets[1] = -1;
-    }
+	if (exit_sockets[1] >= 0) {
+		close(exit_sockets[1]);
+		exit_sockets[1] = -1;
+	}
 }
 
 void wifi_close_supplicant_connection()
 {
-    wifi_close_sockets();
+	wifi_close_sockets();
 }
 
 static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
 int wifi_command(char const *cmd, char *reply, size_t reply_len)
 {
 	pthread_mutex_lock(&mut);
-	if(!cmd || !cmd[0]){
+	if (!cmd || !cmd[0]) {
 		pthread_mutex_unlock(&mut);
 		return -1;
 	}
 
-	wmg_printf(MSG_DEBUG,"do cmd %s\n", cmd);
+	wmg_printf(MSG_DEBUG, "do cmd %s\n", cmd);
 
 	--reply_len; // Ensure we have room to add NUL termination.
 	if (wifi_send_command(cmd, reply, &reply_len) != 0) {
@@ -624,8 +616,8 @@ int wifi_command(char const *cmd, char *reply, size_t reply_len)
 	}
 
 	// Strip off trailing newline.
-	if (reply_len > 0 && reply[reply_len-1] == '\n') {
-		reply[reply_len-1] = '\0';
+	if (reply_len > 0 && reply[reply_len - 1] == '\n') {
+		reply[reply_len - 1] = '\0';
 	} else {
 		reply[reply_len] = '\0';
 	}
diff --git a/workspace/tg5040/wifimanager/src/core/wifi_event.c b/workspace/tg5040/wifimanager/src/core/wifi_event.c
old mode 100755
new mode 100644
index c67e7b4f2..dc10a307e
--- a/workspace/tg5040/wifimanager/src/core/wifi_event.c
+++ b/workspace/tg5040/wifimanager/src/core/wifi_event.c
@@ -1,13 +1,13 @@
-#include<pthread.h>
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<unistd.h>
-#include<errno.h>
-#include<fcntl.h>
-#include<poll.h>
-#include<sys/types.h>
-#include<sys/socket.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <poll.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include "wifi.h"
 #include "wifi_event.h"
@@ -21,7 +21,7 @@ struct wpaManager wpa = {
 	.assocRejectCnt = 0,
 	.netNotFoundCnt = 0,
 	.authFailCnt = 0,
-	.evtFd = {-1,-1},
+	.evtFd = {-1, -1},
 	.netIdConnecting = {'\0'},
 };
 
@@ -34,13 +34,13 @@ int wifi_state_callback_index = 0;
 
 void evtSockeExit()
 {
-	if(a->EvtSocketEnable){
+	if (a->EvtSocketEnable) {
 		clearEvtSocket();
-		if(a->evtFd[0] >= 0) {
+		if (a->evtFd[0] >= 0) {
 			close(a->evtFd[0]);
 			a->evtFd[0] = -1;
 		}
-		if(a->evtFd[1] >= 0) {
+		if (a->evtFd[1] >= 0) {
 			close(a->evtFd[1]);
 			a->evtFd[1] = -1;
 		}
@@ -49,13 +49,13 @@ void evtSockeExit()
 int evtSocketInit()
 {
 	int ret = -1;
-	if(a->evtFd[0] >=0 || a->evtFd[1] >= 0){
+	if (a->evtFd[0] >= 0 || a->evtFd[1] >= 0) {
 		evtSockeExit();
 	}
 	a->evtFd[0] = a->evtFd[1] = -1;
-	ret = socketpair(AF_UNIX,SOCK_STREAM,0,a->evtFd);
-	if(ret == -1) {
-		wmg_printf(MSG_ERROR,"scan socketpair init error\n");
+	ret = socketpair(AF_UNIX, SOCK_STREAM, 0, a->evtFd);
+	if (ret == -1) {
+		wmg_printf(MSG_ERROR, "scan socketpair init error\n");
 		return ret;
 	}
 	a->EvtSocketEnable = true;
@@ -66,27 +66,26 @@ int clearEvtSocket()
 	int ret = -1;
 	char c;
 	int flags;
-	if(! a->EvtSocketEnable){
-		wmg_printf(MSG_ERROR,"event socket is closed\n");
+	if (!a->EvtSocketEnable) {
+		wmg_printf(MSG_ERROR, "event socket is closed\n");
 		return ret;
 	}
 	/* clear scan.sockets data before sending scan command*/
-	if(flags = fcntl(a->evtFd[1],F_GETFL,0) < 0){
-		wmg_printf(MSG_ERROR,"fcntl getfl error\n");
+	if (flags = fcntl(a->evtFd[1], F_GETFL, 0) < 0) {
+		wmg_printf(MSG_ERROR, "fcntl getfl error\n");
 		return -1;
 	}
 
 	flags |= O_NONBLOCK;
 
-	if(fcntl(a->evtFd[1],F_SETFL,flags) < 0){
-		wmg_printf(MSG_ERROR,"fcntl setfl error\n");
+	if (fcntl(a->evtFd[1], F_SETFL, flags) < 0) {
+		wmg_printf(MSG_ERROR, "fcntl setfl error\n");
 		return -1;
 	}
 
-	while ((ret= TEMP_FAILURE_RETRY(read(a->evtFd[1],&c,1))) > 0){
-		wmg_printf(MSG_DEBUG,"clear data %d\n",c);
+	while ((ret = TEMP_FAILURE_RETRY(read(a->evtFd[1], &c, 1))) > 0) {
+		wmg_printf(MSG_DEBUG, "clear data %d\n", c);
 	}
-
 }
 
 int evtSend(enum wpaEvent event)
@@ -94,13 +93,13 @@ int evtSend(enum wpaEvent event)
 	int ret = -1;
 	char data;
 
-	if(! a->EvtSocketEnable){
-		wmg_printf(MSG_ERROR,"event socket is closed\n");
+	if (!a->EvtSocketEnable) {
+		wmg_printf(MSG_ERROR, "event socket is closed\n");
 		return ret;
 	}
 
 	data = (char)event;
-	ret = TEMP_FAILURE_RETRY(write(a->evtFd[0],&data, 1));
+	ret = TEMP_FAILURE_RETRY(write(a->evtFd[0], &data, 1));
 
 	return ret;
 }
@@ -110,52 +109,52 @@ int evtRead(enum wpaEvent *event)
 	struct pollfd rfds;
 	char c;
 
-	if(! a->EvtSocketEnable){
-		wmg_printf(MSG_ERROR,"event socket is closed\n");
+	if (!a->EvtSocketEnable) {
+		wmg_printf(MSG_ERROR, "event socket is closed\n");
 		return ret;
 	}
 
-	memset(&rfds,0,sizeof(struct pollfd));
+	memset(&rfds, 0, sizeof(struct pollfd));
 	rfds.fd = a->evtFd[1];
 	rfds.events |= POLLIN;
 
 	/*wait  event.*/
 	ret = TEMP_FAILURE_RETRY(poll(&rfds, 1, 70000));
 	if (ret < 0) {
-		wmg_printf(MSG_ERROR,"Error poll = %d\n", ret);
+		wmg_printf(MSG_ERROR, "Error poll = %d\n", ret);
 		return ret;
 	}
-	if(ret == 0) {
-		wmg_printf(MSG_ERROR,"poll time out!\n");
+	if (ret == 0) {
+		wmg_printf(MSG_ERROR, "poll time out!\n");
 		return ret;
 	}
 	if (rfds.revents & POLLIN) {
-		ret = TEMP_FAILURE_RETRY(read(a->evtFd[1],&c,1));
+		ret = TEMP_FAILURE_RETRY(read(a->evtFd[1], &c, 1));
 		*event = (enum wpaEvent)c;
-		wmg_printf(MSG_DEBUG,"read event %d\n",c);
+		wmg_printf(MSG_DEBUG, "read event %d\n", c);
 	}
 	return ret;
 }
 
-static void handle_event(int event, char * remainder) {
-    char netid_connected[NET_ID_LEN+1] = {0};
-    char cmd[255] = {0}, reply[16]={0};
-    int len = NET_ID_LEN+1;
-    switch (event){
-        case WPAE_DISCONNECTED:
-			if(w->StaEvt.state == CONNECTED ||
-				w->StaEvt.state == NETWORK_CONNECTED){
-				wmg_printf(MSG_INFO,"Network disconnected!\n");
-				system("ip addr flush dev wlan0");
-				evtSend(WPA_DISCONNECTED);
-				w->StaEvt.state = DISCONNECTED;
-				w->StaEvt.event = WSE_AUTO_DISCONNECTED;
-				state_event_change(a->label);
-			}
-			break;
+static void handle_event(int event, char *remainder)
+{
+	char netid_connected[NET_ID_LEN + 1] = {0};
+	char cmd[255] = {0}, reply[16] = {0};
+	int len = NET_ID_LEN + 1;
+	switch (event) {
+	case WPAE_DISCONNECTED:
+		if (w->StaEvt.state == CONNECTED || w->StaEvt.state == NETWORK_CONNECTED) {
+			wmg_printf(MSG_INFO, "Network disconnected!\n");
+			system("ip addr flush dev wlan0");
+			evtSend(WPA_DISCONNECTED);
+			w->StaEvt.state = DISCONNECTED;
+			w->StaEvt.event = WSE_AUTO_DISCONNECTED;
+			state_event_change(a->label);
+		}
+		break;
 
-        case WPAE_CONNECTED:
-			if(w->StaEvt.state == CONNECTING){
+	case WPAE_CONNECTED:
+		if (w->StaEvt.state == CONNECTING) {
 #if 0
 				if(a->netIdConnecting[0] != '\0'){
 					/* get already connected netid */
@@ -171,213 +170,212 @@ static void handle_event(int event, char * remainder) {
 					}
 				}
 #endif
-				evtSend(WPAE_CONNECTED);
-			}else {
-				w->StaEvt.state = CONNECTED;
-				w->StaEvt.event = WSE_AUTO_CONNECTED;
-				state_event_change(a->label);
-			}
-            break;
+			evtSend(WPAE_CONNECTED);
+		} else {
+			w->StaEvt.state = CONNECTED;
+			w->StaEvt.event = WSE_AUTO_CONNECTED;
+			state_event_change(a->label);
+		}
+		break;
 
-		case WPAE_SCAN_FAILED:
-        case WPAE_SCAN_RESULTS:
-			if(isScanEnable())
-				evtSend(event);
-            break;
+	case WPAE_SCAN_FAILED:
+	case WPAE_SCAN_RESULTS:
+		if (isScanEnable())
+			evtSend(event);
+		break;
 
-		case WPAE_NETWORK_NOT_FOUND:
-			a->netNotFoundCnt ++;
-			wmg_printf(MSG_MSGDUMP,"NETWORK NOT FOUND %d times!\n",a->netNotFoundCnt);
+	case WPAE_NETWORK_NOT_FOUND:
+		a->netNotFoundCnt++;
+		wmg_printf(MSG_MSGDUMP, "NETWORK NOT FOUND %d times!\n", a->netNotFoundCnt);
 
-			if((a->netNotFoundCnt >= NETNOTFOUNDCNT) &&
-				w->StaEvt.state == CONNECTING){
-				evtSend(WPAE_NETWORK_NOT_FOUND);
-			}
-			break;
-        case WPAE_UNKNOWN:
-            break;
-    }
+		if ((a->netNotFoundCnt >= NETNOTFOUNDCNT) && w->StaEvt.state == CONNECTING) {
+			evtSend(WPAE_NETWORK_NOT_FOUND);
+		}
+		break;
+	case WPAE_UNKNOWN:
+		break;
+	}
 }
 
 static int dispatch_event(const char *event_str, int nread)
 {
-	  int i = 0, event = 0;
-    char event_nae[18];
-    char cmd[255] = {0}, reply[16]={0};
-	  char *nae_start = NULL, *nae_end = NULL;
-	  char *event_data = NULL;
-
-
-    if(!event_str || !event_str[0]){
-        wmg_printf(MSG_WARNING,"event is NULL!\n");
-        return 0;
-    }
-
-    if(strncmp(event_str, "CTRL-EVENT-", 11)){
-        if (!strncmp(event_str, "WPA:", 4)){
-            if (strstr(event_str, "pre-shared key may be incorrect")){
-                a->authFailCnt ++;
-				wmg_printf(MSG_DEBUG,"pre-shared key may be incorrect %d times\n",a->authFailCnt);
-                if(a->authFailCnt >= MAX_RETRIES_ON_AUTHENTICATION_FAILURE){
+	int i = 0, event = 0;
+	char event_nae[18];
+	char cmd[255] = {0}, reply[16] = {0};
+	char *nae_start = NULL, *nae_end = NULL;
+	char *event_data = NULL;
+
+
+	if (!event_str || !event_str[0]) {
+		wmg_printf(MSG_WARNING, "event is NULL!\n");
+		return 0;
+	}
+
+	if (strncmp(event_str, "CTRL-EVENT-", 11)) {
+		if (!strncmp(event_str, "WPA:", 4)) {
+			if (strstr(event_str, "pre-shared key may be incorrect")) {
+				a->authFailCnt++;
+				wmg_printf(MSG_DEBUG, "pre-shared key may be incorrect %d times\n", a->authFailCnt);
+				if (a->authFailCnt >= MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
 					evtSend(WPAE_PASSWORD_INCORRECT);
-                }
-                return 0;
-            }
-        }
-        return 0;
-    }
-
-    nae_start = (char *)((unsigned long)event_str+11);
-    nae_end = strchr(nae_start, ' ');
-    if(nae_end){
-        while((nae_start < nae_end) && (i < (sizeof(event_nae) - 1))){
-            event_nae[i] = *nae_start++;
-            i++;
-        }
-        event_nae[i] = '\0';
-    } else {
-        wmg_printf(MSG_DEBUG,"Received wpa_supplicant event with empty event nae!\n");
-        return 0;
-    }
-
-    /*
-     * Map event nae into event enum
-    */
-    wmg_printf(MSG_MSGDUMP,"event name:%s\n",event_nae);
-    if(!strcmp(event_nae, "CONNECTED")){
-        event = WPAE_CONNECTED;
-    }else if(!strcmp(event_nae, "DISCONNECTED")){
-        event = WPAE_DISCONNECTED;
-    }else if(!strcmp(event_nae, "STATE-CHANGE")){
-        event = WPAE_STATE_CHANGE;
-	}else if(!strcmp(event_nae,"SCAN-FAILED")){
+				}
+				return 0;
+			}
+		}
+		return 0;
+	}
+
+	nae_start = (char *)((unsigned long)event_str + 11);
+	nae_end = strchr(nae_start, ' ');
+	if (nae_end) {
+		while ((nae_start < nae_end) && (i < (sizeof(event_nae) - 1))) {
+			event_nae[i] = *nae_start++;
+			i++;
+		}
+		event_nae[i] = '\0';
+	} else {
+		wmg_printf(MSG_DEBUG, "Received wpa_supplicant event with empty event nae!\n");
+		return 0;
+	}
+
+	/*
+	 * Map event nae into event enum
+	 */
+	wmg_printf(MSG_MSGDUMP, "event name:%s\n", event_nae);
+	if (!strcmp(event_nae, "CONNECTED")) {
+		event = WPAE_CONNECTED;
+	} else if (!strcmp(event_nae, "DISCONNECTED")) {
+		event = WPAE_DISCONNECTED;
+	} else if (!strcmp(event_nae, "STATE-CHANGE")) {
+		event = WPAE_STATE_CHANGE;
+	} else if (!strcmp(event_nae, "SCAN-FAILED")) {
 		event = WPAE_SCAN_FAILED;
-    }else if(!strcmp(event_nae, "SCAN-RESULTS")){
-        event = WPAE_SCAN_RESULTS;
-    }else if(!strcmp(event_nae, "LINK-SPEED")){
-        event = WPAE_LINK_SPEED;
-    }else if(!strcmp(event_nae, "TERMINATING")){
-        event = WPAE_TERMINATING;
-    }else if(!strcmp(event_nae, "DRIVER-STATE")){
-        event = WPAE_DRIVER_STATE;
-    }else if(!strcmp(event_nae, "EAP-FAILURE")){
-        event = WPAE_EAP_FAILURE;
-	}else if(!strcmp(event_nae, "NETWORK-NOT-FOUND")){
+	} else if (!strcmp(event_nae, "SCAN-RESULTS")) {
+		event = WPAE_SCAN_RESULTS;
+	} else if (!strcmp(event_nae, "LINK-SPEED")) {
+		event = WPAE_LINK_SPEED;
+	} else if (!strcmp(event_nae, "TERMINATING")) {
+		event = WPAE_TERMINATING;
+	} else if (!strcmp(event_nae, "DRIVER-STATE")) {
+		event = WPAE_DRIVER_STATE;
+	} else if (!strcmp(event_nae, "EAP-FAILURE")) {
+		event = WPAE_EAP_FAILURE;
+	} else if (!strcmp(event_nae, "NETWORK-NOT-FOUND")) {
 		event = WPAE_NETWORK_NOT_FOUND;
-    }else if(!strcmp(event_nae, "ASSOC-REJECT")){
-        event = WPAE_ASSOC_REJECT;
-    }else{
-        event = WPAE_UNKNOWN;
-    }
-
-    event_data = (char *)((unsigned long)event_str);
-    if(event == WPAE_DRIVER_STATE || event == WPAE_LINK_SPEED){
-        return 0;
-    }else if(event == WPAE_STATE_CHANGE || event == WPAE_EAP_FAILURE){
-        event_data = strchr(event_str, ' ');
-        if(event_data){
-            event_data++;
-        }
-    }else{
-        event_data = strstr(event_str, " - ");
-        if (event_data) {
-            event_data += 3;
-        }
-    }
-
-    if(event == WPAE_STATE_CHANGE){
-        wmg_printf(MSG_DEBUG,"STATE_CHANGE, no care!\n");
-        return 0;
-    } else if(event == WPAE_DRIVER_STATE){
-        wmg_printf(MSG_DEBUG,"DRIVER_STATE, no care!\n");
-        return 0;
-    }else if(event == WPAE_TERMINATING){
-        wmg_printf(MSG_ERROR,"Wpa supplicant terminated!\n");
+	} else if (!strcmp(event_nae, "ASSOC-REJECT")) {
+		event = WPAE_ASSOC_REJECT;
+	} else {
+		event = WPAE_UNKNOWN;
+	}
+
+	event_data = (char *)((unsigned long)event_str);
+	if (event == WPAE_DRIVER_STATE || event == WPAE_LINK_SPEED) {
+		return 0;
+	} else if (event == WPAE_STATE_CHANGE || event == WPAE_EAP_FAILURE) {
+		event_data = strchr(event_str, ' ');
+		if (event_data) {
+			event_data++;
+		}
+	} else {
+		event_data = strstr(event_str, " - ");
+		if (event_data) {
+			event_data += 3;
+		}
+	}
+
+	if (event == WPAE_STATE_CHANGE) {
+		wmg_printf(MSG_DEBUG, "STATE_CHANGE, no care!\n");
+		return 0;
+	} else if (event == WPAE_DRIVER_STATE) {
+		wmg_printf(MSG_DEBUG, "DRIVER_STATE, no care!\n");
+		return 0;
+	} else if (event == WPAE_TERMINATING) {
+		wmg_printf(MSG_ERROR, "Wpa supplicant terminated!\n");
 		evtSend(WPAE_TERMINATING);
 		w->enable = false;
 		w->StaEvt.state = DISCONNECTED;
 		w->StaEvt.event = WSE_WPA_TERMINATING;
 		state_event_change(a->label);
-        return 1;
-    }else if(event == WPAE_EAP_FAILURE){
-        wmg_printf(MSG_ERROR,"EAP FAILURE!\n");
-        return 0;
-    }else if(event == WPAE_ASSOC_REJECT){
-        a->assocRejectCnt ++;
-        if(a->assocRejectCnt >= MAX_ASSOC_REJECT_COUNT){
-            /* send disconnect */
-            sprintf(cmd, "%s", "DISCONNECT");
-            wifi_command(cmd, reply, sizeof(reply));
+		return 1;
+	} else if (event == WPAE_EAP_FAILURE) {
+		wmg_printf(MSG_ERROR, "EAP FAILURE!\n");
+		return 0;
+	} else if (event == WPAE_ASSOC_REJECT) {
+		a->assocRejectCnt++;
+		if (a->assocRejectCnt >= MAX_ASSOC_REJECT_COUNT) {
+			/* send disconnect */
+			sprintf(cmd, "%s", "DISCONNECT");
+			wifi_command(cmd, reply, sizeof(reply));
 			evtSend(WPAE_ASSOC_REJECT);
-			wmg_printf(MSG_ERROR,"ASSOC REJECT!\n");
-        }
-        wmg_printf(MSG_DEBUG,"ASSOC REJECT!\n");
-        return 0;
-    }else{
-        handle_event(event, event_data);
-    }
-    return 0;
+			wmg_printf(MSG_ERROR, "ASSOC REJECT!\n");
+		}
+		wmg_printf(MSG_DEBUG, "ASSOC REJECT!\n");
+		return 0;
+	} else {
+		handle_event(event, event_data);
+	}
+	return 0;
 }
-void *event_handle_thread(void* args)
+void *event_handle_thread(void *args)
 {
 	char buf[EVENT_BUF_SIZE] = {0};
 	int nread = 0, ret = 0;
 
-    for(;;){
-        nread = wifi_wait_for_event(buf, sizeof(buf));
-        if (nread > 0) {
-            ret = dispatch_event(buf, nread);
-            if(ret == 1){
-                break;  // wpa_supplicant terminated
-            }
-        } else {
-            continue;
-        }
-    }
-
-    pthread_exit(NULL);
+	for (;;) {
+		nread = wifi_wait_for_event(buf, sizeof(buf));
+		if (nread > 0) {
+			ret = dispatch_event(buf, nread);
+			if (ret == 1) {
+				break; // wpa_supplicant terminated
+			}
+		} else {
+			continue;
+		}
+	}
+
+	pthread_exit(NULL);
 }
 
 void wifi_start_event_loop()
 {
-    pthread_create(&a->evtThreadId, NULL, event_handle_thread, NULL);
+	pthread_create(&a->evtThreadId, NULL, event_handle_thread, NULL);
 }
 
 void wifi_stop_event_loop()
 {
-    pthread_cancel(a->evtThreadId);
-	pthread_join(a->evtThreadId,NULL);
-    usleep(10000);
+	pthread_cancel(a->evtThreadId);
+	pthread_join(a->evtThreadId, NULL);
+	usleep(10000);
 }
 
 int add_wifi_state_callback_inner(tWifi_state_callback pcb)
 {
-    if(wifi_state_callback_index >= MAX_CALLBCAKS_COUNT){
-        return -1;
-    }
+	if (wifi_state_callback_index >= MAX_CALLBCAKS_COUNT) {
+		return -1;
+	}
 
-    wifi_state_callback[wifi_state_callback_index]=pcb;
-    wifi_state_callback_index++;
-    return 0;
+	wifi_state_callback[wifi_state_callback_index] = pcb;
+	wifi_state_callback_index++;
+	return 0;
 }
 
 int reset_wifi_state_callback()
 {
-    int i=0;
-    for(i=0; i<wifi_state_callback_index; i++){
-        wifi_state_callback[i]=NULL;
-    }
-    wifi_state_callback_index--;
-    return 0;
+	int i = 0;
+	for (i = 0; i < wifi_state_callback_index; i++) {
+		wifi_state_callback[i] = NULL;
+	}
+	wifi_state_callback_index--;
+	return 0;
 }
 
 int call_state_callback_function(struct Manager *w, int state_label)
 {
-    int i=0;
-    for(i=0; i<wifi_state_callback_index; i++){
-        if(wifi_state_callback[i] != NULL){
-            wifi_state_callback[i](w, state_label);
-        }
-    }
-    return 0;
+	int i = 0;
+	for (i = 0; i < wifi_state_callback_index; i++) {
+		if (wifi_state_callback[i] != NULL) {
+			wifi_state_callback[i](w, state_label);
+		}
+	}
+	return 0;
 }
diff --git a/workspace/tg5040/wifimanager/src/core/wifi_udhcpc.c b/workspace/tg5040/wifimanager/src/core/wifi_udhcpc.c
old mode 100755
new mode 100644
index 0cf1e2a58..6c0efb716
--- a/workspace/tg5040/wifimanager/src/core/wifi_udhcpc.c
+++ b/workspace/tg5040/wifimanager/src/core/wifi_udhcpc.c
@@ -1,7 +1,7 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
-#include<unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <pthread.h>
 #include <sys/types.h>
 #include <ifaddrs.h>
@@ -22,92 +22,90 @@ static int get_net_ip(const char *if_name, int family, char *ip, int len)
 	struct sockaddr_in6 *addr6;
 	char buf[NI_MAXHOST];
 	struct ifaddrs *if_dev, *if_inter;
-    if(getifaddrs(&if_dev)) {
+	if (getifaddrs(&if_dev)) {
 		return -1;
 	}
-	for(if_inter = if_dev; if_inter != NULL;if_inter=if_inter->ifa_next) {
-		if(strcmp(if_name,if_inter->ifa_name) != 0)
+	for (if_inter = if_dev; if_inter != NULL; if_inter = if_inter->ifa_next) {
+		if (strcmp(if_name, if_inter->ifa_name) != 0)
 			continue;
 
-		if(NULL == if_inter->ifa_addr)
+		if (NULL == if_inter->ifa_addr)
 			continue;
 
-		if(family != if_inter->ifa_addr->sa_family)
+		if (family != if_inter->ifa_addr->sa_family)
 			continue;
 
-		if (if_inter->ifa_addr->sa_family==AF_INET6) { // check it is IP6
+		if (if_inter->ifa_addr->sa_family == AF_INET6) { // check it is IP6
 			addr6 = (struct sockaddr_in6 *)if_inter->ifa_addr;
-			if(IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr)){
+			if (IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr)) {
 				continue;
 			}
-			if(IN6_IS_ADDR_LINKLOCAL(&addr6->sin6_addr)){
+			if (IN6_IS_ADDR_LINKLOCAL(&addr6->sin6_addr)) {
 				continue;
 			}
-			if(IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)){
+			if (IN6_IS_ADDR_LOOPBACK(&addr6->sin6_addr)) {
 				continue;
 			}
-			if(IN6_IS_ADDR_UNSPECIFIED(&addr6->sin6_addr)){
+			if (IN6_IS_ADDR_UNSPECIFIED(&addr6->sin6_addr)) {
 				continue;
 			}
-			if(IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr)){
+			if (IN6_IS_ADDR_SITELOCAL(&addr6->sin6_addr)) {
 				continue;
 			}
-			if ( NULL != inet_ntop(if_inter->ifa_addr->sa_family,
-					(void *)&(addr6->sin6_addr), buf, NI_MAXHOST)){
-				if(len <= strlen(buf) )
+			if (NULL != inet_ntop(if_inter->ifa_addr->sa_family, (void *)&(addr6->sin6_addr), buf, NI_MAXHOST)) {
+				if (len <= strlen(buf))
 					break;
-				strcpy(ip,buf);
+				strcpy(ip, buf);
 			}
-        } else if (if_inter->ifa_addr->sa_family==AF_INET) { // check it is IP4
+		} else if (if_inter->ifa_addr->sa_family == AF_INET) { // check it is IP4
 			addr4 = (struct sockaddr_in *)if_inter->ifa_addr;
-			if ( NULL != inet_ntop(if_inter->ifa_addr->sa_family,
-						(void *)&(addr4->sin_addr), buf, NI_MAXHOST)) {
-				if(len <= strlen(buf))
+			if (NULL != inet_ntop(if_inter->ifa_addr->sa_family, (void *)&(addr4->sin_addr), buf, NI_MAXHOST)) {
+				if (len <= strlen(buf))
 					break;
 				strcpy(ip, buf);
 			}
-        }
-    }
+		}
+	}
 
-    if(if_dev != NULL){
-        freeifaddrs(if_dev);
-    }
-    return 0;
+	if (if_dev != NULL) {
+		freeifaddrs(if_dev);
+	}
+	return 0;
 }
 
 
 int is_ip_exist()
 {
-    char ipaddr[NI_MAXHOST] = {0};
+	char ipaddr[NI_MAXHOST] = {0};
 
-    get_net_ip("wlan0", AF_INET, ipaddr, NI_MAXHOST);
+	get_net_ip("wlan0", AF_INET, ipaddr, NI_MAXHOST);
 
-	if(ipaddr[0] == 0)
+	if (ipaddr[0] == 0)
 		return 0;
 	else
 		return 1;
 }
 
-int  udhcpc_v4(void)
+int udhcpc_v4(void)
 {
-    int times = 0;
-    char ipaddr[NI_MAXHOST] = {0};
-    char cmd[256] = {0}, reply[8] = {0};
+	int times = 0;
+	char ipaddr[NI_MAXHOST] = {0};
+	char cmd[256] = {0}, reply[8] = {0};
 
-	wmg_printf(MSG_DEBUG,"OBTAINING IPv4......\n");
-    /* restart udhcpc */
-    system("/etc/wifi/udhcpc_wlan0 start >/dev/null");
+	wmg_printf(MSG_DEBUG, "OBTAINING IPv4......\n");
+	/* restart udhcpc */
+	system("/etc/wifi/udhcpc_wlan0 start >/dev/null");
 
-    /* check ip exist */
+	/* check ip exist */
 	ms_sleep(1000);
-    times = 0;
-    do{
+	times = 0;
+	do {
 		ms_sleep(1000);
-        get_net_ip("wlan0", AF_INET, ipaddr, NI_MAXHOST);
-        times++;
-    }while((ipaddr[0] == 0) && (times < 30));
+		get_net_ip("wlan0", AF_INET, ipaddr, NI_MAXHOST);
+		times++;
+	} while ((ipaddr[0] == 0) && (times < 30));
 
-	if(ipaddr[0] != 0)
+	if (ipaddr[0] != 0)
 		return 0;
 	else
 		return -1;
@@ -124,15 +122,15 @@ struct dhcpv6_context odhcp6_instance = {
 
 static void *odhcp6_thread(void *arg)
 {
-    int len = 0, vflag = 0, times = 0;
-    char ipaddr[NI_MAXHOST] = {0};
+	int len = 0, vflag = 0, times = 0;
+	char ipaddr[NI_MAXHOST] = {0};
 
 	odhcp6_instance.thread_enable = true;
 
 	pthread_detach(pthread_self());
 
-	wmg_printf(MSG_DEBUG,"OBTAINING IPv6......\n");
-	if(get_process_state("odhcp6c",7) > 0) {
+	wmg_printf(MSG_DEBUG, "OBTAINING IPv6......\n");
+	if (get_process_state("odhcp6c", 7) > 0) {
 		system("killall -9 odhcp6c");
 	}
 
@@ -140,14 +138,14 @@ static void *odhcp6_thread(void *arg)
 
 	do {
 		ms_sleep(1000);
-		get_net_ip("wlan0",AF_INET6,ipaddr,NI_MAXHOST);
-        times++;
-    }while((ipaddr[0] == 0) && (times < 30));
-
-	if(ipaddr[0] != 0) {
-		wmg_printf(MSG_DEBUG,"IPv6 address:%s\n",ipaddr);
-	}else {
-		wmg_printf(MSG_WARNING,"Got IPv4 timeout\n");
+		get_net_ip("wlan0", AF_INET6, ipaddr, NI_MAXHOST);
+		times++;
+	} while ((ipaddr[0] == 0) && (times < 30));
+
+	if (ipaddr[0] != 0) {
+		wmg_printf(MSG_DEBUG, "IPv6 address:%s\n", ipaddr);
+	} else {
+		wmg_printf(MSG_WARNING, "Got IPv4 timeout\n");
 	}
 	odhcp6_instance.thread_enable = false;
 
@@ -158,21 +156,21 @@ int odhcp6_start(void)
 {
 	int ret = -1;
 
-	if(odhcp6_instance.thread_enable == true) {
-		wmg_printf(MSG_WARNING,"odhcp6 thread already start.\n");
+	if (odhcp6_instance.thread_enable == true) {
+		wmg_printf(MSG_WARNING, "odhcp6 thread already start.\n");
 	}
 
-	if((ret = pthread_create(&odhcp6_instance.thread, NULL, odhcp6_thread, NULL)) != 0) {
-		wmg_printf(MSG_ERROR,"create odhcp6 thread failed\n");
+	if ((ret = pthread_create(&odhcp6_instance.thread, NULL, odhcp6_thread, NULL)) != 0) {
+		wmg_printf(MSG_ERROR, "create odhcp6 thread failed\n");
 		return -1;
 	}
 }
 #else
 int odhcp6_start(void)
 {
-	wmg_printf(MSG_DEBUG,"OBTAINING IPv6......\n");
+	wmg_printf(MSG_DEBUG, "OBTAINING IPv6......\n");
 
-	if(get_process_state("odhcp6c",7) > 0) {
+	if (get_process_state("odhcp6c", 7) > 0) {
 		system("killall -9 odhcp6c");
 	}
 
@@ -194,26 +192,25 @@ void start_udhcpc()
 	state_event_change(a->label);
 	ret_ipv4 = udhcpc_v4();
 
-	if(ret_ipv4 != 0) {
-		wmg_print(MSG_ERROR,"Got IPv4 failed.\n");
+	if (ret_ipv4 != 0) {
+		wmg_print(MSG_ERROR, "Got IPv4 failed.\n");
 	}
 
 #ifdef CONFIG_IPV6
 	odhcp6_start();
 #endif
 	/*For protocol stacks where IPv4 and IPv6 coexist, Only check whether IPv4 is obtained*/
-	if(ret_ipv4 == 0) {
+	if (ret_ipv4 == 0) {
 		w->StaEvt.state = NETWORK_CONNECTED;
 		state_event_change(a->label);
-    }else{
-        wmg_printf(MSG_ERROR,"udhcpc wlan0 timeout\n");
-        if(w->StaEvt.state != CONNECTED){
-
+	} else {
+		wmg_printf(MSG_ERROR, "udhcpc wlan0 timeout\n");
+		if (w->StaEvt.state != CONNECTED) {
 			w->StaEvt.state = DISCONNECTED;
 			w->StaEvt.event = WSE_OBTAINED_IP_TIMEOUT;
 			cancel_saved_conf_handle(a->netIdConnecting);
 
 			state_event_change(a->label);
-        }
-    }
+		}
+	}
 }
diff --git a/workspace/tg5040/wifimanager/src/core/wifimanager.c b/workspace/tg5040/wifimanager/src/core/wifimanager.c
old mode 100755
new mode 100644
index 047fba6fd..c6c434582
--- a/workspace/tg5040/wifimanager/src/core/wifimanager.c
+++ b/workspace/tg5040/wifimanager/src/core/wifimanager.c
@@ -1,7 +1,7 @@
-#include<stdlib.h>
-#include<stdio.h>
-#include<string.h>
-#include<unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <fcntl.h>
@@ -15,15 +15,16 @@
 #include "wmg_debug.h"
 #include "wifi_udhcpc.h"
 
-#define WPA_SSID_LENTH  512
+#define WPA_SSID_LENTH 512
 
 #define VERSION "18.10.31"
 
 struct Manager wmg = {
-	.StaEvt = {
-		.state = DISCONNECTED,
-		.event = WSE_UNKNOWN,
-	},
+	.StaEvt =
+		{
+			.state = DISCONNECTED,
+			.event = WSE_UNKNOWN,
+		},
 	.ssid = NULL,
 	.enable = 0,
 };
@@ -33,11 +34,11 @@ struct Manager *w = &wmg;
 
 static char wpa_scan_ssid[WPA_SSID_LENTH];
 static char wpa_conf_ssid[WPA_SSID_LENTH];
-static int  ssid_contain_chinese = 0;
+static int ssid_contain_chinese = 0;
 
 static int aw_wifi_disconnect_ap(int event_label);
 
-const char * wmg_state_txt(enum wmgState state)
+const char *wmg_state_txt(enum wmgState state)
 {
 	switch (state) {
 	case DISCONNECTED:
@@ -55,7 +56,7 @@ const char * wmg_state_txt(enum wmgState state)
 	}
 }
 
-const char* wmg_event_txt(enum wmgEvent event)
+const char *wmg_event_txt(enum wmgEvent event)
 {
 	switch (event) {
 	case WSE_ACTIVE_CONNECT:
@@ -96,14 +97,14 @@ const char* wmg_event_txt(enum wmgEvent event)
 }
 int state_event_change(int label)
 {
-	wmg_printf(MSG_DEBUG,"event_label:%d\n",label);
-	wmg_printf(MSG_DEBUG,"--->WMG_EVENT: %s\n",wmg_event_txt(w->StaEvt.event));
-	wmg_printf(MSG_DEBUG,"--->WMG_STATE: %s\n",wmg_state_txt(w->StaEvt.state));
-	call_state_callback_function(w,label);
+	wmg_printf(MSG_DEBUG, "event_label:%d\n", label);
+	wmg_printf(MSG_DEBUG, "--->WMG_EVENT: %s\n", wmg_event_txt(w->StaEvt.event));
+	wmg_printf(MSG_DEBUG, "--->WMG_STATE: %s\n", wmg_state_txt(w->StaEvt.state));
+	call_state_callback_function(w, label);
 }
 static int aw_wifi_add_state_callback(tWifi_state_callback pcb)
 {
-      return add_wifi_state_callback_inner(pcb);
+	return add_wifi_state_callback_inner(pcb);
 }
 enum wmgState aw_wifi_get_wifi_state()
 {
@@ -124,26 +125,25 @@ static int clearManagerdata()
 
 static int aw_wifi_ssid_is_connected_ap(char *ssid)
 {
-    int ret = 0;
-    struct wpa_status * sta;
+	int ret = 0;
+	struct wpa_status *sta;
 
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"wpa_supplicant is closed\n");
-        return -1;
-    }
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "wpa_supplicant is closed\n");
+		return -1;
+	}
 
-	if((sta = get_wpa_status_info()) != NULL){
-		if(sta->wpa_state >= WPA_SCANNING){
-			wmg_printf(MSG_INFO,"wpa_supplicant is busing now\n");
+	if ((sta = get_wpa_status_info()) != NULL) {
+		if (sta->wpa_state >= WPA_SCANNING) {
+			wmg_printf(MSG_INFO, "wpa_supplicant is busing now\n");
 			return -1;
 		}
-		if(sta->wpa_state == WPA_COMPLETED){
-			if(!strncmp(sta->ssid,ssid,strlen(ssid)) &&
-				sta->ip_address[0] != '\0')
+		if (sta->wpa_state == WPA_COMPLETED) {
+			if (!strncmp(sta->ssid, ssid, strlen(ssid)) && sta->ip_address[0] != '\0')
 				return 1;
 		}
-	}else{
-		wmg_printf(MSG_INFO,"get wpa status NULL\n");
+	} else {
+		wmg_printf(MSG_INFO, "get wpa status NULL\n");
 	}
 
 	return -1;
@@ -151,52 +151,53 @@ static int aw_wifi_ssid_is_connected_ap(char *ssid)
 
 
 /*
-*get wifi connection state with AP
-*return value:
-*1: connected with AP(connected to network IPv4)
-*2: connected with AP(connected to network IPv6)
-*0: disconnected with AP
-*/
+ *get wifi connection state with AP
+ *return value:
+ *1: connected with AP(connected to network IPv4)
+ *2: connected with AP(connected to network IPv6)
+ *0: disconnected with AP
+ */
 static int aw_wifi_is_ap_connected(char *ssid, int *len)
 {
-    int ret = 0;
-    struct wpa_status * sta;;
+	int ret = 0;
+	struct wpa_status *sta;
+	;
 
-    if(! w->enable){
-        return -1;
-    }
+	if (!w->enable) {
+		return -1;
+	}
 
 	sta = get_wpa_status_info();
-	if(sta->wpa_state >= WPA_SCANNING){
-		wmg_printf(MSG_INFO,"wpa_supplicant is busing now\n");
+	if (sta->wpa_state >= WPA_SCANNING) {
+		wmg_printf(MSG_INFO, "wpa_supplicant is busing now\n");
 		return -1;
 	}
 
-    if( 4 == wpa_conf_is_ap_connected(ssid, len))
-	ret = 1;
-    else if( 6 == wpa_conf_is_ap_connected(ssid, len))
-	ret = 2;
-    else
-	ret = 0;
+	if (4 == wpa_conf_is_ap_connected(ssid, len))
+		ret = 1;
+	else if (6 == wpa_conf_is_ap_connected(ssid, len))
+		ret = 2;
+	else
+		ret = 0;
 
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_connection_info(connection_status *connection_info)
 {
-    int ret = 0;
-    struct wpa_status * sta;
+	int ret = 0;
+	struct wpa_status *sta;
 	signal_status signal_info;
 
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"wpa_supplicant is closed\n");
-        return -1;
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "wpa_supplicant is closed\n");
+		return -1;
 	}
 
 
-	if((sta = get_wpa_status_info()) != NULL){
+	if ((sta = get_wpa_status_info()) != NULL) {
 		if (sta->wpa_state != WPA_COMPLETED) {
-			wmg_printf(MSG_INFO,"WIFI isn't connected to AP at current\n");
+			wmg_printf(MSG_INFO, "WIFI isn't connected to AP at current\n");
 			return -1;
 		} else {
 			strncpy(connection_info->ssid, sta->ssid, strlen(sta->ssid));
@@ -209,11 +210,11 @@ static int aw_wifi_connection_info(connection_status *connection_info)
 				connection_info->link_speed = signal_info.link_speed;
 				connection_info->noise = signal_info.noise;
 			} else {
-				wmg_printf(MSG_INFO,"get signal info NULL\n");
+				wmg_printf(MSG_INFO, "get signal info NULL\n");
 			}
 		}
-	}else{
-		wmg_printf(MSG_INFO,"get wpa status NULL\n");
+	} else {
+		wmg_printf(MSG_INFO, "get wpa status NULL\n");
 	}
 
 	return ret;
@@ -221,168 +222,159 @@ static int aw_wifi_connection_info(connection_status *connection_info)
 
 static int aw_wifi_get_scan_results(char *result, int *len)
 {
-    if(! w->enable){
-        return -1;
-    }
+	if (!w->enable) {
+		return -1;
+	}
 
-    if(direct_get_scan_results_inner(result, len) != 0)
-    {
-        wmg_printf(MSG_ERROR,"%s: There is a scan or scan_results error, Please try scan again later!\n", __func__);
-        return -1;
-    } else {
-        return 0;
-    }
+	if (direct_get_scan_results_inner(result, len) != 0) {
+		wmg_printf(MSG_ERROR, "%s: There is a scan or scan_results error, Please try scan again later!\n", __func__);
+		return -1;
+	} else {
+		return 0;
+	}
 }
 
 /* check wpa/wpa2 passwd is right */
 int check_wpa_passwd(const char *passwd)
 {
-    int result = 0;
-    int i=0;
+	int result = 0;
+	int i = 0;
 
-    if(!passwd || *passwd =='\0'){
-        return 0;
-    }
+	if (!passwd || *passwd == '\0') {
+		return 0;
+	}
 
-    for(i=0; passwd[i]!='\0'; i++){
-        /* non printable char */
-        if((passwd[i]<32) || (passwd[i] > 126)){
-            result = 0;
-            break;
-        }
-    }
+	for (i = 0; passwd[i] != '\0'; i++) {
+		/* non printable char */
+		if ((passwd[i] < 32) || (passwd[i] > 126)) {
+			result = 0;
+			break;
+		}
+	}
 
-    if(passwd[i] == '\0'){
-        result = 1;
-    }
+	if (passwd[i] == '\0') {
+		result = 1;
+	}
 
-    return result;
+	return result;
 }
 
 /* convert app ssid which contain chinese in utf-8 to wpa scan ssid */
 static int ssid_app_to_wpa_scan(const char *app_ssid, char *scan_ssid)
 {
-    unsigned char h_val = 0, l_val = 0;
-    int i = 0;
-    int chinese_in = 0;
-
-    if(!app_ssid || !app_ssid[0])
-    {
-        wmg_printf(MSG_ERROR,"Error: app ssid is NULL!\n");
-        return -1;
-    }
+	unsigned char h_val = 0, l_val = 0;
+	int i = 0;
+	int chinese_in = 0;
 
-    if(!scan_ssid)
-    {
-        wmg_printf(MSG_ERROR,"Error: wpa ssid buf is NULL\n");
-        return -1;
-    }
+	if (!app_ssid || !app_ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: app ssid is NULL!\n");
+		return -1;
+	}
 
-    i = 0;
-    while(app_ssid[i] != '\0')
-    {
-        /* ascii code */
-        if((unsigned char)app_ssid[i] <= 0x7f)
-        {
-            *(scan_ssid++) = app_ssid[i++];
-        }
-        else /* covert to wpa ssid for chinese code */
-        {
-            *(scan_ssid++) = '\\';
-            *(scan_ssid++) = 'x';
-            h_val = (app_ssid[i] & 0xf0) >> 4;
-            if((h_val >= 0) && (h_val <= 9)){
-                *(scan_ssid++) = h_val + '0';
-            }else if((h_val >= 0x0a) && (h_val <= 0x0f)){
-                *(scan_ssid++) = h_val + 'a' - 0xa;
-            }
-
-            l_val = app_ssid[i] & 0x0f;
-            if((l_val >= 0) && (l_val <= 9)){
-                *(scan_ssid++) = l_val + '0';
-            }else if((l_val >= 0x0a) && (l_val <= 0x0f)){
-                *(scan_ssid++) = l_val + 'a' - 0xa;
-            }
-            i++;
-            chinese_in = 1;
-        }
-    }
-    *scan_ssid = '\0';
+	if (!scan_ssid) {
+		wmg_printf(MSG_ERROR, "Error: wpa ssid buf is NULL\n");
+		return -1;
+	}
 
-    if(chinese_in == 1){
-        return 1;
-    }
+	i = 0;
+	while (app_ssid[i] != '\0') {
+		/* ascii code */
+		if ((unsigned char)app_ssid[i] <= 0x7f) {
+			*(scan_ssid++) = app_ssid[i++];
+		} else /* covert to wpa ssid for chinese code */
+		{
+			*(scan_ssid++) = '\\';
+			*(scan_ssid++) = 'x';
+			h_val = (app_ssid[i] & 0xf0) >> 4;
+			if ((h_val >= 0) && (h_val <= 9)) {
+				*(scan_ssid++) = h_val + '0';
+			} else if ((h_val >= 0x0a) && (h_val <= 0x0f)) {
+				*(scan_ssid++) = h_val + 'a' - 0xa;
+			}
 
-    return 0;
+			l_val = app_ssid[i] & 0x0f;
+			if ((l_val >= 0) && (l_val <= 9)) {
+				*(scan_ssid++) = l_val + '0';
+			} else if ((l_val >= 0x0a) && (l_val <= 0x0f)) {
+				*(scan_ssid++) = l_val + 'a' - 0xa;
+			}
+			i++;
+			chinese_in = 1;
+		}
+	}
+	*scan_ssid = '\0';
+
+	if (chinese_in == 1) {
+		return 1;
+	}
+
+	return 0;
 }
 
 /* convert app ssid which contain chinese in utf-8 to wpa conf ssid */
 static int ssid_app_to_wpa_conf(const char *app_ssid, char *conf_ssid)
 {
-    unsigned char h_val = 0, l_val = 0;
-    int i = 0;
-    int chinese_in = 0;
-
-    if(!app_ssid || !app_ssid[0])
-    {
-        wmg_printf(MSG_ERROR,"Error: app ssid is NULL!\n");
-        return -1;
-    }
+	unsigned char h_val = 0, l_val = 0;
+	int i = 0;
+	int chinese_in = 0;
 
-    if(!conf_ssid)
-    {
-        wmg_printf(MSG_ERROR,"Error: wpa ssid buf is NULL\n");
-        return -1;
-    }
+	if (!app_ssid || !app_ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: app ssid is NULL!\n");
+		return -1;
+	}
 
-    i = 0;
-    while(app_ssid[i] != '\0')
-    {
-        h_val = (app_ssid[i] & 0xf0) >> 4;
-        if((h_val >= 0) && (h_val <= 9)){
-            *(conf_ssid++) = h_val + '0';
-        }else if((h_val >= 0x0a) && (h_val <= 0x0f)){
-            *(conf_ssid++) = h_val + 'a' - 0xa;
-        }
-
-        l_val = app_ssid[i] & 0x0f;
-        if((l_val >= 0) && (l_val <= 9)){
-            *(conf_ssid++) = l_val + '0';
-        }else if((l_val >= 0x0a) && (l_val <= 0x0f)){
-            *(conf_ssid++) = l_val + 'a' - 0xa;
-        }
-        i++;
-    }
-    *conf_ssid = '\0';
+	if (!conf_ssid) {
+		wmg_printf(MSG_ERROR, "Error: wpa ssid buf is NULL\n");
+		return -1;
+	}
 
-    return 0;
+	i = 0;
+	while (app_ssid[i] != '\0') {
+		h_val = (app_ssid[i] & 0xf0) >> 4;
+		if ((h_val >= 0) && (h_val <= 9)) {
+			*(conf_ssid++) = h_val + '0';
+		} else if ((h_val >= 0x0a) && (h_val <= 0x0f)) {
+			*(conf_ssid++) = h_val + 'a' - 0xa;
+		}
+
+		l_val = app_ssid[i] & 0x0f;
+		if ((l_val >= 0) && (l_val <= 9)) {
+			*(conf_ssid++) = l_val + '0';
+		} else if ((l_val >= 0x0a) && (l_val <= 0x0f)) {
+			*(conf_ssid++) = l_val + 'a' - 0xa;
+		}
+		i++;
+	}
+	*conf_ssid = '\0';
+
+	return 0;
 }
 
-static int connect_command_handle(char *cmd,char *net_id)
+static int connect_command_handle(char *cmd, char *net_id)
 {
-    int ret;
-    char reply[REPLY_BUF_SIZE] = {0};
-	wmg_printf(MSG_EXCESSIVE,"connect handle cmd is %s\n",cmd);
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"%s failed,Remove the information just connected!\n",cmd);
-        sprintf(cmd, "REMOVE_NETWORK %s", net_id);
-        wifi_command(cmd, reply, sizeof(reply));
-        sprintf(cmd, "%s", "SAVE_CONFIG");
-        wifi_command(cmd, reply, sizeof(reply));
-        ret = -1;
+	int ret;
+	char reply[REPLY_BUF_SIZE] = {0};
+	wmg_printf(MSG_EXCESSIVE, "connect handle cmd is %s\n", cmd);
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "%s failed,Remove the information just connected!\n", cmd);
+		sprintf(cmd, "REMOVE_NETWORK %s", net_id);
+		wifi_command(cmd, reply, sizeof(reply));
+		sprintf(cmd, "%s", "SAVE_CONFIG");
+		wifi_command(cmd, reply, sizeof(reply));
+		ret = -1;
 		return ret;
-    }else{
-        wmg_printf(MSG_EXCESSIVE,"%s: %s\n",cmd,reply);
-        return 0;
-    }
+	} else {
+		wmg_printf(MSG_EXCESSIVE, "%s: %s\n", cmd, reply);
+		return 0;
+	}
 }
 
 void cancel_saved_conf_handle(const char *net_id)
 {
-    char reply[REPLY_BUF_SIZE] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
 
-	char cmd[CMD_LEN+1] = {0};
+	char cmd[CMD_LEN + 1] = {0};
 
 	sprintf(cmd, "DISABLE_NETWORK %s", net_id);
 	wifi_command(cmd, reply, sizeof(reply));
@@ -400,75 +392,74 @@ void cancel_saved_conf_handle(const char *net_id)
 
 int check_device_is_busing()
 {
-	if(w->StaEvt.state == CONNECTING ||
-		w->StaEvt.state == OBTAINING_IP){
+	if (w->StaEvt.state == CONNECTING || w->StaEvt.state == OBTAINING_IP) {
 		return -1;
-	}else {
+	} else {
 		return 0;
 	}
 }
 
-static int wait_event(const char *netIdOld,const char *netIdNew,int isExist)
+static int wait_event(const char *netIdOld, const char *netIdNew, int isExist)
 {
 	char reply[REPLY_BUF_SIZE] = {0};
-	char cmd[CMD_LEN+1] = {0};
-	int ret ;
+	char cmd[CMD_LEN + 1] = {0};
+	int ret;
 	enum wpaEvent evt = WPAE_UNKNOWN;
 
 	a->assocRejectCnt = 0;
 	a->netNotFoundCnt = 0;
 	a->authFailCnt = 0;
-        wmg_printf(MSG_DEBUG,"start reading WPA EVENT!\n");
+	wmg_printf(MSG_DEBUG, "start reading WPA EVENT!\n");
 	ret = evtRead(&evt);
-        wmg_printf(MSG_DEBUG,"reading WPA EVENT is over!\n");
-	wmg_printf(MSG_MSGDUMP,"ret = %d,event = %d\n",ret,evt);
-	if(ret >= 0) {
-		switch(evt){
-			case WPAE_CONNECTED:
-				if(isExist == 1 || isExist == 3){
-				  //network is exist or connected
-					sprintf(cmd, "REMOVE_NETWORK %s", netIdOld);
-					cmd[CMD_LEN] = '\0';
-					wifi_command(cmd, reply, sizeof(reply));
-				}
-				if(isExist != -1){
-					/* save config */
-					sprintf(cmd, "%s", "SAVE_CONFIG");
-					wifi_command(cmd, reply, sizeof(reply));
-					wmg_printf(MSG_DEBUG,"wifi connected in inner!\n");
-				}
-				w->StaEvt.state = CONNECTED;
-				break;
+	wmg_printf(MSG_DEBUG, "reading WPA EVENT is over!\n");
+	wmg_printf(MSG_MSGDUMP, "ret = %d,event = %d\n", ret, evt);
+	if (ret >= 0) {
+		switch (evt) {
+		case WPAE_CONNECTED:
+			if (isExist == 1 || isExist == 3) {
+				// network is exist or connected
+				sprintf(cmd, "REMOVE_NETWORK %s", netIdOld);
+				cmd[CMD_LEN] = '\0';
+				wifi_command(cmd, reply, sizeof(reply));
+			}
+			if (isExist != -1) {
+				/* save config */
+				sprintf(cmd, "%s", "SAVE_CONFIG");
+				wifi_command(cmd, reply, sizeof(reply));
+				wmg_printf(MSG_DEBUG, "wifi connected in inner!\n");
+			}
+			w->StaEvt.state = CONNECTED;
+			break;
 
-			case WPAE_PASSWORD_INCORRECT:
-				wmg_printf(MSG_DEBUG,"password incorrect!\n");
-				w->StaEvt.event = WSE_PASSWORD_INCORRECT;
-				break;
+		case WPAE_PASSWORD_INCORRECT:
+			wmg_printf(MSG_DEBUG, "password incorrect!\n");
+			w->StaEvt.event = WSE_PASSWORD_INCORRECT;
+			break;
 
-			case WPAE_NETWORK_NOT_FOUND:
-				wmg_printf(MSG_DEBUG,"network not found!\n");
-				w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
-				break;
+		case WPAE_NETWORK_NOT_FOUND:
+			wmg_printf(MSG_DEBUG, "network not found!\n");
+			w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
+			break;
 
-			case WPAE_ASSOC_REJECT:
-				wmg_printf(MSG_DEBUG,"assoc reject!\n");
-				w->StaEvt.event = WSE_AP_ASSOC_REJECT;
-				break;
+		case WPAE_ASSOC_REJECT:
+			wmg_printf(MSG_DEBUG, "assoc reject!\n");
+			w->StaEvt.event = WSE_AP_ASSOC_REJECT;
+			break;
 
-			case WPAE_TERMINATING:
-				wmg_printf(MSG_DEBUG,"wpa_supplicant terminating!\n");
-				w->StaEvt.event = WSE_WPA_TERMINATING;
-				break;
+		case WPAE_TERMINATING:
+			wmg_printf(MSG_DEBUG, "wpa_supplicant terminating!\n");
+			w->StaEvt.event = WSE_WPA_TERMINATING;
+			break;
 
-			default:
-				break;
+		default:
+			break;
 		}
-		if(evt != WPAE_CONNECTED){
-			if(ret == 0){
+		if (evt != WPAE_CONNECTED) {
+			if (ret == 0) {
 				w->StaEvt.event = WSE_CONNECTED_TIMEOUT;
-				wmg_printf(MSG_DEBUG,"connected timeout!\n");
+				wmg_printf(MSG_DEBUG, "connected timeout!\n");
 			}
-			if(netIdNew)
+			if (netIdNew)
 				cancel_saved_conf_handle(netIdNew);
 			w->StaEvt.state = DISCONNECTED;
 			ret = -1;
@@ -480,31 +471,31 @@ static int wait_event(const char *netIdOld,const char *netIdNew,int isExist)
 /* connect visiable network */
 static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char *passwd, int event_label)
 {
-    int i=0, ret = -1, len = 0, max_prio = -1;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0}, netid1[NET_ID_LEN+1]={0}, netid2[NET_ID_LEN+1] = {0};
-    int is_exist = 0;
-    int passwd_len = 0;
-    const char *p_ssid = NULL;
-
-    if(! w->enable){
-	    wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-	    return -1;
-    }
+	int i = 0, ret = -1, len = 0, max_prio = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0}, netid1[NET_ID_LEN + 1] = {0}, netid2[NET_ID_LEN + 1] = {0};
+	int is_exist = 0;
+	int passwd_len = 0;
+	const char *p_ssid = NULL;
 
-    if(!ssid || !ssid[0]){
-        wmg_printf(MSG_ERROR,"Error: ssid is NULL!\n");
-        ret = -1;
-        w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
+
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is NULL!\n");
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }
+		goto end;
+	}
 
-	if(check_device_is_busing() < 0){
-        w->StaEvt.event = WSE_DEV_BUSING;
+	if (check_device_is_busing() < 0) {
+		w->StaEvt.event = WSE_DEV_BUSING;
 		w->StaEvt.state = DISCONNECTED;
 		state_event_change(event_label);
-        return -1;
+		return -1;
 	}
 
 	w->StaEvt.state = CONNECTING;
@@ -514,56 +505,56 @@ static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char
 
 	clearEvtSocket();
 
-    /* connecting */
- //   set_wifi_machine_state(CONNECTING_STATE);
+	/* connecting */
+	//   set_wifi_machine_state(CONNECTING_STATE);
 	state_event_change(event_label);
-    /* set connecting event label */
-    a->label= event_label;
-
-    /* convert app ssid to wpa scan ssid */
-    ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
-    if(ret < 0){
-        ret = -1;
-        w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+	/* set connecting event label */
+	a->label = event_label;
+
+	/* convert app ssid to wpa scan ssid */
+	ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
+	if (ret < 0) {
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }else if(ret > 0){
-        ssid_contain_chinese = 1;
-    }else {
-        ssid_contain_chinese = 0;
-    }
+		goto end;
+	} else if (ret > 0) {
+		ssid_contain_chinese = 1;
+	} else {
+		ssid_contain_chinese = 0;
+	}
 
-    /* has no chinese code */
-    if(ssid_contain_chinese == 0){
-        p_ssid = ssid;
-    }else{
-        ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
-        p_ssid = wpa_conf_ssid;
-    }
+	/* has no chinese code */
+	if (ssid_contain_chinese == 0) {
+		p_ssid = ssid;
+	} else {
+		ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
+		p_ssid = wpa_conf_ssid;
+	}
 
-    /* check already exist or connected */
-    len = NET_ID_LEN+1;
-    is_exist = wpa_conf_is_ap_exist(p_ssid, key_mgmt, netid1, &len);
+	/* check already exist or connected */
+	len = NET_ID_LEN + 1;
+	is_exist = wpa_conf_is_ap_exist(p_ssid, key_mgmt, netid1, &len);
 
 	/* add network */
 	strncpy(cmd, "ADD_NETWORK", CMD_LEN);
 	cmd[CMD_LEN] = '\0';
 	ret = wifi_command(cmd, netid2, sizeof(netid2));
-	if(ret){
-		wmg_printf(MSG_ERROR,"do add network results error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do add network results error!\n");
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
 	/* set network ssid */
-	if(ssid_contain_chinese == 0){
+	if (ssid_contain_chinese == 0) {
 		sprintf(cmd, "SET_NETWORK %s ssid \"%s\"", netid2, p_ssid);
-	}else{
+	} else {
 		sprintf(cmd, "SET_NETWORK %s ssid %s", netid2, p_ssid);
 	}
 
-	if(connect_command_handle(cmd,netid2)){
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
@@ -571,71 +562,71 @@ static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char
 	}
 
 	/* no passwd */
-	if (key_mgmt == WIFIMG_NONE){
+	if (key_mgmt == WIFIMG_NONE) {
 		/* set network no passwd */
 		sprintf(cmd, "SET_NETWORK %s key_mgmt NONE", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			goto end;
 		}
-	} else if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
+	} else if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
 		/* set network psk passwd */
-		sprintf(cmd,"SET_NETWORK %s key_mgmt WPA-PSK", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		sprintf(cmd, "SET_NETWORK %s key_mgmt WPA-PSK", netid2);
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			goto end;
 		}
 
-        ret = check_wpa_passwd(passwd);
-        if(ret == 0){
-            wmg_printf(MSG_ERROR,"check wpa-psk passwd is error!\n");
+		ret = check_wpa_passwd(passwd);
+		if (ret == 0) {
+			wmg_printf(MSG_ERROR, "check wpa-psk passwd is error!\n");
 			cancel_saved_conf_handle(netid2);
-            ret = -1;
-            w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+			ret = -1;
+			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
-            goto end;
-        }
+			goto end;
+		}
 
-	    sprintf(cmd, "SET_NETWORK %s psk \"%s\"", netid2, passwd);
-		if(connect_command_handle(cmd,netid2)){
+		sprintf(cmd, "SET_NETWORK %s psk \"%s\"", netid2, passwd);
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			goto end;
 		}
 
-	  } else if(key_mgmt == WIFIMG_WEP){
-        /* set network  key_mgmt none */
+	} else if (key_mgmt == WIFIMG_WEP) {
+		/* set network  key_mgmt none */
 		sprintf(cmd, "SET_NETWORK %s key_mgmt NONE", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			goto end;
 		}
 
-        /* set network wep_key0 */
+		/* set network wep_key0 */
 		passwd_len = strlen(passwd);
-		if((passwd_len == 10) || (passwd_len == 26)) {
-		    sprintf(cmd, "SET_NETWORK %s wep_key0 %s", netid2, passwd);
-		    wmg_printf(MSG_DEBUG,"The passwd is HEX format!\n");
-		} else if((passwd_len == 5) || (passwd_len == 13)) {
-		    sprintf(cmd, "SET_NETWORK %s wep_key0 \"%s\"", netid2, passwd);
-		    wmg_printf(MSG_DEBUG,"The passwd is ASCII format!\n");
+		if ((passwd_len == 10) || (passwd_len == 26)) {
+			sprintf(cmd, "SET_NETWORK %s wep_key0 %s", netid2, passwd);
+			wmg_printf(MSG_DEBUG, "The passwd is HEX format!\n");
+		} else if ((passwd_len == 5) || (passwd_len == 13)) {
+			sprintf(cmd, "SET_NETWORK %s wep_key0 \"%s\"", netid2, passwd);
+			wmg_printf(MSG_DEBUG, "The passwd is ASCII format!\n");
 		} else {
-		    wmg_printf(MSG_ERROR,"The password does not conform to the specification!\n");
-		    /* cancel saved in wpa_supplicant.conf */
-		    cancel_saved_conf_handle(netid2);
-		    w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-		    w->StaEvt.state = DISCONNECTED;
-		    ret = -1;
-		    goto end;
+			wmg_printf(MSG_ERROR, "The password does not conform to the specification!\n");
+			/* cancel saved in wpa_supplicant.conf */
+			cancel_saved_conf_handle(netid2);
+			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+			w->StaEvt.state = DISCONNECTED;
+			ret = -1;
+			goto end;
 		}
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
@@ -643,29 +634,29 @@ static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char
 		}
 
 
-        /* set network auth_alg */
+		/* set network auth_alg */
 		sprintf(cmd, "SET_NETWORK %s auth_alg OPEN SHARED", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			ret = -1;
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			goto end;
 		}
 
-	  } else {
-	      wmg_printf(MSG_ERROR,"Error: key mgmt not support!\n");
+	} else {
+		wmg_printf(MSG_ERROR, "Error: key mgmt not support!\n");
 
-	      /* cancel saved in wpa_supplicant.conf */
-	      cancel_saved_conf_handle(netid2);
-	      ret = -1;
-	      w->StaEvt.event = WSE_KEYMT_NO_SUPPORT;
-	      w->StaEvt.state = DISCONNECTED;
-	      goto end;
-	  }
+		/* cancel saved in wpa_supplicant.conf */
+		cancel_saved_conf_handle(netid2);
+		ret = -1;
+		w->StaEvt.event = WSE_KEYMT_NO_SUPPORT;
+		w->StaEvt.state = DISCONNECTED;
+		goto end;
+	}
 
 	/* set scan_ssid to 1 for network */
-    sprintf(cmd,"SET_NETWORK %s scan_ssid 1", netid2);
-	if(connect_command_handle(cmd,netid2)){
+	sprintf(cmd, "SET_NETWORK %s scan_ssid 1", netid2);
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
@@ -673,12 +664,12 @@ static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char
 	}
 
 
-	  /* get max priority in wpa_supplicant.conf */
-    max_prio =  wpa_conf_get_max_priority();
+	/* get max priority in wpa_supplicant.conf */
+	max_prio = wpa_conf_get_max_priority();
 
-    /* set priority for network */
-    sprintf(cmd,"SET_NETWORK %s priority %d", netid2, (max_prio+1));
-	if(connect_command_handle(cmd,netid2)){
+	/* set priority for network */
+	sprintf(cmd, "SET_NETWORK %s priority %d", netid2, (max_prio + 1));
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
@@ -687,41 +678,41 @@ static int aw_wifi_add_network(const char *ssid, tKEY_MGMT key_mgmt, const char
 
 	/* select network */
 	sprintf(cmd, "SELECT_NETWORK %s", netid2);
-	if(connect_command_handle(cmd,netid2)){
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
-    /* save config */
-	  sprintf(cmd, "%s", "SAVE_CONFIG");
-	if(connect_command_handle(cmd,netid2)){
+	/* save config */
+	sprintf(cmd, "%s", "SAVE_CONFIG");
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
 
-    /* save netid */
-    strcpy(a->netIdConnecting, netid2);
+	/* save netid */
+	strcpy(a->netIdConnecting, netid2);
 
-    /* wait for check status connected/disconnected */
-	ret = wait_event(netid1,netid2,is_exist);
+	/* wait for check status connected/disconnected */
+	ret = wait_event(netid1, netid2, is_exist);
 
 end:
 
 	state_event_change(event_label);
-	//restore state when call wrong
-    return ret;
+	// restore state when call wrong
+	return ret;
 }
 
 static int wifi_connect_ap_inner(const char *ssid, tKEY_MGMT key_mgmt, const char *passwd, int event_label)
 {
-    int i=0, ret = -1, len = 0, max_prio = -1;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0}, netid1[NET_ID_LEN+1]={0}, netid2[NET_ID_LEN+1] = {'\0'};
-    int is_exist = 0;
-    int passwd_len = 0;
+	int i = 0, ret = -1, len = 0, max_prio = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0}, netid1[NET_ID_LEN + 1] = {0}, netid2[NET_ID_LEN + 1] = {'\0'};
+	int is_exist = 0;
+	int passwd_len = 0;
 
 	w->StaEvt.state = CONNECTING;
 	w->StaEvt.event = WSE_ACTIVE_CONNECT;
@@ -729,126 +720,126 @@ static int wifi_connect_ap_inner(const char *ssid, tKEY_MGMT key_mgmt, const cha
 
 	state_event_change(event_label);
 
-    /* set connecting event label */
-    a->label= event_label;
+	/* set connecting event label */
+	a->label = event_label;
 
 	/*clear event data in socket*/
 	clearEvtSocket();
 
-    /* check already exist or connected */
-    len = NET_ID_LEN+1;
-    is_exist = wpa_conf_is_ap_exist(ssid, key_mgmt, netid1, &len);
-
-    /* add network */
-    strncpy(cmd, "ADD_NETWORK", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, netid2, sizeof(netid2));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do add network results error!\n");
-        ret = -1;
-		w->StaEvt.event= WSE_CMD_OR_PARAMS_ERROR;
+	/* check already exist or connected */
+	len = NET_ID_LEN + 1;
+	is_exist = wpa_conf_is_ap_exist(ssid, key_mgmt, netid1, &len);
+
+	/* add network */
+	strncpy(cmd, "ADD_NETWORK", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, netid2, sizeof(netid2));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do add network results error!\n");
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }
-	  /* set network ssid */
-    if(ssid_contain_chinese == 0){
-        sprintf(cmd, "SET_NETWORK %s ssid \"%s\"", netid2, ssid);
-    }else{
-        sprintf(cmd, "SET_NETWORK %s ssid %s", netid2, ssid);
-    }
-	wmg_printf(MSG_EXCESSIVE,"ssid:%s id:%s\n",ssid,netid2);
+		goto end;
+	}
+	/* set network ssid */
+	if (ssid_contain_chinese == 0) {
+		sprintf(cmd, "SET_NETWORK %s ssid \"%s\"", netid2, ssid);
+	} else {
+		sprintf(cmd, "SET_NETWORK %s ssid %s", netid2, ssid);
+	}
+	wmg_printf(MSG_EXCESSIVE, "ssid:%s id:%s\n", ssid, netid2);
 
-	if(connect_command_handle(cmd,netid2)){
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
 
-	  /* no passwd */
-	  if (key_mgmt == WIFIMG_NONE){
-	      /* set network no passwd */
-	  sprintf(cmd, "SET_NETWORK %s key_mgmt NONE", netid2);
-	  if(connect_command_handle(cmd,netid2)){
-		  w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-		  w->StaEvt.state = DISCONNECTED;
-		  ret = -1;
-		  goto end;
-	  }
-	  } else if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
-	      /* set network psk passwd */
-	      sprintf(cmd,"SET_NETWORK %s key_mgmt WPA-PSK", netid2);
-		  if(connect_command_handle(cmd,netid2)){
-			  w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-			  w->StaEvt.state = DISCONNECTED;
-			  ret = -1;
-			  goto end;
-		  }
-
-        ret = check_wpa_passwd(passwd);
-        if(ret == 0){
-            wmg_printf(MSG_ERROR,"check wpa-psk passwd is error!\n");
-
-            /* cancel saved in wpa_supplicant.conf */
-            sprintf(cmd, "REMOVE_NETWORK %s", netid2);
-            wifi_command(cmd, reply, sizeof(reply));
+	/* no passwd */
+	if (key_mgmt == WIFIMG_NONE) {
+		/* set network no passwd */
+		sprintf(cmd, "SET_NETWORK %s key_mgmt NONE", netid2);
+		if (connect_command_handle(cmd, netid2)) {
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
-            ret = -1;
-            goto end;
-        }
+			ret = -1;
+			goto end;
+		}
+	} else if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
+		/* set network psk passwd */
+		sprintf(cmd, "SET_NETWORK %s key_mgmt WPA-PSK", netid2);
+		if (connect_command_handle(cmd, netid2)) {
+			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+			w->StaEvt.state = DISCONNECTED;
+			ret = -1;
+			goto end;
+		}
+
+		ret = check_wpa_passwd(passwd);
+		if (ret == 0) {
+			wmg_printf(MSG_ERROR, "check wpa-psk passwd is error!\n");
+
+			/* cancel saved in wpa_supplicant.conf */
+			sprintf(cmd, "REMOVE_NETWORK %s", netid2);
+			wifi_command(cmd, reply, sizeof(reply));
+			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+			w->StaEvt.state = DISCONNECTED;
+			ret = -1;
+			goto end;
+		}
 
 		sprintf(cmd, "SET_NETWORK %s psk \"%s\"", netid2, passwd);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			ret = -1;
 			goto end;
 		}
-	  } else if(key_mgmt == WIFIMG_WEP){
-        /* set network  key_mgmt none */
+	} else if (key_mgmt == WIFIMG_WEP) {
+		/* set network  key_mgmt none */
 		sprintf(cmd, "SET_NETWORK %s key_mgmt NONE", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			ret = -1;
 			goto end;
 		}
 
-        /* set network wep_key0 */
+		/* set network wep_key0 */
 		passwd_len = strlen(passwd);
-		if((passwd_len == 10) || (passwd_len == 26)) {
-		    sprintf(cmd, "SET_NETWORK %s wep_key0 %s", netid2, passwd);
-		    wmg_printf(MSG_DEBUG,"The passwd is HEX format!\n");
-		} else if((passwd_len == 5) || (passwd_len == 13)) {
-		    sprintf(cmd, "SET_NETWORK %s wep_key0 \"%s\"", netid2, passwd);
-		    wmg_printf(MSG_DEBUG,"The passwd is ASCII format!\n");
+		if ((passwd_len == 10) || (passwd_len == 26)) {
+			sprintf(cmd, "SET_NETWORK %s wep_key0 %s", netid2, passwd);
+			wmg_printf(MSG_DEBUG, "The passwd is HEX format!\n");
+		} else if ((passwd_len == 5) || (passwd_len == 13)) {
+			sprintf(cmd, "SET_NETWORK %s wep_key0 \"%s\"", netid2, passwd);
+			wmg_printf(MSG_DEBUG, "The passwd is ASCII format!\n");
 		} else {
-		    wmg_printf(MSG_ERROR,"The password does not conform to the specification!\n");
-		    /* cancel saved in wpa_supplicant.conf */
-		    cancel_saved_conf_handle(netid2);
-		    w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-		    w->StaEvt.state = DISCONNECTED;
-		    ret = -1;
-		    goto end;
+			wmg_printf(MSG_ERROR, "The password does not conform to the specification!\n");
+			/* cancel saved in wpa_supplicant.conf */
+			cancel_saved_conf_handle(netid2);
+			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+			w->StaEvt.state = DISCONNECTED;
+			ret = -1;
+			goto end;
 		}
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			ret = -1;
 			goto end;
 		}
 
-        /* set network auth_alg */
+		/* set network auth_alg */
 		sprintf(cmd, "SET_NETWORK %s auth_alg OPEN SHARED", netid2);
-		if(connect_command_handle(cmd,netid2)){
+		if (connect_command_handle(cmd, netid2)) {
 			w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 			w->StaEvt.state = DISCONNECTED;
 			ret = -1;
 			goto end;
 		}
-	  } else {
-		wmg_printf(MSG_ERROR,"Error: key mgmt is not support!\n");
+	} else {
+		wmg_printf(MSG_ERROR, "Error: key mgmt is not support!\n");
 
 		/* cancel saved in wpa_supplicant.conf */
 		cancel_saved_conf_handle(netid2);
@@ -856,45 +847,45 @@ static int wifi_connect_ap_inner(const char *ssid, tKEY_MGMT key_mgmt, const cha
 		w->StaEvt.state = DISCONNECTED;
 		ret = -1;
 		goto end;
-	  }
+	}
 
 	/* set scan_ssid to 1 for network */
-	sprintf(cmd,"SET_NETWORK %s scan_ssid 1", netid2);
-	if(connect_command_handle(cmd,netid2)) {
+	sprintf(cmd, "SET_NETWORK %s scan_ssid 1", netid2);
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
 
-	  /* get max priority in wpa_supplicant.conf */
-    max_prio =  wpa_conf_get_max_priority();
+	/* get max priority in wpa_supplicant.conf */
+	max_prio = wpa_conf_get_max_priority();
 
-    /* set priority for network */
-    sprintf(cmd,"SET_NETWORK %s priority %d", netid2, (max_prio+1));
-	if(connect_command_handle(cmd,netid2)){
+	/* set priority for network */
+	sprintf(cmd, "SET_NETWORK %s priority %d", netid2, (max_prio + 1));
+	if (connect_command_handle(cmd, netid2)) {
 		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
 		goto end;
 	}
 
-	  /* select network */
-	  sprintf(cmd, "SELECT_NETWORK %s", netid2);
-	  if(connect_command_handle(cmd,netid2)){
-		  ret = -1;
-		  w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-		  w->StaEvt.state = DISCONNECTED;
-		  goto end;
-	  }
+	/* select network */
+	sprintf(cmd, "SELECT_NETWORK %s", netid2);
+	if (connect_command_handle(cmd, netid2)) {
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+		w->StaEvt.state = DISCONNECTED;
+		goto end;
+	}
 
-    /* save netid */
-    strcpy(a->netIdConnecting, netid2);
-	wmg_printf(MSG_DEBUG,"net id connecting %s\n",a->netIdConnecting);
+	/* save netid */
+	strcpy(a->netIdConnecting, netid2);
+	wmg_printf(MSG_DEBUG, "net id connecting %s\n", a->netIdConnecting);
 
-	ret = wait_event(netid1,netid2,is_exist);
+	ret = wait_event(netid1, netid2, is_exist);
 end:
-    return ret;
+	return ret;
 }
 
 /* connect visiable network */
@@ -904,224 +895,221 @@ static int aw_wifi_connect_ap_key_mgmt(const char *ssid, tKEY_MGMT key_mgmt, con
 
 	const char *p_ssid = NULL;
 
-	if(! w->enable){
-	  wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-	  return -1;
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
 	}
 
-	if(!ssid || !ssid[0]){
-	  wmg_printf(MSG_ERROR,"Error: ssid is NULL!\n");
-	  ret = -1;
-	  w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-	  w->StaEvt.state = DISCONNECTED;
-	  goto end;
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is NULL!\n");
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+		w->StaEvt.state = DISCONNECTED;
+		goto end;
 	}
-	if(check_device_is_busing() < 0){
-	  w->StaEvt.event = WSE_DEV_BUSING;
-	  w->StaEvt.state = DISCONNECTED;
-	  state_event_change(event_label);
-	  return -1;
+	if (check_device_is_busing() < 0) {
+		w->StaEvt.event = WSE_DEV_BUSING;
+		w->StaEvt.state = DISCONNECTED;
+		state_event_change(event_label);
+		return -1;
 	}
 
-    /* convert app ssid to wpa scan ssid */
-    ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
-    if(ret < 0){
-        ret = -1;
+	/* convert app ssid to wpa scan ssid */
+	ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
+	if (ret < 0) {
+		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }else if(ret > 0){
-        ssid_contain_chinese = 1;
-    }else {
-        ssid_contain_chinese = 0;
-    }
+		goto end;
+	} else if (ret > 0) {
+		ssid_contain_chinese = 1;
+	} else {
+		ssid_contain_chinese = 0;
+	}
 
-    /* has no chinese code */
-    if(ssid_contain_chinese == 0){
-        p_ssid = ssid;
-    }else{
-        ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
-        p_ssid = wpa_conf_ssid;
-    }
+	/* has no chinese code */
+	if (ssid_contain_chinese == 0) {
+		p_ssid = ssid;
+	} else {
+		ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
+		p_ssid = wpa_conf_ssid;
+	}
 
-    /* checking network exist at first time */
-    get_key_mgmt(wpa_scan_ssid, key);
+	/* checking network exist at first time */
+	get_key_mgmt(wpa_scan_ssid, key);
 
-	  /* no password */
-    if (key_mgmt == WIFIMG_NONE){
-        if(key[0] == 0){
-            get_key_mgmt(wpa_scan_ssid, key);
-            if(key[0] == 0){
-                ret = -1;
+	/* no password */
+	if (key_mgmt == WIFIMG_NONE) {
+		if (key[0] == 0) {
+			get_key_mgmt(wpa_scan_ssid, key);
+			if (key[0] == 0) {
+				ret = -1;
 				w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
 				w->StaEvt.state = DISCONNECTED;
-                goto end;
-            }
-        }
-	  }else if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
-        if(key[1] == 0){
-            get_key_mgmt(wpa_scan_ssid, key);
-            if(key[1] == 0){
-                ret = -1;
+				goto end;
+			}
+		}
+	} else if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
+		if (key[1] == 0) {
+			get_key_mgmt(wpa_scan_ssid, key);
+			if (key[1] == 0) {
+				ret = -1;
 				w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
 				w->StaEvt.state = DISCONNECTED;
-                goto end;
-            }
-        }
-    }else if(key_mgmt == WIFIMG_WEP){
-        if(key[2] == 0){
-            get_key_mgmt(wpa_scan_ssid, key);
-            if(key[2] == 0){
-                ret = -1;
+				goto end;
+			}
+		}
+	} else if (key_mgmt == WIFIMG_WEP) {
+		if (key[2] == 0) {
+			get_key_mgmt(wpa_scan_ssid, key);
+			if (key[2] == 0) {
+				ret = -1;
 				w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
 				w->StaEvt.state = DISCONNECTED;
-                goto end;
-            }
-        }
-    }else{
-        ret = -1;
+				goto end;
+			}
+		}
+	} else {
+		ret = -1;
 		w->StaEvt.event = WSE_KEYMT_NO_SUPPORT;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }
+		goto end;
+	}
 
-    ret = wifi_connect_ap_inner(p_ssid, key_mgmt, passwd, event_label);
+	ret = wifi_connect_ap_inner(p_ssid, key_mgmt, passwd, event_label);
 
 end:
-    //enable all networks in wpa_supplicant.conf
+	// enable all networks in wpa_supplicant.conf
 	wpa_conf_enable_all_networks();
 	state_event_change(event_label);
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_connect_ap(const char *ssid, const char *passwd, int event_label)
 {
-    int  i = 0, ret = 0;
-    int  key[4] = {0};
-    const char *p_ssid = NULL;
+	int i = 0, ret = 0;
+	int key[4] = {0};
+	const char *p_ssid = NULL;
 
-    if(! w->enable){
-        wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
 
-    if(!ssid || !ssid[0]){
-        wmg_printf(MSG_ERROR,"Error: ssid is NULL!\n");
-        ret = -1;
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is NULL!\n");
+		ret = -1;
 		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
 		w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }
-	if(check_device_is_busing() < 0){
-        w->StaEvt.event = WSE_DEV_BUSING;
+		goto end;
+	}
+	if (check_device_is_busing() < 0) {
+		w->StaEvt.event = WSE_DEV_BUSING;
 		w->StaEvt.state = DISCONNECTED;
 		state_event_change(event_label);
-        return -1;
-	}
-
-     /* convert app ssid to wpa scan ssid */
-    ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
-    if(ret < 0){
-        ret = -1;
-	w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
-	w->StaEvt.state = DISCONNECTED;
-        goto end;
-    }else if(ret > 0){
-        ssid_contain_chinese = 1;
-    }else {
-        ssid_contain_chinese = 0;
-    }
+		return -1;
+	}
 
-    /* has no chinese code */
-    if(ssid_contain_chinese == 0){
-        p_ssid = ssid;
-    }else{
-        ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
-        p_ssid = wpa_conf_ssid;
-    }
+	/* convert app ssid to wpa scan ssid */
+	ret = ssid_app_to_wpa_scan(ssid, wpa_scan_ssid);
+	if (ret < 0) {
+		ret = -1;
+		w->StaEvt.event = WSE_CMD_OR_PARAMS_ERROR;
+		w->StaEvt.state = DISCONNECTED;
+		goto end;
+	} else if (ret > 0) {
+		ssid_contain_chinese = 1;
+	} else {
+		ssid_contain_chinese = 0;
+	}
 
-    /* try connecting*/
-    if(!passwd || !passwd[0]){
-	    ret = wifi_connect_ap_inner(p_ssid, WIFIMG_NONE, passwd, event_label);
-    } else {
-	    ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WPA_PSK, passwd, event_label);
-    }
+	/* has no chinese code */
+	if (ssid_contain_chinese == 0) {
+		p_ssid = ssid;
+	} else {
+		ssid_app_to_wpa_conf(ssid, wpa_conf_ssid);
+		p_ssid = wpa_conf_ssid;
+	}
 
-    if(ret  >= 0 || w->StaEvt.event == WSE_PASSWORD_INCORRECT
-	    || w->StaEvt.event == WSE_WPA_TERMINATING)
-	    goto end;
+	/* try connecting*/
+	if (!passwd || !passwd[0]) {
+		ret = wifi_connect_ap_inner(p_ssid, WIFIMG_NONE, passwd, event_label);
+	} else {
+		ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WPA_PSK, passwd, event_label);
+	}
 
-    wmg_printf(MSG_DEBUG,"The first connection failed,scan it and connect again\n");
-    /*If the connection fails, scan it  and connect again. */
+	if (ret >= 0 || w->StaEvt.event == WSE_PASSWORD_INCORRECT || w->StaEvt.event == WSE_WPA_TERMINATING)
+		goto end;
 
+	wmg_printf(MSG_DEBUG, "The first connection failed,scan it and connect again\n");
+	/*If the connection fails, scan it  and connect again. */
 
 
-    /* checking network exist at first time */
-    get_key_mgmt(p_ssid, key);
+	/* checking network exist at first time */
+	get_key_mgmt(p_ssid, key);
 
-    /* no password */
-    if(!passwd || !passwd[0]){
-        if(key[0] == 0){
-            ret = -1;
+	/* no password */
+	if (!passwd || !passwd[0]) {
+		if (key[0] == 0) {
+			ret = -1;
 			w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
 			w->StaEvt.state = DISCONNECTED;
-            goto end;
-        }
+			goto end;
+		}
 
-        ret = wifi_connect_ap_inner(p_ssid, WIFIMG_NONE, passwd, event_label);
-    }else{
-        if((key[1] == 0) && (key[2] == 0) && (key[3] == 0)){
-            ret = -1;
+		ret = wifi_connect_ap_inner(p_ssid, WIFIMG_NONE, passwd, event_label);
+	} else {
+		if ((key[1] == 0) && (key[2] == 0) && (key[3] == 0)) {
+			ret = -1;
 			w->StaEvt.event = WSE_NETWORK_NOT_EXIST;
 			w->StaEvt.state = DISCONNECTED;
-            goto end;
-        }
-        /* wpa-psk */
-        if(key[1] == 1 || key[3] == 1){
-            /* try WPA-PSK */
-            ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WPA_PSK, passwd, event_label);
-        }
-
-        /* wep */
-        if(key[2] == 1){
-        /* try WEP */
-            ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WEP, passwd, event_label);
-        }
-    }
+			goto end;
+		}
+		/* wpa-psk */
+		if (key[1] == 1 || key[3] == 1) {
+			/* try WPA-PSK */
+			ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WPA_PSK, passwd, event_label);
+		}
+
+		/* wep */
+		if (key[2] == 1) {
+			/* try WEP */
+			ret = wifi_connect_ap_inner(p_ssid, WIFIMG_WEP, passwd, event_label);
+		}
+	}
 end:
-    //enable all networks in wpa_supplicant.conf
+	// enable all networks in wpa_supplicant.conf
 	wpa_conf_enable_all_networks();
 	state_event_change(event_label);
-    return ret;
+	return ret;
 }
 
 
 static int aw_wifi_connect_ap_with_netid(const char *net_id, int event_label)
 {
-
-	int i=0, ret = -1, len = 0;
-	char cmd[CMD_LEN+1] = {0};
+	int i = 0, ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0};
 	char reply[REPLY_BUF_SIZE] = {0};
 	const char *p_ssid = NULL;
 	struct wpa_status *sta;
-	if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
 		return -1;
 	}
 
-	if(check_device_is_busing() < 0){
-        w->StaEvt.event = WSE_DEV_BUSING;
+	if (check_device_is_busing() < 0) {
+		w->StaEvt.event = WSE_DEV_BUSING;
 		w->StaEvt.state = DISCONNECTED;
 		state_event_change(event_label);
-        return -1;
+		return -1;
 	}
 
-	if((sta = get_wpa_status_info()) != NULL){
-		if(sta->wpa_state == WPA_COMPLETED){
+	if ((sta = get_wpa_status_info()) != NULL) {
+		if (sta->wpa_state == WPA_COMPLETED) {
 			aw_wifi_disconnect_ap(0x7fffffff);
 		}
-	}else{
-		wmg_printf(MSG_ERROR,"sta->wpa_state is NULL\n");
+	} else {
+		wmg_printf(MSG_ERROR, "sta->wpa_state is NULL\n");
 		ret = -1;
 		goto end;
 	}
@@ -1135,24 +1123,24 @@ static int aw_wifi_connect_ap_with_netid(const char *net_id, int event_label)
 	/* selected_network */
 	sprintf(cmd, "SELECT_NETWORK %s", net_id);
 	ret = wifi_command(cmd, reply, sizeof(reply));
-	if(ret){
-		wmg_printf(MSG_ERROR,"do selected network error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do selected network error!\n");
 		ret = -1;
 		goto end;
 	}
 
-	 /* save netid */
-	 strcpy(a->netIdConnecting, net_id);
+	/* save netid */
+	strcpy(a->netIdConnecting, net_id);
 
-     /*reconnect*/
+	/*reconnect*/
 	strncpy(cmd, "RECONNECT", CMD_LEN);
-       cmd[CMD_LEN] = '\0';
+	cmd[CMD_LEN] = '\0';
 	ret = wifi_command(cmd, reply, sizeof(reply));
-	if(ret){
-		wmg_printf(MSG_ERROR,"do reconnect error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do reconnect error!\n");
 		ret = -1;
 	}
-	ret = wait_event(net_id,NULL,-1);
+	ret = wait_event(net_id, NULL, -1);
 end:
 
 	state_event_change(event_label);
@@ -1161,335 +1149,329 @@ static int aw_wifi_connect_ap_with_netid(const char *net_id, int event_label)
 
 static int aw_wifi_clear_network(const char *ssid)
 {
-    int ret = 0;
+	int ret = 0;
 	int len = 0;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char net_id[NET_ID_LEN+1] = {0};
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char net_id[NET_ID_LEN + 1] = {0};
 	struct wpa_status *staInfo;
 	char *ptr = NULL;
-	char *ptr_id =NULL;
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	char *ptr_id = NULL;
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
 
-    if(!ssid || !ssid[0]){
-         wmg_printf(MSG_ERROR,"Error: ssid is null!\n");
-        return -1;
-    }
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is null!\n");
+		return -1;
+	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
 	/* cancel saved in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", 15);
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do remove network %s error!\n", net_id);
+	strncpy(cmd, "LIST_NETWORKS", 15);
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do remove network %s error!\n", net_id);
 		ret = -1;
 		goto end;
-
-    }
+	}
 
 	ptr = strstr(reply, ssid);
-	if(ptr == NULL)
+	if (ptr == NULL)
 		goto end;
-	while(ptr != NULL) {
+	while (ptr != NULL) {
 		ptr--;
-		if(*ptr == '\n'){
+		if (*ptr == '\n') {
 			break;
 		}
 	}
-	while(ptr != NULL){
+	while (ptr != NULL) {
 		ptr++;
-		if(*ptr >= '0' && *ptr <= '9'){
+		if (*ptr >= '0' && *ptr <= '9') {
 			ptr_id = ptr;
 			break;
 		}
 	}
 
-	if(NULL == ptr_id)
+	if (NULL == ptr_id)
 		return -1;
 
-	while(*ptr >= '0' && *ptr <= '9'){
+	while (*ptr >= '0' && *ptr <= '9') {
 		len++;
 		ptr++;
 	}
-	if(NULL == ptr_id)
+	if (NULL == ptr_id)
 		return -1;
-	strncpy(net_id,ptr_id,len);
-	net_id[len+1] = '\0';
-	wmg_printf(MSG_DEBUG,"net id == %s\n",net_id);
-
-    /* cancel saved in wpa_supplicant.conf */
-    sprintf(cmd, "REMOVE_NETWORK %s", net_id);
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do remove network %s error!\n", net_id);
+	strncpy(net_id, ptr_id, len);
+	net_id[len + 1] = '\0';
+	wmg_printf(MSG_DEBUG, "net id == %s\n", net_id);
+
+	/* cancel saved in wpa_supplicant.conf */
+	sprintf(cmd, "REMOVE_NETWORK %s", net_id);
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do remove network %s error!\n", net_id);
 		ret = -1;
 		goto end;
+	}
 
-    }
-
-    /* save config */
+	/* save config */
 	sprintf(cmd, "%s", "SAVE_CONFIG");
 	ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do save config error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
 		ret = -1;
 		goto end;
-    }
+	}
 end:
-    return ret;
-
+	return ret;
 }
 
 
-
 /* cancel saved AP in wpa_supplicant.conf */
 static int aw_wifi_remove_network(char *ssid, tKEY_MGMT key_mgmt)
 {
-    int ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char net_id[NET_ID_LEN+1] = {0};
-
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	int ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char net_id[NET_ID_LEN + 1] = {0};
 
-    if(!ssid || !ssid[0]){
-         wmg_printf(MSG_ERROR,"Error: ssid is null!\n");
-        return -1;
-    }
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
+
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is null!\n");
+		return -1;
+	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
-    /* check AP is exist in wpa_supplicant.conf */
-    len = NET_ID_LEN+1;
-    ret = wpa_conf_ssid2netid(ssid, key_mgmt, net_id, &len);
-    if(ret <= 0){
-       wmg_printf(MSG_WARNING,"Warning: %s is not in wpa_supplicant.conf!\n", ssid);
-	   ret = -1;
-	   goto end;
-    }else if(!(ret & (0x01<<1) ))
-    {
-		wmg_printf(MSG_WARNING,"Warning: %s exists in wpa_supplicant.conf, but the key_mgmt is not accordant!\n", ssid);
+	/* check AP is exist in wpa_supplicant.conf */
+	len = NET_ID_LEN + 1;
+	ret = wpa_conf_ssid2netid(ssid, key_mgmt, net_id, &len);
+	if (ret <= 0) {
+		wmg_printf(MSG_WARNING, "Warning: %s is not in wpa_supplicant.conf!\n", ssid);
 		ret = -1;
 		goto end;
-    }
-
-    /* cancel saved in wpa_supplicant.conf */
-    sprintf(cmd, "REMOVE_NETWORK %s", net_id);
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do remove network %s error!\n", net_id);
+	} else if (!(ret & (0x01 << 1))) {
+		wmg_printf(MSG_WARNING, "Warning: %s exists in wpa_supplicant.conf, but the key_mgmt is not accordant!\n",
+				   ssid);
 		ret = -1;
 		goto end;
+	}
 
-    }
+	/* cancel saved in wpa_supplicant.conf */
+	sprintf(cmd, "REMOVE_NETWORK %s", net_id);
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do remove network %s error!\n", net_id);
+		ret = -1;
+		goto end;
+	}
 
-    /* save config */
-	  sprintf(cmd, "%s", "SAVE_CONFIG");
-	  ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do save config error!\n");
+	/* save config */
+	sprintf(cmd, "%s", "SAVE_CONFIG");
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
 		ret = -1;
 		goto end;
-    }
+	}
 end:
 
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_remove_all_networks()
 {
-    int ret = -1;
-    struct wpa_status * sta;
+	int ret = -1;
+	struct wpa_status *sta;
 
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
-    ret = wpa_conf_remove_all_networks();
+	ret = wpa_conf_remove_all_networks();
 
 end:
 
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_connect_ap_auto(int event_label)
 {
-    int i=0, ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0}, reply[REPLY_BUF_SIZE] = {0};
-	struct wpa_status * sta;
+	int i = 0, ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0}, reply[REPLY_BUF_SIZE] = {0};
+	struct wpa_status *sta;
 
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
-	if((sta = get_wpa_status_info()) != NULL){
-		if(sta->wpa_state == WPA_COMPLETED){
-			wmg_printf(MSG_INFO,"wpa_supplicant already connected\n");
+	if ((sta = get_wpa_status_info()) != NULL) {
+		if (sta->wpa_state == WPA_COMPLETED) {
+			wmg_printf(MSG_INFO, "wpa_supplicant already connected\n");
 			w->StaEvt.state = CONNECTED;
 			w->StaEvt.event = WSE_ACTIVE_CONNECT;
 			state_event_change(event_label);
 			return 0;
 		}
-	}else{
-		wmg_printf(MSG_ERROR,"sta->wpa_state is NULL\n");
+	} else {
+		wmg_printf(MSG_ERROR, "sta->wpa_state is NULL\n");
 		return -1;
 	}
 
-    /* check network exist in wpa_supplicant.conf */
-    if(wpa_conf_network_info_exist() == 0){
-        ret = -1;
-        wmg_printf(MSG_INFO,"wpa_supplicant no history network information\n");
-        goto end;
-    }
+	/* check network exist in wpa_supplicant.conf */
+	if (wpa_conf_network_info_exist() == 0) {
+		ret = -1;
+		wmg_printf(MSG_INFO, "wpa_supplicant no history network information\n");
+		goto end;
+	}
 
-    /* connecting */
+	/* connecting */
 	w->StaEvt.state = CONNECTING;
 	w->StaEvt.event = WSE_ACTIVE_CONNECT;
 	state_event_change(event_label);
 
 
-    a->label= event_label;
+	a->label = event_label;
 
-    /* reconnected */
+	/* reconnected */
 	sprintf(cmd, "%s", "RECONNECT");
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do reconnect error!\n");
-        ret = -1;
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do reconnect error!\n");
+		ret = -1;
 		goto end;
-    }
+	}
 
-    /* wait for check status connected/disconnected */
-	ret = wait_event(NULL,NULL,-1);
+	/* wait for check status connected/disconnected */
+	ret = wait_event(NULL, NULL, -1);
 
 end:
 	state_event_change(event_label);
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_disconnect_ap(int event_label)
 {
-    int i=0, ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0}, reply[REPLY_BUF_SIZE] = {0};
-    char netid[NET_ID_LEN+1]={0};
-	struct wpa_status * sta;
-
-    if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
-        return -1;
-    }
+	int i = 0, ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0}, reply[REPLY_BUF_SIZE] = {0};
+	char netid[NET_ID_LEN + 1] = {0};
+	struct wpa_status *sta;
+
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
+		return -1;
+	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
-	if(w->StaEvt.state == DISCONNECTED){
-		wmg_printf(MSG_WARNING,"The network has been disconnected\n");
+	if (w->StaEvt.state == DISCONNECTED) {
+		wmg_printf(MSG_WARNING, "The network has been disconnected\n");
 		ret = -1;
 		goto end;
 	}
 
-    /* set disconnect event label */
-    a->label= event_label;
+	/* set disconnect event label */
+	a->label = event_label;
 
-    /* disconnected */
-	  sprintf(cmd, "%s", "DISCONNECT");
-	  ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do disconnect network error!\n");
-        ret = -1;
-        goto end;
-    }
-    i=0;
-    do{
-        usleep(200000);
-		if(w->StaEvt.state == DISCONNECTED){
-			ret =0;
-            break;
-        }
-        i++;
-    }while(i<15);
-	if(i >=15){
-		wmg_printf(MSG_ERROR,"wait disconnect time out\n");
+	/* disconnected */
+	sprintf(cmd, "%s", "DISCONNECT");
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do disconnect network error!\n");
+		ret = -1;
+		goto end;
+	}
+	i = 0;
+	do {
+		usleep(200000);
+		if (w->StaEvt.state == DISCONNECTED) {
+			ret = 0;
+			break;
+		}
+		i++;
+	} while (i < 15);
+	if (i >= 15) {
+		wmg_printf(MSG_ERROR, "wait disconnect time out\n");
 	}
 end:
 
-    return ret;
+	return ret;
 }
 
 static int aw_wifi_list_networks(char *reply, size_t reply_len, int event_label)
 {
-	int i=0, ret = -1;
-	char cmd[CMD_LEN+1] = {0};
+	int i = 0, ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
 
-	if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
 		return -1;
 	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
 	/*there is no network information in the supplicant.conf file now!*/
-	if(wpa_conf_network_info_exist() == 0){
+	if (wpa_conf_network_info_exist() == 0) {
 		ret = 0;
 		goto end;
 	}
 
 	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-       cmd[CMD_LEN] = '\0';
+	cmd[CMD_LEN] = '\0';
 	ret = wifi_command(cmd, reply, reply_len);
-	if(ret){
-		wmg_printf(MSG_ERROR,"do list_networks error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list_networks error!\n");
 		ret = -1;
 	}
 end:
 
 	return ret;
-
 }
 
 /*
-*Ap with certain key_mgmt exists in the .conf file:return is 0, get the *net_id as expectation;
-*else:return -1
-*/
+ *Ap with certain key_mgmt exists in the .conf file:return is 0, get the *net_id as expectation;
+ *else:return -1
+ */
 static int aw_wifi_get_netid(const char *ssid, tKEY_MGMT key_mgmt, char *net_id, int *length)
 {
-	int ret = -1, len = NET_ID_LEN+1;
+	int ret = -1, len = NET_ID_LEN + 1;
 
-	if(*length > (NET_ID_LEN+1))
-	    len = NET_ID_LEN+1;
+	if (*length > (NET_ID_LEN + 1))
+		len = NET_ID_LEN + 1;
 	else
-	    len = *length;
+		len = *length;
 
 	ret = wpa_conf_is_ap_exist(ssid, key_mgmt, net_id, &len);
 
-	if(ret == 1 || ret == 3){
+	if (ret == 1 || ret == 3) {
 		*length = len;
 		return 0;
-	}else{
+	} else {
 		return -1;
 	}
 }
@@ -1497,30 +1479,29 @@ static int aw_wifi_get_status(struct wifi_status *s)
 {
 	struct wpa_status *staInfo;
 
-	if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
 		return -1;
 	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		return -1;
 	}
 
-	if((staInfo = get_wpa_status_info()) != NULL){
+	if ((staInfo = get_wpa_status_info()) != NULL) {
 		/*wpa_supplicant state == connected*/
-		if(staInfo->wpa_state == WPA_COMPLETED){
+		if (staInfo->wpa_state == WPA_COMPLETED) {
 			/*not ip address*/
-			if(staInfo->ip_address[0] == '\0'){
-				wmg_printf(MSG_DEBUG,"connected AP,not ip\n");
+			if (staInfo->ip_address[0] == '\0') {
+				wmg_printf(MSG_DEBUG, "connected AP,not ip\n");
 				s->state = CONNECTED;
 			} else {
-				if(strlen(staInfo->ssid) > 64)
-				{
-					wmg_printf(MSG_ERROR,"===ssid name is too long===\n");
+				if (strlen(staInfo->ssid) > 64) {
+					wmg_printf(MSG_ERROR, "===ssid name is too long===\n");
 					return -1;
 				}
-				strncpy(s->ssid,staInfo->ssid,strlen(staInfo->ssid));
-				wmg_printf(MSG_DEBUG,"connected AP:%s\n",s->ssid);
+				strncpy(s->ssid, staInfo->ssid, strlen(staInfo->ssid));
+				wmg_printf(MSG_DEBUG, "connected AP:%s\n", s->ssid);
 				s->state = NETWORK_CONNECTED;
 			}
 		} else {
@@ -1532,16 +1513,16 @@ static int aw_wifi_get_status(struct wifi_status *s)
 
 static int aw_wifi_wps_pbc(int event_label)
 {
-	int i=0, ret = -1;
-	char cmd[CMD_LEN+1] = {0};
+	int i = 0, ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
 	char reply[REPLY_BUF_SIZE] = {0};
 
-	if(! w->enable){
-		wmg_printf(MSG_ERROR,"Not connected to wpa_supplicant\n");
+	if (!w->enable) {
+		wmg_printf(MSG_ERROR, "Not connected to wpa_supplicant\n");
 		return -1;
 	}
 
-	if(check_device_is_busing() < 0){
+	if (check_device_is_busing() < 0) {
 		w->StaEvt.event = WSE_DEV_BUSING;
 		w->StaEvt.state = DISCONNECTED;
 		state_event_change(event_label);
@@ -1553,15 +1534,15 @@ static int aw_wifi_wps_pbc(int event_label)
 	state_event_change(event_label);
 
 	/* set connecting event label */
-	a->label= event_label;
+	a->label = event_label;
 
 	/*clear event data in socket*/
 	clearEvtSocket();
 
 	sprintf(cmd, "%s", "WPS_PBC");
 	ret = wifi_command(cmd, reply, sizeof(reply));
-	if(ret){
-		wmg_printf(MSG_ERROR,"do wps_pbc error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do wps_pbc error!\n");
 		ret = -1;
 		goto end;
 	}
@@ -1569,62 +1550,49 @@ static int aw_wifi_wps_pbc(int event_label)
 	/* save config */
 	sprintf(cmd, "%s", "SAVE_CONFIG");
 	ret = wifi_command(cmd, reply, sizeof(reply));
-	if(ret){
-		wmg_printf(MSG_ERROR,"do save config error!\n");
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
 		ret = -1;
 		goto end;
 	}
 
 	/* wait for check status connected*/
-	ret = wait_event(NULL,NULL,-1);
+	ret = wait_event(NULL, NULL, -1);
 end:
 	state_event_change(event_label);
-	if(aw_wifi_get_wifi_state() == NETWORK_CONNECTED) {
-	    wmg_printf(MSG_INFO,"Wifi WPS connection: Success!\n");
+	if (aw_wifi_get_wifi_state() == NETWORK_CONNECTED) {
+		wmg_printf(MSG_INFO, "Wifi WPS connection: Success!\n");
 	} else {
-	    wmg_printf(MSG_ERROR,"Wifi WPS connection: Failure!\n");
-	    wpa_conf_remove_maxnetid_network();
+		wmg_printf(MSG_ERROR, "Wifi WPS connection: Failure!\n");
+		wpa_conf_remove_maxnetid_network();
 	}
 	wpa_conf_enable_all_networks();
 	return ret;
 }
 
 static const aw_wifi_interface_t aw_wifi_interface = {
-    aw_wifi_add_state_callback,
-    aw_wifi_ssid_is_connected_ap,
-    aw_wifi_is_ap_connected,
-	aw_wifi_connection_info,
-    aw_wifi_get_scan_results,
-    aw_wifi_connect_ap,
-    aw_wifi_connect_ap_key_mgmt,
-    aw_wifi_connect_ap_auto,
-    aw_wifi_connect_ap_with_netid,
-    aw_wifi_add_network,
-    aw_wifi_disconnect_ap,
-    aw_wifi_remove_network,
-    aw_wifi_remove_all_networks,
-    aw_wifi_list_networks,
-    aw_wifi_get_netid,
-    aw_wifi_get_status,
-    aw_wifi_clear_network,
-    aw_wifi_wps_pbc
-};
-const aw_wifi_interface_t * aw_wifi_on(tWifi_state_callback pcb,int event_label)
+	aw_wifi_add_state_callback,	 aw_wifi_ssid_is_connected_ap, aw_wifi_is_ap_connected,
+	aw_wifi_connection_info,	 aw_wifi_get_scan_results,	   aw_wifi_connect_ap,
+	aw_wifi_connect_ap_key_mgmt, aw_wifi_connect_ap_auto,	   aw_wifi_connect_ap_with_netid,
+	aw_wifi_add_network,		 aw_wifi_disconnect_ap,		   aw_wifi_remove_network,
+	aw_wifi_remove_all_networks, aw_wifi_list_networks,		   aw_wifi_get_netid,
+	aw_wifi_get_status,			 aw_wifi_clear_network,		   aw_wifi_wps_pbc};
+const aw_wifi_interface_t *aw_wifi_on(tWifi_state_callback pcb, int event_label)
 {
-    int i = 0, ret = -1, connected = 0, len = 64;
-    char ssid[64];
-    struct wpa_status *staInfo;
-
-    wmg_printf(MSG_DEBUG,"wifimanager Version: %s\n",VERSION);
-    if(w->enable){
-		wmg_printf(MSG_ERROR,"ERROR,Has been opened once!\n");
-        return NULL;
-    }
+	int i = 0, ret = -1, connected = 0, len = 64;
+	char ssid[64];
+	struct wpa_status *staInfo;
 
-    w->StaEvt.state = CONNECTING;
-    w->StaEvt.event = WSE_STARTUP_AUTO_CONNECT;
+	wmg_printf(MSG_DEBUG, "wifimanager Version: %s\n", VERSION);
+	if (w->enable) {
+		wmg_printf(MSG_ERROR, "ERROR,Has been opened once!\n");
+		return NULL;
+	}
+
+	w->StaEvt.state = CONNECTING;
+	w->StaEvt.event = WSE_STARTUP_AUTO_CONNECT;
 
-    ret = wifi_connect_to_supplicant();
+	ret = wifi_connect_to_supplicant();
 #if 0
     if(ret) {
 		wmg_printf(MSG_DEBUG,"wpa_suppplicant not running!\n");
@@ -1646,86 +1614,86 @@ const aw_wifi_interface_t * aw_wifi_on(tWifi_state_callback pcb,int event_label)
 		}
     }
 #else
-	if(ret < 0){
-	    wmg_printf(MSG_ERROR,"connect wpa_supplicant failed,please check wifi driver!\n");
-	    return NULL;
+	if (ret < 0) {
+		wmg_printf(MSG_ERROR, "connect wpa_supplicant failed,please check wifi driver!\n");
+		return NULL;
 	}
 #endif
-    w->enable = true;
+	w->enable = true;
 
-    aw_wifi_add_state_callback(pcb);
+	aw_wifi_add_state_callback(pcb);
 
-    wifi_start_event_loop();
+	wifi_start_event_loop();
 
-    evtSocketInit();
-    clearEvtSocket();
+	evtSocketInit();
+	clearEvtSocket();
 
 	staInfo = get_wpa_status_info();
 
-    if(staInfo != NULL) {
-		if(staInfo->wpa_state == WPA_INTERFACE_DISABLED) {
+	if (staInfo != NULL) {
+		if (staInfo->wpa_state == WPA_INTERFACE_DISABLED) {
 			system("ifconfig wlan0 up");
 			staInfo = get_wpa_status_info();
-			if(staInfo == NULL) {
+			if (staInfo == NULL) {
 				return NULL;
 			}
 		}
 		w->ssid = staInfo->ssid;
-		if(staInfo->wpa_state == WPA_4WAY_HANDSHAKE){
-		    /* wpa_supplicant already run by other process and connected an ap */
-//		    wait_event(NULL,NULL,-1);
+		if (staInfo->wpa_state == WPA_4WAY_HANDSHAKE) {
+			/* wpa_supplicant already run by other process and connected an ap */
+			//		    wait_event(NULL,NULL,-1);
 			w->StaEvt.state = CONNECTING;
 			w->ssid = staInfo->ssid;
-		    state_event_change(event_label);
-		}else if(staInfo->wpa_state == WPA_COMPLETED){
-		    w->StaEvt.state = CONNECTED;
-		    if(is_ip_exist() == 0){
-				wmg_printf(MSG_DEBUG,"Wifi connected but not get ip!\n");
+			state_event_change(event_label);
+		} else if (staInfo->wpa_state == WPA_COMPLETED) {
+			w->StaEvt.state = CONNECTED;
+			if (is_ip_exist() == 0) {
+				wmg_printf(MSG_DEBUG, "Wifi connected but not get ip!\n");
 				state_event_change(event_label);
-		    } else {
-				wmg_printf(MSG_DEBUG,"Wifi already connect to %s\n",staInfo->ssid);
-		    }
-		}else {
+			} else {
+				wmg_printf(MSG_DEBUG, "Wifi already connect to %s\n", staInfo->ssid);
+			}
+		} else {
 			w->ssid = NULL;
-		    w->StaEvt.state = DISCONNECTED;
+			w->StaEvt.state = DISCONNECTED;
 		}
-	}else{
-		wmg_printf(MSG_ERROR,"sta->wpa_state is NULL\n");
+	} else {
+		wmg_printf(MSG_ERROR, "sta->wpa_state is NULL\n");
 		return NULL;
-    }
-    wmg_printf(MSG_DEBUG,"aw wifi on success!\n");
-    return &aw_wifi_interface;
+	}
+	wmg_printf(MSG_DEBUG, "aw wifi on success!\n");
+	return &aw_wifi_interface;
 }
 
 int aw_wifi_off(const aw_wifi_interface_t *p_wifi_interface)
 {
-    const aw_wifi_interface_t *p_aw_wifi_intf = &aw_wifi_interface;
+	const aw_wifi_interface_t *p_aw_wifi_intf = &aw_wifi_interface;
 
-    if(p_aw_wifi_intf != p_wifi_interface) {
-	wmg_printf(MSG_ERROR,"aw wifi of failed !\n");
-        return -1;
-    }
+	if (p_aw_wifi_intf != p_wifi_interface) {
+		wmg_printf(MSG_ERROR, "aw wifi of failed !\n");
+		return -1;
+	}
 
-    if(! w->enable) {
-        return 0;
-    }
-    wpa_status_info_free();
+	if (!w->enable) {
+		return 0;
+	}
+	wpa_status_info_free();
 
-    evtSockeExit();
+	evtSockeExit();
 
-    wifi_stop_event_loop();
+	wifi_stop_event_loop();
 
-    wifi_close_supplicant_connection();
+	wifi_close_supplicant_connection();
 
-//    wifi_stop_supplicant(0);
+	//    wifi_stop_supplicant(0);
 	system("ifconfig wlan0 down");
 
-    clearManagerdata();
+	clearManagerdata();
 
-    system("/etc/wifi/udhcpc_wlan0 stop >/dev/null");
+	system("/etc/wifi/udhcpc_wlan0 stop >/dev/null");
 
-    reset_wifi_state_callback();
+	reset_wifi_state_callback();
 
-    wmg_printf(MSG_INFO,"aw wifi off success!\n");
-    return 0;
+	wmg_printf(MSG_INFO, "aw wifi off success!\n");
+	return 0;
 }
diff --git a/workspace/tg5040/wifimanager/src/core/wmg_debug.c b/workspace/tg5040/wifimanager/src/core/wmg_debug.c
old mode 100755
new mode 100644
index 801c68ac4..a38150b02
--- a/workspace/tg5040/wifimanager/src/core/wmg_debug.c
+++ b/workspace/tg5040/wifimanager/src/core/wmg_debug.c
@@ -65,11 +65,10 @@ void wmg_debug_print_timestap(void)
 	sys_get_time(&tv);
 #ifdef CONFIG_DEBUG_FILE
 	if (out_file) {
-		fprintf(out_file, "%ld.%06u: ", (long) tv.sec,
-			(unsigned int) tv.usec);
+		fprintf(out_file, "%ld.%06u: ", (long)tv.sec, (unsigned int)tv.usec);
 	} else
 #endif /* CONFIG_DEBUG_FILE */
-	printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec);
+		printf("%ld.%06u: ", (long)tv.sec, (unsigned int)tv.usec);
 #endif /* CONFIG_ANDROID_LOG */
 }
 void wmg_print(int level, const char *fmt, ...)
@@ -83,17 +82,17 @@ void wmg_print(int level, const char *fmt, ...)
 			vsyslog(syslog_priority(level), fmt, ap);
 		} else {
 #endif /* CONFIG_DEBUG_SYSLOG */
-		wmg_debug_print_timestap();
+			wmg_debug_print_timestap();
 #ifdef CONFIG_DEBUG_FILE
-		if (out_file) {
-			vfprintf(out_file, fmt, ap);
-//			fprintf(out_file, "\n");
-		} else {
+			if (out_file) {
+				vfprintf(out_file, fmt, ap);
+				//			fprintf(out_file, "\n");
+			} else {
 #endif /* CONFIG_DEBUG_FILE */
-		vprintf(fmt, ap);
+				vprintf(fmt, ap);
 //		printf("\n");
 #ifdef CONFIG_DEBUG_FILE
-		}
+			}
 #endif /* CONFIG_DEBUG_FILE */
 #ifdef CONFIG_DEBUG_SYSLOG
 		}
@@ -121,10 +120,10 @@ int wmg_debug_open_file(const char *path)
 	out_file = fopen(path, "a");
 	if (out_file == NULL) {
 		wmg_printf(MSG_ERROR, "wmg_debug_open_file: Failed to open "
-			   "output file, using standard output");
+							  "output file, using standard output");
 		return -1;
 	}
-#else /* CONFIG_DEBUG_FILE */
+#else  /* CONFIG_DEBUG_FILE */
 	(void)path;
 #endif /* CONFIG_DEBUG_FILE */
 	return 0;
diff --git a/workspace/tg5040/wifimanager/src/core/wpa_supplicant_conf.c b/workspace/tg5040/wifimanager/src/core/wpa_supplicant_conf.c
old mode 100755
new mode 100644
index f28f8e996..ce00c2695
--- a/workspace/tg5040/wifimanager/src/core/wpa_supplicant_conf.c
+++ b/workspace/tg5040/wifimanager/src/core/wpa_supplicant_conf.c
@@ -1,6 +1,6 @@
-#include<stdio.h>
-#include<stdlib.h>
-#include<string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "wpa_supplicant_conf.h"
 #include "wifi.h"
@@ -10,18 +10,18 @@
 
 int wpa_conf_network_info_exist()
 {
-    int ret = -1;
-    char cmd[256] = {0}, reply[REPLY_BUF_SIZE] = {0};
-
-    strncpy(cmd, "LIST_NETWORKS", 255);
-    cmd[255] = '\0';
-    wifi_command(cmd, reply, sizeof(reply));
-
-    if(strchr(reply, '\n') != NULL){
-        return 1;
-    }else{
-        return 0;
-    }
+	int ret = -1;
+	char cmd[256] = {0}, reply[REPLY_BUF_SIZE] = {0};
+
+	strncpy(cmd, "LIST_NETWORKS", 255);
+	cmd[255] = '\0';
+	wifi_command(cmd, reply, sizeof(reply));
+
+	if (strchr(reply, '\n') != NULL) {
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 /*
@@ -30,189 +30,188 @@ int wpa_conf_network_info_exist()
  * -1: not exist
  * 1:  exist but not connected
  * 3:  exist and connected; network id in buffer net_id
-*/
+ */
 int wpa_conf_is_ap_exist(const char *ssid, tKEY_MGMT key_mgmt, char *net_id, int *len)
 {
-    int ret = -1;
-    char cmd[256] = {0};
-    char reply[REPLY_BUF_SIZE] = {0}, key_type[128], key_reply[128];
-    char *pssid_start=NULL, *pssid_end = NULL, *ptr=NULL;
-    int flag = 0;
-
-    if(!ssid || !ssid[0]){
-        wmg_printf(MSG_ERROR,"Error: ssid is NULL!\n");
-        return -1;
-    }
-
-    /* parse key_type */
-    if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
-        strncpy(key_type, "WPA-PSK", 128);
-    } else {
-        strncpy(key_type, "NONE", 128);
-    }
-
-    strncpy(cmd, "LIST_NETWORKS", 255);
-    cmd[255] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    ptr = reply;
-    while((pssid_start=strstr(ptr, ssid)) != NULL){
-        char *p_s=NULL, *p_e=NULL, *p=NULL;
-
-        pssid_end = pssid_start + strlen(ssid);
-        /* ssid is presuffix of searched network */
-        if(*pssid_end != '\t'){
-            p_e = strchr(pssid_start, '\n');
-            if(p_e != NULL){
-                ptr = p_e;
-                continue;
-            }else{
-                break;
-            }
-        }
-
-        flag = 0;
-
-        p_e = strchr(pssid_start, '\n');
-        if(p_e){
-            *p_e = '\0';
-        }
-        p_s = strrchr(ptr, '\n');
-        p_s++;
-
-        if(strstr(p_s, "CURRENT")){
-            flag = 2;
-        }
-
-        p = strtok(p_s, "\t");
-        if(p){
-            if(net_id != NULL && *len > 0){
-                strncpy(net_id, p, *len-1);
-                net_id[*len-1] = '\0';
-            }
-        }
-
-        /* get key_mgmt */
-        sprintf(cmd, "GET_NETWORK %s key_mgmt", net_id);
-        cmd[255] = '\0';
-        ret = wifi_command(cmd, key_reply, sizeof(key_reply));
-        if(ret){
-            wmg_printf(MSG_ERROR,"do get network %s key_mgmt error!\n", net_id);
-            return -1;
-        }
-
-        wmg_printf(MSG_DEBUG,"GET_NETWORK %s key_mgmt reply %s\n", net_id, key_reply);
-        wmg_printf(MSG_DEBUG,"key type %s\n", key_type);
-
-        if(strcmp(key_reply, key_type) == 0){
-            flag += 1;
+	int ret = -1;
+	char cmd[256] = {0};
+	char reply[REPLY_BUF_SIZE] = {0}, key_type[128], key_reply[128];
+	char *pssid_start = NULL, *pssid_end = NULL, *ptr = NULL;
+	int flag = 0;
+
+	if (!ssid || !ssid[0]) {
+		wmg_printf(MSG_ERROR, "Error: ssid is NULL!\n");
+		return -1;
+	}
+
+	/* parse key_type */
+	if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
+		strncpy(key_type, "WPA-PSK", 128);
+	} else {
+		strncpy(key_type, "NONE", 128);
+	}
+
+	strncpy(cmd, "LIST_NETWORKS", 255);
+	cmd[255] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	ptr = reply;
+	while ((pssid_start = strstr(ptr, ssid)) != NULL) {
+		char *p_s = NULL, *p_e = NULL, *p = NULL;
+
+		pssid_end = pssid_start + strlen(ssid);
+		/* ssid is presuffix of searched network */
+		if (*pssid_end != '\t') {
+			p_e = strchr(pssid_start, '\n');
+			if (p_e != NULL) {
+				ptr = p_e;
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		flag = 0;
+
+		p_e = strchr(pssid_start, '\n');
+		if (p_e) {
+			*p_e = '\0';
+		}
+		p_s = strrchr(ptr, '\n');
+		p_s++;
+
+		if (strstr(p_s, "CURRENT")) {
+			flag = 2;
+		}
+
+		p = strtok(p_s, "\t");
+		if (p) {
+			if (net_id != NULL && *len > 0) {
+				strncpy(net_id, p, *len - 1);
+				net_id[*len - 1] = '\0';
+			}
+		}
+
+		/* get key_mgmt */
+		sprintf(cmd, "GET_NETWORK %s key_mgmt", net_id);
+		cmd[255] = '\0';
+		ret = wifi_command(cmd, key_reply, sizeof(key_reply));
+		if (ret) {
+			wmg_printf(MSG_ERROR, "do get network %s key_mgmt error!\n", net_id);
+			return -1;
+		}
+
+		wmg_printf(MSG_DEBUG, "GET_NETWORK %s key_mgmt reply %s\n", net_id, key_reply);
+		wmg_printf(MSG_DEBUG, "key type %s\n", key_type);
+
+		if (strcmp(key_reply, key_type) == 0) {
+			flag += 1;
 			*len = strlen(net_id);
-            break;
-        }
-
-        if(p_e == NULL){
-            break;
-        }else{
-            *p_e = '\n';
-            ptr = p_e;
-        }
-    }
-
-    return flag;
+			break;
+		}
+
+		if (p_e == NULL) {
+			break;
+		} else {
+			*p_e = '\n';
+			ptr = p_e;
+		}
+	}
+
+	return flag;
 }
 
 /*
  * ssid to netid
-*/
+ */
 int wpa_conf_ssid2netid(char *ssid, tKEY_MGMT key_mgmt, char *net_id, int *len)
 {
-    int ret = -1;
-    char cmd[CMD_LEN + 1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0}, key_type[128], key_reply[128];
-    char *pssid_start=NULL, *pssid_end=NULL, *ptr=NULL;
-    int flag = 0;
-
-    /* parse key_type */
-    if(key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK){
-        strncpy(key_type, "WPA-PSK", 128);
-    } else {
-        strncpy(key_type, "NONE", 128);
-    }
-
-    /* list ap in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", 15);
-    cmd[15] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    ptr = reply;
-    while((pssid_start=strstr(ptr, ssid)) != NULL){
-        char *p_s=NULL, *p_e=NULL, *p_t=NULL;
-
-        pssid_end = pssid_start + strlen(ssid);
-        /* ssid is presuffix of searched network */
-        if(*pssid_end != '\t'){
-            p_e = strchr(pssid_start, '\n');
-            if(p_e != NULL){
-                ptr = p_e;
-                continue;
-            }else{
-                break;
-            }
-        }
-
-       flag |= (0x01 << 0);
-
-        p_e = strchr(pssid_start, '\n');
-        if(p_e){
-            *p_e = '\0';
-        }
-        p_s = strrchr(ptr, '\n');
-        p_s++;
-
-
-
-        p_t = strchr(p_s, '\t');
-        if(p_t){
-	   int tmp = 0;
-            tmp = p_t - p_s;
-            if(tmp <= NET_ID_LEN){
-            strncpy(net_id, p_s, tmp);
-            net_id[tmp] = '\0';
-            }
-        }
-
-        /* get key_mgmt */
-        sprintf(cmd, "GET_NETWORK %s key_mgmt", net_id);
-        cmd[CMD_LEN] = '\0';
-        ret = wifi_command(cmd, key_reply, sizeof(key_reply));
-        if(ret){
-            wmg_printf(MSG_ERROR,"do get network %s key_mgmt error!\n", net_id);
-            return -1;
-        }
-
-        if(strcmp(key_reply, key_type) == 0){
-           flag |= (0x01 << 1);
-	  *len =  strlen(net_id);
-            break;
-        }
-
-        if(p_e == NULL){
-            break;
-        }else{
-            *p_e = '\n';
-            ptr = p_e;
-        }
-    }
-
-    return flag;
+	int ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0}, key_type[128], key_reply[128];
+	char *pssid_start = NULL, *pssid_end = NULL, *ptr = NULL;
+	int flag = 0;
+
+	/* parse key_type */
+	if (key_mgmt == WIFIMG_WPA_PSK || key_mgmt == WIFIMG_WPA2_PSK) {
+		strncpy(key_type, "WPA-PSK", 128);
+	} else {
+		strncpy(key_type, "NONE", 128);
+	}
+
+	/* list ap in wpa_supplicant.conf */
+	strncpy(cmd, "LIST_NETWORKS", 15);
+	cmd[15] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	ptr = reply;
+	while ((pssid_start = strstr(ptr, ssid)) != NULL) {
+		char *p_s = NULL, *p_e = NULL, *p_t = NULL;
+
+		pssid_end = pssid_start + strlen(ssid);
+		/* ssid is presuffix of searched network */
+		if (*pssid_end != '\t') {
+			p_e = strchr(pssid_start, '\n');
+			if (p_e != NULL) {
+				ptr = p_e;
+				continue;
+			} else {
+				break;
+			}
+		}
+
+		flag |= (0x01 << 0);
+
+		p_e = strchr(pssid_start, '\n');
+		if (p_e) {
+			*p_e = '\0';
+		}
+		p_s = strrchr(ptr, '\n');
+		p_s++;
+
+
+		p_t = strchr(p_s, '\t');
+		if (p_t) {
+			int tmp = 0;
+			tmp = p_t - p_s;
+			if (tmp <= NET_ID_LEN) {
+				strncpy(net_id, p_s, tmp);
+				net_id[tmp] = '\0';
+			}
+		}
+
+		/* get key_mgmt */
+		sprintf(cmd, "GET_NETWORK %s key_mgmt", net_id);
+		cmd[CMD_LEN] = '\0';
+		ret = wifi_command(cmd, key_reply, sizeof(key_reply));
+		if (ret) {
+			wmg_printf(MSG_ERROR, "do get network %s key_mgmt error!\n", net_id);
+			return -1;
+		}
+
+		if (strcmp(key_reply, key_type) == 0) {
+			flag |= (0x01 << 1);
+			*len = strlen(net_id);
+			break;
+		}
+
+		if (p_e == NULL) {
+			break;
+		} else {
+			*p_e = '\n';
+			ptr = p_e;
+		}
+	}
+
+	return flag;
 }
 
 /*
@@ -224,341 +223,337 @@ int wpa_conf_ssid2netid(char *ssid, tKEY_MGMT key_mgmt, char *net_id, int *len)
  */
 int wpa_conf_get_max_priority()
 {
-    int  ret = -1;
-    int  val = -1, max_val = 0, len = 0;
-    char cmd[CMD_LEN + 1] = {0}, reply[REPLY_BUF_SIZE] = {0}, priority[32] = {0};
-    char net_id[NET_ID_LEN+1];
-    char *p_n = NULL, *p_t = NULL;
-
-    /* list ap in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    p_n = strchr(reply, '\n');
-    while(p_n != NULL){
-	  p_n++;
-        if((p_t = strchr(p_n, '\t')) != NULL){
-            len = p_t - p_n;
-            if(len <= NET_ID_LEN){
-               strncpy(net_id, p_n, len);
-               net_id[len] = '\0';
-            }
-        }
-
-        sprintf(cmd, "GET_NETWORK %s priority", net_id);
-        ret = wifi_command(cmd, priority, sizeof(priority));
-        if(ret){
-            wmg_printf(MSG_ERROR,"do get network priority error!\n");
-            return -1;
-        }
-
-        val = atoi(priority);
-        if(val >= max_val){
-            max_val = val;
-        }
-
-        p_n = strchr(p_n, '\n');
-    }
-
-    return max_val;
+	int ret = -1;
+	int val = -1, max_val = 0, len = 0;
+	char cmd[CMD_LEN + 1] = {0}, reply[REPLY_BUF_SIZE] = {0}, priority[32] = {0};
+	char net_id[NET_ID_LEN + 1];
+	char *p_n = NULL, *p_t = NULL;
+
+	/* list ap in wpa_supplicant.conf */
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	p_n = strchr(reply, '\n');
+	while (p_n != NULL) {
+		p_n++;
+		if ((p_t = strchr(p_n, '\t')) != NULL) {
+			len = p_t - p_n;
+			if (len <= NET_ID_LEN) {
+				strncpy(net_id, p_n, len);
+				net_id[len] = '\0';
+			}
+		}
+
+		sprintf(cmd, "GET_NETWORK %s priority", net_id);
+		ret = wifi_command(cmd, priority, sizeof(priority));
+		if (ret) {
+			wmg_printf(MSG_ERROR, "do get network priority error!\n");
+			return -1;
+		}
+
+		val = atoi(priority);
+		if (val >= max_val) {
+			max_val = val;
+		}
+
+		p_n = strchr(p_n, '\n');
+	}
+
+	return max_val;
 }
 
 int wpa_conf_is_ap_connected(char *ssid, int *len)
 {
-    int ret = -1;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char *p_c=NULL, *p_str = NULL;
-    char *p_s=NULL, *p_e=NULL, *p=NULL;
-    int is_ap_connected = 0;
-    int ssid_len = strlen(ssid);
-
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    p_str = (char *)reply;
-    while((p_c=strstr(p_str, "[CURRENT]")) != NULL){
-	if(*(p_c + 9) != '\n' && *(p_c + 9) != '\0')
-	{
-		p_str = p_c+9;
-		continue;
+	int ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char *p_c = NULL, *p_str = NULL;
+	char *p_s = NULL, *p_e = NULL, *p = NULL;
+	int is_ap_connected = 0;
+	int ssid_len = strlen(ssid);
+
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	p_str = (char *)reply;
+	while ((p_c = strstr(p_str, "[CURRENT]")) != NULL) {
+		if (*(p_c + 9) != '\n' && *(p_c + 9) != '\0') {
+			p_str = p_c + 9;
+			continue;
+		}
+
+		p_e = strchr(p_c, '\n');
+		if (p_e) {
+			*p_e = '\0';
+		}
+
+		p_s = strrchr(p_str, '\n');
+		p_s++;
+		p = strtok(p_s, "\t");
+		p = strtok(NULL, "\t");
+		ssid_len = strlen(p);
+		if (p) {
+			if (ssid != NULL && ssid_len > 0) {
+				strncpy(ssid, p, ssid_len);
+				ssid[ssid_len] = '\0';
+				*len = strlen(ssid);
+				is_ap_connected = 1;
+				break;
+			}
+		}
 	}
 
-        p_e = strchr(p_c, '\n');
-        if(p_e){
-            *p_e = '\0';
-        }
-
-        p_s = strrchr(p_str, '\n');
-        p_s++;
-        p = strtok(p_s, "\t");
-        p = strtok(NULL, "\t");
-	ssid_len = strlen(p);
-        if(p){
-            if(ssid != NULL && ssid_len > 0){
-                strncpy(ssid, p, ssid_len);
-                ssid[ssid_len] = '\0';
-                *len = strlen(ssid);
-		is_ap_connected = 1;
-		break;
-            }
-        }
-
-    }
-
-    /* check ip exist */
-    ret = is_ip_exist();
-    if(ret > 0 && is_ap_connected == 1){
-            return ret;
-    }else{
-        return is_ap_connected;
-    }
+	/* check ip exist */
+	ret = is_ip_exist();
+	if (ret > 0 && is_ap_connected == 1) {
+		return ret;
+	} else {
+		return is_ap_connected;
+	}
 }
 
 int wpa_conf_get_netid_connected(char *net_id, int *len)
 {
-    int ret = -1;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char *p_c=NULL;
-
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    if ((p_c=strstr(reply, "CURRENT")) != NULL){
-        char *p_s=NULL, *p_e=NULL, *p=NULL;
-        p_e = strchr(p_c, '\n');
-        if(p_e){
-            *p_e = '\0';
-        }
-
-        p_s = strrchr(reply, '\n');
-        p_s++;
-        p = strtok(p_s, "\t");
-        if(p){
-            if(net_id != NULL && *len > 0){
-                strncpy(net_id, p, *len-1);
-                net_id[*len-1] = '\0';
-                *len = strlen(net_id);
-            }
-        }
-
-        return 1;
-    } else {
-        return 0;
-    }
+	int ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char *p_c = NULL;
+
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
 
+	if ((p_c = strstr(reply, "CURRENT")) != NULL) {
+		char *p_s = NULL, *p_e = NULL, *p = NULL;
+		p_e = strchr(p_c, '\n');
+		if (p_e) {
+			*p_e = '\0';
+		}
+
+		p_s = strrchr(reply, '\n');
+		p_s++;
+		p = strtok(p_s, "\t");
+		if (p) {
+			if (net_id != NULL && *len > 0) {
+				strncpy(net_id, p, *len - 1);
+				net_id[*len - 1] = '\0';
+				*len = strlen(net_id);
+			}
+		}
+
+		return 1;
+	} else {
+		return 0;
+	}
 }
 
 /*
  * 1. link to ap
  * 2. get ip addr
  *
-*/
+ */
 int wpa_conf_get_ap_connected(char *netid, int *len)
 {
-    int ret = -1;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char *p_c=NULL;
-
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    if ((p_c=strstr(reply, "CURRENT")) != NULL){
-        char *p_s=NULL, *p_e=NULL, *p=NULL;
-        p_e = strchr(p_c, '\n');
-        if(p_e){
-            *p_e = '\0';
-        }
-
-        p_s = strrchr(reply, '\n');
-        p_s++;
-        p = strtok(p_s, "\t");
-        if(p){
-            if(netid != NULL && *len > 0){
-                strncpy(netid, p, *len-1);
-                netid[*len-1] = '\0';
-                *len = strlen(netid);
-            }
-        }
-		wmg_printf(MSG_EXCESSIVE,"net id %s\n",netid);
-        return 1;
-    } else {
-	wmg_printf(MSG_EXCESSIVE,"no CURRENT\n");
-        return 0;
-    }
+	int ret = -1;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char *p_c = NULL;
+
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
 
+	if ((p_c = strstr(reply, "CURRENT")) != NULL) {
+		char *p_s = NULL, *p_e = NULL, *p = NULL;
+		p_e = strchr(p_c, '\n');
+		if (p_e) {
+			*p_e = '\0';
+		}
+
+		p_s = strrchr(reply, '\n');
+		p_s++;
+		p = strtok(p_s, "\t");
+		if (p) {
+			if (netid != NULL && *len > 0) {
+				strncpy(netid, p, *len - 1);
+				netid[*len - 1] = '\0';
+				*len = strlen(netid);
+			}
+		}
+		wmg_printf(MSG_EXCESSIVE, "net id %s\n", netid);
+		return 1;
+	} else {
+		wmg_printf(MSG_EXCESSIVE, "no CURRENT\n");
+		return 0;
+	}
 }
 
 int wpa_conf_enable_all_networks()
 {
-    int ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char net_id[NET_ID_LEN+1] = {0};
-    char *p_n = NULL, *p_t = NULL;
-
-    /* list ap in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    p_n = strchr(reply, '\n');
-    while(p_n != NULL){
-	  p_n++;
-        if((p_t = strchr(p_n, '\t')) != NULL){
-            len = p_t - p_n;
-            if(len <= NET_ID_LEN){
-               strncpy(net_id, p_n, len);
-               net_id[len] = '\0';
-            }
-        }
-
-        /* cancel saved in wpa_supplicant.conf */
-        sprintf(cmd, "ENABLE_NETWORK %s", net_id);
-        ret = wifi_command(cmd, reply, sizeof(reply));
-        if(ret){
-            wmg_printf(MSG_ERROR,"do enable network %s error!\n", net_id);
-            return -1;
-        }
-
-        p_n = strchr(p_n, '\n');
-    }
-
-    /* save config */
-	  sprintf(cmd, "%s", "SAVE_CONFIG");
-	  ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do save config error!\n");
-        return -1;
-    }
-
-    return 0;
+	int ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char net_id[NET_ID_LEN + 1] = {0};
+	char *p_n = NULL, *p_t = NULL;
+
+	/* list ap in wpa_supplicant.conf */
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	p_n = strchr(reply, '\n');
+	while (p_n != NULL) {
+		p_n++;
+		if ((p_t = strchr(p_n, '\t')) != NULL) {
+			len = p_t - p_n;
+			if (len <= NET_ID_LEN) {
+				strncpy(net_id, p_n, len);
+				net_id[len] = '\0';
+			}
+		}
+
+		/* cancel saved in wpa_supplicant.conf */
+		sprintf(cmd, "ENABLE_NETWORK %s", net_id);
+		ret = wifi_command(cmd, reply, sizeof(reply));
+		if (ret) {
+			wmg_printf(MSG_ERROR, "do enable network %s error!\n", net_id);
+			return -1;
+		}
+
+		p_n = strchr(p_n, '\n');
+	}
+
+	/* save config */
+	sprintf(cmd, "%s", "SAVE_CONFIG");
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
+		return -1;
+	}
+
+	return 0;
 }
 
 int wpa_conf_remove_all_networks()
 {
-    int ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char net_id[NET_ID_LEN+1] = {0};
-    char *p_n = NULL, *p_t = NULL;
-
-    /* list ap in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    p_n = strchr(reply, '\n');
-    while(p_n != NULL){
-	  p_n++;
-        if((p_t = strchr(p_n, '\t')) != NULL){
-            len = p_t - p_n;
-            if(len <= NET_ID_LEN){
-               strncpy(net_id, p_n, len);
-               net_id[len] = '\0';
-            }
-        }
-
-        /* cancel saved in wpa_supplicant.conf */
-        sprintf(cmd, "REMOVE_NETWORK %s", net_id);
-        ret = wifi_command(cmd, reply, sizeof(reply));
-        if(ret){
-            wmg_printf(MSG_ERROR,"do remove network %s error!\n", net_id);
-            return -1;
-        }
-
-        p_n = strchr(p_n, '\n');
-    }
-
-    /* save config */
-	  sprintf(cmd, "%s", "SAVE_CONFIG");
-	  ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do save config error!\n");
-        return -1;
-    }
-
-    return 0;
+	int ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char net_id[NET_ID_LEN + 1] = {0};
+	char *p_n = NULL, *p_t = NULL;
+
+	/* list ap in wpa_supplicant.conf */
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	p_n = strchr(reply, '\n');
+	while (p_n != NULL) {
+		p_n++;
+		if ((p_t = strchr(p_n, '\t')) != NULL) {
+			len = p_t - p_n;
+			if (len <= NET_ID_LEN) {
+				strncpy(net_id, p_n, len);
+				net_id[len] = '\0';
+			}
+		}
+
+		/* cancel saved in wpa_supplicant.conf */
+		sprintf(cmd, "REMOVE_NETWORK %s", net_id);
+		ret = wifi_command(cmd, reply, sizeof(reply));
+		if (ret) {
+			wmg_printf(MSG_ERROR, "do remove network %s error!\n", net_id);
+			return -1;
+		}
+
+		p_n = strchr(p_n, '\n');
+	}
+
+	/* save config */
+	sprintf(cmd, "%s", "SAVE_CONFIG");
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
+		return -1;
+	}
+
+	return 0;
 }
 
 int wpa_conf_remove_maxnetid_network()
 {
-    int ret = -1, len = 0;
-    char cmd[CMD_LEN+1] = {0};
-    char reply[REPLY_BUF_SIZE] = {0};
-    char net_id[NET_ID_LEN+1] = {0};
-    char *p_n = NULL, *p_t = NULL;
-
-    /* list ap in wpa_supplicant.conf */
-    strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
-    cmd[CMD_LEN] = '\0';
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do list networks error!\n");
-        return -1;
-    }
-
-    p_n = strchr(reply, '\n');
-    while(p_n != NULL){
-	p_n++;
-        if((p_t = strchr(p_n, '\t')) != NULL){
-            len = p_t - p_n;
-            if(len <= NET_ID_LEN){
-               strncpy(net_id, p_n, len);
-               net_id[len] = '\0';
-            }
-        }
-        p_n = strchr(p_n, '\n');
-    }
-
-    /* cancel saved in wpa_supplicant.conf */
-    sprintf(cmd, "REMOVE_NETWORK %s", net_id);
-    wmg_printf(MSG_DEBUG,"remove network %s!\n", net_id);
-    ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do remove network %s error!\n", net_id);
-        return -1;
-    }
-
-    /* save config */
-      sprintf(cmd, "%s", "SAVE_CONFIG");
-      ret = wifi_command(cmd, reply, sizeof(reply));
-    if(ret){
-        wmg_printf(MSG_ERROR,"do save config error!\n");
-        return -1;
-    }
-
-    return 0;
+	int ret = -1, len = 0;
+	char cmd[CMD_LEN + 1] = {0};
+	char reply[REPLY_BUF_SIZE] = {0};
+	char net_id[NET_ID_LEN + 1] = {0};
+	char *p_n = NULL, *p_t = NULL;
+
+	/* list ap in wpa_supplicant.conf */
+	strncpy(cmd, "LIST_NETWORKS", CMD_LEN);
+	cmd[CMD_LEN] = '\0';
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do list networks error!\n");
+		return -1;
+	}
+
+	p_n = strchr(reply, '\n');
+	while (p_n != NULL) {
+		p_n++;
+		if ((p_t = strchr(p_n, '\t')) != NULL) {
+			len = p_t - p_n;
+			if (len <= NET_ID_LEN) {
+				strncpy(net_id, p_n, len);
+				net_id[len] = '\0';
+			}
+		}
+		p_n = strchr(p_n, '\n');
+	}
+
+	/* cancel saved in wpa_supplicant.conf */
+	sprintf(cmd, "REMOVE_NETWORK %s", net_id);
+	wmg_printf(MSG_DEBUG, "remove network %s!\n", net_id);
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do remove network %s error!\n", net_id);
+		return -1;
+	}
+
+	/* save config */
+	sprintf(cmd, "%s", "SAVE_CONFIG");
+	ret = wifi_command(cmd, reply, sizeof(reply));
+	if (ret) {
+		wmg_printf(MSG_ERROR, "do save config error!\n");
+		return -1;
+	}
+
+	return 0;
 }