diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index efc60c5a..6c11ceaa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,8 +22,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="55942"
-    android:versionName="55942-elys">
+    android:versionCode="55943"
+    android:versionName="55943-elys">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
diff --git a/app/src/main/res/layout/activity_settings_color_palette_editor.xml b/app/src/main/res/layout/activity_settings_color_palette_editor.xml
index d1c1112e..6d457d59 100644
--- a/app/src/main/res/layout/activity_settings_color_palette_editor.xml
+++ b/app/src/main/res/layout/activity_settings_color_palette_editor.xml
@@ -18,33 +18,121 @@
 
  -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
+<!--    xmlns:app="http://schemas.android.com/apk/res-auto"-->
+<!--    android:id="@+id/main_content"-->
+<!--    android:fitsSystemWindows="true"-->
+<!--    android:background="?attr/colorPrimary"-->
+<!--    android:layout_width="match_parent"-->
+<!--    android:layout_height="match_parent">-->
+
+<!--    <RelativeLayout-->
+<!--        android:id="@+id/rl"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent">-->
+
+<!--        <include layout="@layout/widget_toolbar_bottom" />-->
+
+<!--        <LinearLayout-->
+<!--            android:layout_width="fill_parent"-->
+<!--            android:layout_height="fill_parent"-->
+<!--            android:layout_above="@id/toolbar_bottom"-->
+<!--            android:orientation="vertical">-->
+
+<!--            <include layout="@layout/widget_toolbar_top" />-->
+
+<!--            <ScrollView-->
+<!--                android:background="?attr/popupMenuBackground"-->
+<!--                android:layout_width="fill_parent"-->
+<!--                android:layout_height="fill_parent"-->
+<!--                android:scrollbars="none">-->
+
+<!--                <LinearLayout-->
+<!--                    android:id="@+id/ll"-->
+<!--                    android:layout_width="fill_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:orientation="vertical"-->
+<!--                    android:padding="@dimen/padding_ll">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv1"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_gravity="center">-->
+
+<!--                        <LinearLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:orientation="vertical">-->
+
+<!--                            <EditText-->
+<!--                                android:id="@+id/palTitle"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:hint="@string/name"-->
+<!--                                android:inputType="text"-->
+<!--                                android:textSize="18sp"-->
+<!--                                android:importantForAutofill="no" />-->
+
+<!--                            <EditText-->
+<!--                                android:id="@+id/palContent"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:hint="@string/color_palette"-->
+<!--                                android:inputType="textMultiLine"-->
+<!--                                android:textSize="@dimen/list_item_text"-->
+<!--                                android:importantForAutofill="no" />-->
+
+<!--                        </LinearLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                </LinearLayout>-->
+<!--            </ScrollView>-->
+<!--        </LinearLayout>-->
+<!--    </RelativeLayout>-->
+
+<!--    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton-->
+<!--        android:id="@+id/fab"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_margin="28dp"-->
+<!--        app:elevation="@dimen/fab_elevation"-->
+<!--        app:layout_anchor="@id/rl"-->
+<!--        app:layout_anchorGravity="bottom|center"-->
+<!--        app:pressedTranslationZ="@dimen/fab_elevation_pressed"-->
+<!--        app:srcCompat="@drawable/ic_done_24dp"-->
+<!--        android:contentDescription="@string/done" />-->
+<!--</androidx.coordinatorlayout.widget.CoordinatorLayout>-->
+
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main_content"
-    android:fitsSystemWindows="true"
-    android:background="?attr/colorPrimary"
+    android:id="@+id/rl"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true">
 
-    <RelativeLayout
-        android:id="@+id/rl"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <include layout="@layout/widget_toolbar_bottom" />
 
-        <include layout="@layout/widget_toolbar_bottom" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/toolbar_bottom"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_above="@id/toolbar_bottom"
-            android:orientation="vertical">
+        <include layout="@layout/widget_toolbar_top" />
 
-            <include layout="@layout/widget_toolbar_top" />
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/main_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
             <ScrollView
-                android:background="?attr/popupMenuBackground"
+                android:id="@+id/scrollView"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
+                android:background="?attr/popupMenuBackground"
                 android:scrollbars="none">
 
                 <LinearLayout
