diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3bcccbd..d4d22dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,15 +3,17 @@
 
     <string name="empty"></string>
 
+    <!--Home Screen-->
     <string name="shortcut_default">App</string>
 
     <string name="shortcut_default_click">Long click to select an app</string>
 
     <string name="accessibility_set_shortcut">Set Shortcut App</string>
 
-    <!--App Menu Items-->
+    <string name="open_app_menu">Open App Menu</string>
+
+    <!--App Menu-->
     <string name="select_an_app">Select an app</string>
-    <string name="find_your_city">"Search for Your City"</string>
 
     <string name="search">Search…</string>
 
@@ -22,12 +24,10 @@
     <string name="app_confirm_text">Are you sure you want to choose</string>
     <string name="confirm_yes">Yes</string>
     <string name="confirm_no">Cancel</string>
-    <string name="hidden_confirm_text">Are you sure you want to unhide</string>
 
     <string name="removing">Removing...</string>
 
     <string name="close_app_menu">Close App Menu</string>
-    <string name="open_app_menu">Open App Menu</string>
 
     <string name="launch_error">Cannot launch app</string>
 
@@ -52,35 +52,85 @@
     <string name="ui_settings_title">General UI Settings</string>
     <string name="ui_settings_text">General UI</string>
     <string name="ui_settings_summary">Configure the overall look</string>
+
     <string name="appearance">Appearance</string>
+    <string name="background_color">Background Color</string>
+    <string name="text_color">Text Color</string>
+    <string name="text_font">Text Font</string>
+    <string name="text_style">Text Style</string>
+
+    <string name="operation">Operation</string>
+    <string name="animation_speed">Animation Speed</string>
+    <string name="swipe_threshold">Swipe Threshold</string>
+    <string name="swipe_velocity_threshold">Swipe Velocity Threshold</string>
+    <string name="show_status_bar">Show Status Bar</string>
 
     <string name="home_settings_title">Home Screen Settings</string>
     <string name="home_settings_text">Home Screen</string>
     <string name="home_settings_summary">Configure the home screen</string>
+
+    <string name="clock">Clock</string>
+    <string name="show_clock">Show Clock</string>
+    <string name="clock_alignment">Clock Alignment</string>
+    <string name="clock_size">Clock Size</string>
+    <string name="clicking_time_opens_clock">Clicking Time Opens Clock</string>
+    <string name="custom_clock_gesture">Custom Clock</string>
+    <string name="set_clock_app">Set Clock App</string>
+
+    <string name="date">Date</string>
+    <string name="show_date">Show Date</string>
+    <string name="date_size">Date Size</string>
+    <string name="battery_indicator">Battery Indicator</string>
+    <string name="clicking_date_opens_calendar">Clicking Date Opens Calendar</string>
+    <string name="custom_date_gesture">Custom Calendar</string>
+    <string name="set_calendar_app">Set Calendar App</string>
+
+    <string name="weather">Weather</string>
+    <string name="gps_location">GPS Location</string>
+    <string name="latest_location">Latest GPS location</string>
+    <string name="set_manual_location">Set Manual Location</string>
+    <string name="find_your_city">"Search for Your City"</string>
+    <string name="units">Units</string>
+
+    <string name="shortcuts">Shortcuts</string>
+    <string name="number_of_shortcuts">Number of Shortcuts</string>
+    <string name="horizontal_alignment">Horizontal Alignment</string>
+    <string name="vertical_alignment">Vertical Alignment</string>
+    <string name="shortcut_size">Shortcut Size</string>
+    <string name="shortcut_spacing">Shortcut Spacing</string>
+
+    <string name="gestures">Gestures</string>
+    <string name="swipe_left">Swipe Left</string>
+    <string name="left_swipe_app">Left Swipe App</string>
+    <string name="swipe_right">Swipe Right</string>
+    <string name="right_swipe_app">Right Swipe App</string>
+    <string name="double_tap_to_lock_screen">Double Tap to Lock Screen</string>
+
     <string name="app_settings_title">App Menu Settings</string>
     <string name="app_settings_text">App Menu</string>
     <string name="app_settings_summary">Configure the application menu</string>
