diff --git a/common/src/main/assets/lang/en_US.json b/common/src/main/assets/lang/en_US.json
index 6c657a9f..e9c7aca6 100644
--- a/common/src/main/assets/lang/en_US.json
+++ b/common/src/main/assets/lang/en_US.json
@@ -830,90 +830,7 @@
             "ban_risk": "\u26a0 This feature may cause bans",
             "internal_behavior": "\u26a0 This may break Snapchat internal behavior"
         },
-        "options": {
-            "empty": "Empty",
-            "walk_radius": {
-                "empty": "Empty"
-            },
-            "spoof_battery_level": {
-                "empty": "Empty"
-            },
-            "custom_android_id": {
-                "empty": "Empty"
-            },
-            "custom_streaks_expiration_format": {
-                "empty": "Empty"
-            },
-            "preferred_transcription_lang": {
-                "empty": "Empty"
-            },
-            "custom_emoji_font": {
-                "empty": "Empty"
-            },
-            "custom_shared_library": {
-                "empty": "Empty"
-            },
-            "custom_resolution": {
-                "empty": "Empty"
-            },
-            "custom_path_format": {
-                "empty": "Empty"
-            },
-            "custom_video_codec": {
-                "empty": "Empty"
-            },
-            "custom_audio_codec": {
-                "empty": "Empty"
-            },
-            "double_tap_chat_action_custom_emoji": {
-                "empty": "Empty"
-            },
-            "unsaveable_messages": {
-                "blacklist": "Blacklist mode",
-                "whitelist": "Whitelist mode",
-                "null": "Disabled"
-            },
-            "update_check_frequency": {
-                "daily": "Daily",
-                "weekly": "Weekly",
-                "monthly": "Monthly"
-            }
-        },
         "properties": {
-            "global": {
-                "name": "Global",
-                "description": "General module preferences and defaults",
-                "properties": {
-                    "ui_settings": {
-                        "name": "UI Settings",
-                        "description": "Tune feedback and toast behavior",
-                        "properties": {
-                            "haptic_feedback": {
-                                "name": "Haptic Feedback",
-                                "description": "Vibrate on supported interactions"
-                            },
-                            "use_system_toasts": {
-                                "name": "Use System Toasts",
-                                "description": "Show Android toasts instead of in-app overlays"
-                            }
-                        }
-                    },
-                    "update_settings": {
-                        "name": "Update Settings",
-                        "description": "Control automatic update checks",
-                        "properties": {
-                            "auto_update_check": {
-                                "name": "Auto Update Check",
-                                "description": "Check for new builds automatically"
-                            },
-                            "update_check_frequency": {
-                                "name": "Update Check Frequency",
-                                "description": "How often to check for updates"
-                            }
-                        }
-                    }
-                }
-            },
             "downloader": {
                 "name": "Downloader",
                 "description": "Download Snapchat Media",
@@ -1675,6 +1592,34 @@
                 "name": "Global",
                 "description": "Tweak Global Snapchat Settings",
                 "properties": {
+                    "ui_settings": {
+                        "name": "UI Settings",
+                        "description": "Tune feedback and toast behavior",
+                        "properties": {
+                            "haptic_feedback": {
+                                "name": "Haptic Feedback",
+                                "description": "Vibrate on supported interactions"
+                            },
+                            "use_system_toasts": {
+                                "name": "Use System Toasts",
+                                "description": "Show Android toasts instead of in-app overlays"
+                            }
+                        }
+                    },
+                    "update_settings": {
+                        "name": "Update Settings",
+                        "description": "Control automatic update checks",
+                        "properties": {
+                            "auto_update_check": {
+                                "name": "Auto Update Check",
+                                "description": "Check for new builds automatically"
+                            },
+                            "update_check_frequency": {
+                                "name": "Update Check Frequency",
+                                "description": "How often to check for updates"
+                            }
+                        }
+                    },
                     "better_location": {
                         "name": "Better Location",
                         "description": "Enhances the Snapchat Location",
@@ -1710,6 +1655,14 @@
                             "show_battery_level": {
                                 "name": "Show Battery Level",
                                 "description": "Shows the battery level of your friends on the map"
+                            },
+                            "location_search_provider": {
+                                "name": "Location Search Provider",
+                                "description": "Choose the provider for searching locations"
+                            },
+                            "google_maps_api_key": {
+                                "name": "Google Maps API Key",
+                                "description": "Required if using Google Maps provider"
                             }
                         }
                     },
@@ -2190,6 +2143,16 @@
             }
         },
         "options": {
+            "empty": "Empty",
+            "location_search_provider": {
+                "osm": "OpenStreetMap (Free)",
+                "google_maps": "Google Maps"
+            },
+            "unsaveable_messages": {
+                "blacklist": "Blacklist mode",
+                "whitelist": "Whitelist mode",
+                "null": "Disabled"
+            },
             "app_appearance": {
                 "always_light": "Always Light",
                 "always_dark": "Always Dark",
@@ -2447,6 +2410,9 @@
                 "null": "Automatic"
             },
             "update_check_frequency": {
+                "daily": "Daily",
+                "weekly": "Weekly",
+                "monthly": "Monthly",
                 "null": "Auto"
             },
             "snapchat_plus": {