@@ -70,36 +158,36 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:hint="@string/name"
+                                android:importantForAutofill="no"
                                 android:inputType="text"
-                                android:textSize="18sp"
-                                android:importantForAutofill="no" />
+                                android:textSize="18sp" />
 
                             <EditText
                                 android:id="@+id/palContent"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:hint="@string/color_palette"
+                                android:importantForAutofill="no"
                                 android:inputType="textMultiLine"
-                                android:textSize="@dimen/list_item_text"
-                                android:importantForAutofill="no" />
+                                android:textSize="@dimen/list_item_text" />
 
                         </LinearLayout>
                     </androidx.cardview.widget.CardView>
 
                 </LinearLayout>
             </ScrollView>
-        </LinearLayout>
-    </RelativeLayout>
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="28dp"
-        app:elevation="@dimen/fab_elevation"
-        app:layout_anchor="@id/rl"
-        app:layout_anchorGravity="bottom|center"
-        app:pressedTranslationZ="@dimen/fab_elevation_pressed"
-        app:srcCompat="@drawable/ic_done_24dp"
-        android:contentDescription="@string/done" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+            <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+                android:id="@+id/fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:contentDescription="@string/done"
+                app:elevation="@dimen/fab_elevation"
+                app:layout_anchor="@id/scrollView"
+                app:layout_anchorGravity="bottom|center"
+                app:pressedTranslationZ="@dimen/fab_elevation_pressed"
+                app:srcCompat="@drawable/ic_done_24dp" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_settings_location_generic.xml b/app/src/main/res/layout/activity_settings_location_generic.xml
index d42f2bd1..218853b8 100644
--- a/app/src/main/res/layout/activity_settings_location_generic.xml
+++ b/app/src/main/res/layout/activity_settings_location_generic.xml
@@ -18,31 +18,139 @@
 
  -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
+<!--    xmlns:app="http://schemas.android.com/apk/res-auto"-->
+<!--    android:id="@+id/main_content"-->
+<!--    android:fitsSystemWindows="true"-->
+<!--    android:layout_width="match_parent"-->
+<!--    android:layout_height="match_parent"-->
+<!--    android:background="?attr/colorPrimary">-->
+
+<!--    <RelativeLayout-->
+<!--        android:id="@+id/rl"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent">-->
+
+<!--        <include layout="@layout/widget_toolbar_bottom" />-->
+
+<!--        <LinearLayout-->
+<!--            android:background="?attr/popupMenuBackground"-->
+<!--            android:layout_width="fill_parent"-->
+<!--            android:layout_height="fill_parent"-->
+<!--            android:layout_above="@id/toolbar_bottom"-->
+<!--            android:orientation="vertical">-->
+
+<!--            <include layout="@layout/widget_toolbar_top" />-->
+
+<!--            <ScrollView-->
+<!--                android:layout_width="fill_parent"-->
+<!--                android:layout_height="fill_parent"-->
+<!--                android:scrollbars="none">-->
+
+<!--                <LinearLayout-->
+<!--                    android:id="@+id/linearLayout"-->
+<!--                    android:layout_width="fill_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:orientation="vertical"-->
+<!--                    android:padding="@dimen/padding_ll">-->
+
+<!--                    <androidx.cardview.widget.CardView-->
+<!--                        android:id="@+id/cv1"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:layout_gravity="center">-->
+
+<!--                        <LinearLayout-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:orientation="vertical">-->
+
+<!--                            <EditText-->
+<!--                                android:id="@+id/locLabelEt"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:hint="@string/name_of_location"-->
+<!--                                android:inputType="text"-->
+<!--                                android:textSize="18sp"-->
+<!--                                android:importantForAutofill="no" />-->
+
+<!--                            <EditText-->
+<!--                                android:id="@+id/locXEt"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:hint="@string/latitude_you_are_not_required_to_enter"-->
+<!--                                android:inputType="text"-->
+<!--                                android:textSize="18sp"-->
+<!--                                android:importantForAutofill="no" />-->
+
+<!--                            <EditText-->
+<!--                                android:id="@+id/locYEt"-->
+<!--                                android:layout_width="match_parent"-->
+<!--                                android:layout_height="match_parent"-->
+<!--                                android:hint="@string/longitude_you_are_not_required_to_enter"-->
+<!--                                android:inputType="text"-->
+<!--                                android:textSize="18sp"-->
+<!--                                android:importantForAutofill="no" />-->
+<!--                        </LinearLayout>-->
+<!--                    </androidx.cardview.widget.CardView>-->
+
+<!--                    <androidx.appcompat.widget.AppCompatTextView-->
+<!--                        android:id="@+id/notif_text"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:text="@string/notifications"-->
+<!--                        android:textSize="@dimen/large_text" />-->
+
+<!--                    <androidx.appcompat.widget.AppCompatTextView-->
+<!--                        android:id="@+id/notif_text_perm"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="match_parent"-->
+<!--                        android:text="@string/androidNotificationWarning" />-->
+<!--                </LinearLayout>-->
+<!--            </ScrollView>-->
+<!--        </LinearLayout>-->
+<!--    </RelativeLayout>-->
+
+<!--    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton-->
+<!--        android:id="@+id/fab"-->
+<!--        android:layout_width="wrap_content"-->
+<!--        android:layout_height="wrap_content"-->
+<!--        android:layout_margin="36dp"-->
+<!--        app:elevation="@dimen/fab_elevation"-->
+<!--        app:layout_anchor="@id/rl"-->
+<!--        app:layout_anchorGravity="bottom|center"-->
+<!--        app:pressedTranslationZ="@dimen/fab_elevation_pressed"-->
+<!--        app:srcCompat="@drawable/ic_done_24dp"-->
+<!--        android:contentDescription="@string/save" />-->
+<!--</androidx.coordinatorlayout.widget.CoordinatorLayout>-->
+
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/main_content"
-    android:fitsSystemWindows="true"
+    android:id="@+id/rl"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimary">
+    android:background="?attr/colorPrimary"
+    android:fitsSystemWindows="true">
 