+
+    <string name="apps">Apps</string>
+    <string name="app_alignment">App Alignment</string>
+    <string name="app_size">App Size</string>
+    <string name="app_spacing">App Spacing</string>
+    <string name="contacts_menu">Contacts Menu</string>
+    <string name="permission_denied">Permission Denied</string>
+
+    <string name="search_text">Search</string>
+    <string name="enable_search">Enable Search</string>
+    <string name="search_alignment">Search Alignment</string>
+    <string name="search_size">Search Size</string>
+    <string name="automatically_open_keyboard">Automatically Open Keyboard</string>
+    <string name="automatic_app_opening">Automatic App Opening</string>
+    <string name="auto_launch_summary">Automatically launch an app when it\'s the last search result</string>
+
     <string name="hidden_apps_title">Hidden Apps</string>
     <string name="hidden_apps_text">Manage Hidden Apps</string>
     <string name="hidden_apps_summary">Unhide Apps</string>
-    <string name="about">About</string>
-    <string name="reset">Reset</string>
-    <string name="restart_text">Restart YAM Launcher</string>
-    <string name="reset_text">Reset All Settings</string>
-    <string name="reset_confirm_text">You will lose ALL changes that you have made to the launcher settings, shortcuts, hidden apps, etc.\n\nAre you sure?</string>
-    <string name="backup_restore">Backup and Restore</string>
-    <string name="backup">Backup</string>
-    <string name="backup_summary">Backup your settings</string>
-    <string name="restore">Restore</string>
-    <string name="restore_summary">Restore a backup</string>
-    <string name="backup_success">Backup successful :)</string>
-    <string name="backup_fail">Backup failed :(</string>
-    <string name="restore_success">Restore successful :)</string>
-    <string name="restore_fail">Restore failed :( (corrupt file?)</string>
-    <string name="restore_wrong_app">Not a YAM Launcher backup</string>
-    <string name="restore_error">Failed to read file</string>
-    <string name="permission_denied">Permission Denied</string>
+    <string name="hidden_confirm_text">Are you sure you want to unhide</string>
 
+    <string name="about">About</string>
     <!--About Page Items-->
     <string name="about_title">About YAM Launcher</string>
     <string name="app_icon">App Icon</string>
@@ -92,7 +142,6 @@
     <string name="stripe">Stripe</string>
     <string name="liberapay">Liberapay</string>
     <string name="weather_data_credit">Weather data by Open-Meteo.com\n(CC BY 4.0)</string>
-
     <!--About page links-->
     <string name="my_website_link"><![CDATA[by <a href="https://ottop.eu">Otto Petäjä</a>]]></string>
     <string name="codeberg_link"><![CDATA[<a href="https://codeberg.org/ottoptj/yamlauncher">Codeberg</a>]]></string>
@@ -101,63 +150,29 @@
     <string name="stripe_link"><![CDATA[<a href="https://donate.stripe.com/14k6s2bMJdnDgtW288">Stripe</a><br>(one-time)]]></string>
     <string name="weather_link"><![CDATA[Weather data by <a href="https://open-meteo.com/">Open-Meteo.com</a><br>(<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>)]]></string>
 
+    <string name="reset">Reset</string>
+    <string name="restart_text">Restart YAM Launcher</string>
+    <string name="reset_text">Reset All Settings</string>
+    <string name="reset_confirm_text">You will lose ALL changes that you have made to the launcher settings, shortcuts, hidden apps, etc.\n\nAre you sure?</string>
+
+    <string name="backup_restore">Backup and Restore</string>
+    <string name="backup">Backup</string>
+    <string name="backup_summary">Backup your settings</string>
+    <string name="restore">Restore</string>
+    <string name="restore_summary">Restore a backup</string>
+    <string name="backup_success">Backup successful :)</string>
+    <string name="backup_fail">Backup failed :(</string>
+    <string name="restore_success">Restore successful :)</string>
+    <string name="restore_fail">Restore failed :( (corrupt file?)</string>
+    <string name="restore_wrong_app">Not a YAM Launcher backup</string>
+    <string name="restore_error">Failed to read file</string>
+
     <!--Location Selector Items-->
     <string name="location_link"><![CDATA[Location data by <a href="https://open-meteo.com/">Open-Meteo.com</a> (<a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>)]]></string>
     <string name="region_text">%1$s%2$s</string>
 
-    <string name="latest_location">Latest GPS location</string>
-
+    <!--Double tap to lock-->
     <string name="screenlock_confirmation">To lock with double tap, enable YAM Launcher in accessibility settings.</string>
     <string name="accessibility_service_description">The permission is required for double tap to work for locking the screen.\n\nIt is only needed if you want to use the double tap to lock screen feature in YAM Launcher.</string>
-    <string name="background_color">Background Color</string>
-    <string name="text_color">Text Color</string>
-    <string name="text_font">Text Font</string>
-    <string name="text_style">Text Style</string>
-    <string name="animation_speed">Animation Speed</string>
-    <string name="swipe_threshold">Swipe Threshold</string>
-    <string name="operation">Operation</string>
-    <string name="swipe_velocity_threshold">Swipe Velocity Threshold</string>
-    <string name="show_status_bar">Show Status Bar</string>
-    <string name="apps">Apps</string>
-    <string name="app_alignment">App Alignment</string>
-    <string name="app_size">App Size</string>
-    <string name="app_spacing">App Spacing</string>
-    <string name="contacts_menu">Contacts Menu</string>
-    <string name="search_text">Search</string>
-    <string name="enable_search">Enable Search</string>
-    <string name="search_alignment">Search Alignment</string>
-    <string name="search_size">Search Size</string>
-    <string name="automatically_open_keyboard">Automatically Open Keyboard</string>
-    <string name="automatic_app_opening">Automatic App Opening</string>
-    <string name="auto_launch_summary">Automatically launch an app when it\'s the last search result</string>
-    <string name="clock">Clock</string>
-    <string name="show_clock">Show Clock</string>
-    <string name="clock_alignment">Clock Alignment</string>
-    <string name="clock_size">Clock Size</string>
-    <string name="clicking_time_opens_clock">Clicking Time Opens Clock</string>
-    <string name="custom_clock_gesture">Custom Clock</string>
-    <string name="set_clock_app">Set Clock App</string>
-    <string name="date">Date</string>
-    <string name="show_date">Show Date</string>
-    <string name="date_size">Date Size</string>
-    <string name="battery_indicator">Battery Indicator</string>
-    <string name="clicking_date_opens_calendar">Clicking Date Opens Calendar</string>
-    <string name="custom_date_gesture">Custom Calendar</string>
-    <string name="set_calendar_app">Set Calendar App</string>
-    <string name="weather">Weather</string>
-    <string name="gps_location">GPS Location</string>
-    <string name="set_manual_location">Set Manual Location</string>
-    <string name="units">Units</string>
-    <string name="shortcuts">Shortcuts</string>
-    <string name="number_of_shortcuts">Number of Shortcuts</string>
-    <string name="horizontal_alignment">Horizontal Alignment</string>
-    <string name="vertical_alignment">Vertical Alignment</string>
-    <string name="shortcut_size">Shortcut Size</string>
-    <string name="shortcut_spacing">Shortcut Spacing</string>
-    <string name="gestures">Gestures</string>
-    <string name="swipe_left">Swipe Left</string>
-    <string name="left_swipe_app">Left Swipe App</string>
-    <string name="swipe_right">Swipe Right</string>
-    <string name="right_swipe_app">Right Swipe App</string>
-    <string name="double_tap_to_lock_screen">Double Tap to Lock Screen</string>
+
 </resources>
\ No newline at end of file