-    <RelativeLayout
-        android:id="@+id/rl"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <include layout="@layout/widget_toolbar_bottom" />
 
-        <include layout="@layout/widget_toolbar_bottom" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_above="@id/toolbar_bottom"
+        android:background="?attr/popupMenuBackground"
+        android:orientation="vertical">
 
-        <LinearLayout
-            android:background="?attr/popupMenuBackground"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_above="@id/toolbar_bottom"
-            android:orientation="vertical">
+        <include layout="@layout/widget_toolbar_top" />
 
-            <include layout="@layout/widget_toolbar_top" />
+        <androidx.coordinatorlayout.widget.CoordinatorLayout
+            android:id="@+id/main_content"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
             <ScrollView
+                android:id="@+id/scrollView"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:scrollbars="none">
@@ -70,27 +178,27 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:hint="@string/name_of_location"
+                                android:importantForAutofill="no"
                                 android:inputType="text"
-                                android:textSize="18sp"
-                                android:importantForAutofill="no" />
+                                android:textSize="18sp" />
 
                             <EditText
                                 android:id="@+id/locXEt"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:hint="@string/latitude_you_are_not_required_to_enter"
+                                android:importantForAutofill="no"
                                 android:inputType="text"
-                                android:textSize="18sp"
-                                android:importantForAutofill="no" />
+                                android:textSize="18sp" />
 
                             <EditText
                                 android:id="@+id/locYEt"
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent"
                                 android:hint="@string/longitude_you_are_not_required_to_enter"
+                                android:importantForAutofill="no"
                                 android:inputType="text"
-                                android:textSize="18sp"
-                                android:importantForAutofill="no" />
+                                android:textSize="18sp" />
                         </LinearLayout>
                     </androidx.cardview.widget.CardView>
 
@@ -108,18 +216,18 @@
                         android:text="@string/androidNotificationWarning" />
                 </LinearLayout>
             </ScrollView>
-        </LinearLayout>
-    </RelativeLayout>
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="36dp"
-        app:elevation="@dimen/fab_elevation"
-        app:layout_anchor="@id/rl"
-        app:layout_anchorGravity="bottom|center"
-        app:pressedTranslationZ="@dimen/fab_elevation_pressed"
-        app:srcCompat="@drawable/ic_done_24dp"
-        android:contentDescription="@string/save" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+            <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+                android:id="@+id/fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10dp"
+                android:contentDescription="@string/save"
+                app:elevation="@dimen/fab_elevation"
+                app:layout_anchor="@id/scrollView"
+                app:layout_anchorGravity="bottom|center"
+                app:pressedTranslationZ="@dimen/fab_elevation_pressed"
+                app:srcCompat="@drawable/ic_done_24dp" />
+        </androidx.coordinatorlayout.widget.CoordinatorLayout>
+    </LinearLayout>
+</RelativeLayout>
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
index 45e736d7..4b5a9da9 100644
--- a/doc/ChangeLog.md
+++ b/doc/ChangeLog.md
@@ -2,9 +2,14 @@
 
 # Developer ChangeLog
 
+## 55943 2025_02_04
+
+* [ADD]
+
 ## 55942 2025_02_04
 
-* [FIX]
+* [FIX] activity_settings_location_generic.xml and activity_settings_color_palette_editor.xml were
+  overlapping when gesture capable
 
 ## 55941 2025_02_04
 
diff --git a/doc/ChangeLog_User.md b/doc/ChangeLog_User.md
index d8ae09ca..78d0d18a 100644
--- a/doc/ChangeLog_User.md
+++ b/doc/ChangeLog_User.md
@@ -8,6 +8,36 @@ Please also
 review [Upcoming changes](https://gitlab.com/joshua.tee/wxl23/-/blob/master/doc/UPCOMING_CHANGES.md)
 impacting all or some users.
 
+## 55942 2025_02_05 (BETA)
+
+* [FIX] statusbar background was inconsistent across many activities
+* [FIX] Main button (lower right) on main screen and location add screen was not properly aligned in
+  certain situations
+* [ADD] In National Images remove "experimental" from the label for "Week 3-4 Outlooks -
+  Temperature" and "Week 3-4 Outlooks - Precipitation" per *SCN24-104: The Experimental Weeks 3-4
+  Precipitation Outlooks Will Become Operational on or about January 17, 2025*
+* [ADD] "Prognostic Discussion for Week 3-4 Temperature and Precipitation Outlooks" in National Text
+  Product Screen under **General Forecast Discussions**
+* [ADD] NWS has discontinued the following per SCN24-108: Termination of the 72-Hour Low Tracks
+  Graphic and the Non-Technical 72-Hour Low Tracks Graphic to be Replaced by Automated Low Clusters
+  Forecast Tool: Effective January 20, 2025 , remove from National Images
+* [FIX] In National Graphics the URL for **GLSEA Ice Analysis** had changed
+* [ADD] In Nexrad "long press" (press and hold), add Observation(Metar) site name next to the
+  station code
+* [ADD] On homescreen if "Weather Story" is configured and you tap on it image is opened up in
+  dedicated image viewer allowing you to share the image or zoom in with the full screen.
+* [ADD] Similar to SPC Convective Outlook outlines as a preference in Nexrad Radar, make SPC Fire
+  Weather Outlook outlines available as well (BETA - no dry thunderstorm support yet)
+* [ADD] Better "Weather Story" handling for image in homescreen (if configured and if your WFO
+  offers it or something similar)
+* [ADD] geographic boundaries for Guam and the Commonwealth of the Northern Mariana Islands (CNMI) (
+  required float size change in CanvasMain.kt and RadarGeomInfo.kt). NOTE: most functions do not
+  work for Guam/CNMI due to insufficient LAT/LON adjustment, it's a WIP
+* [ADD] geographic boundaries for US Virgin Islands and American Samoa
+* [ADD] long press in nexrad will now show best vis sat image for Hawaii and areas around Puerto
+  Rico
+* [ADD] add Metars for Puerto Rico and US Virgin Islands
+
 ## 55925 2025_01_04
 
 * [ADD] In hourly, abbreviate "Drizzle" to "Dz"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5d95dcf3..cbcd389d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+#distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip