diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ac4840a78..fa27093b1f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,6 +58,7 @@ jobs:
           LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
 
       - name: Sign APK
+        if: ${{ secrets.KEYSTORE != '' }}
         uses: ilharp/sign-android-release@v2.0.0
         with:
           releaseDir: app/build/outputs/apk/universal${{ matrix.variant == 'foss' && 'Foss' || 'Gms' }}/release/
@@ -67,7 +68,7 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           buildToolsVersion: 35.0.0
 
-      - name: Move signed APK
+      - name: Move APK
         run: |
           OUTPUT_DIR="app/build/outputs/apk/universal${{ matrix.variant == 'foss' && 'Foss' || 'Gms' }}/release"
           mkdir -p "$OUTPUT_DIR/out"
@@ -76,9 +77,27 @@ jobs:
           else
             TARGET_NAME="app-universal-release.apk"
           fi
-          find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | xargs -I{} mv {} "$OUTPUT_DIR/out/$TARGET_NAME"
 
-      - name: Upload Signed APK
+          # Try to find signed APK first
+          SIGNED_APK=$(find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | head -n 1)
+
+          if [ -n "$SIGNED_APK" ]; then
+            echo "Found signed APK: $SIGNED_APK"
+            mv "$SIGNED_APK" "$OUTPUT_DIR/out/$TARGET_NAME"
+          else
+            # Fallback to unsigned APK
+            UNSIGNED_APK=$(find "$OUTPUT_DIR" -name "*-unsigned.apk" | head -n 1)
+            if [ -n "$UNSIGNED_APK" ]; then
+              echo "Found unsigned APK: $UNSIGNED_APK"
+              mv "$UNSIGNED_APK" "$OUTPUT_DIR/out/$TARGET_NAME"
+            else
+              echo "No APK found to move!"
+              ls -R "$OUTPUT_DIR"
+              exit 1
+            fi
+          fi
+
+      - name: Upload APK
         uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.variant == 'gms' && 'app-universal-with-Google-Cast' || 'app-universal-release' }}
diff --git a/.github/workflows/build_quick.yml b/.github/workflows/build_quick.yml
index 930c060806..9969eeb37a 100644
--- a/.github/workflows/build_quick.yml
+++ b/.github/workflows/build_quick.yml
@@ -57,6 +57,7 @@ jobs:
           LASTFM_SECRET: ${{ secrets.LASTFM_SECRET }}
 
       - name: Sign APK
+        if: ${{ secrets.KEYSTORE != '' }}
         uses: ilharp/sign-android-release@v2.0.0
         with:
           releaseDir: app/build/outputs/apk/universalFoss/release/
@@ -66,13 +67,31 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
           buildToolsVersion: 35.0.0
 
-      - name: Move signed APK
+      - name: Move APK
         run: |
           OUTPUT_DIR="app/build/outputs/apk/universalFoss/release"
           mkdir -p "$OUTPUT_DIR/out"
-          find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | xargs -I{} mv {} "$OUTPUT_DIR/out/app-universal-test-release.apk"
 
-      - name: Upload Signed APK
+          # Try to find signed APK first
+          SIGNED_APK=$(find "$OUTPUT_DIR" -name "*-signed.apk" -o -name "*-unsigned-signed.apk" | head -n 1)
+
+          if [ -n "$SIGNED_APK" ]; then
+            echo "Found signed APK: $SIGNED_APK"
+            mv "$SIGNED_APK" "$OUTPUT_DIR/out/app-universal-test-release.apk"
+          else
+            # Fallback to unsigned APK
+            UNSIGNED_APK=$(find "$OUTPUT_DIR" -name "*-unsigned.apk" | head -n 1)
+            if [ -n "$UNSIGNED_APK" ]; then
+              echo "Found unsigned APK: $UNSIGNED_APK"
+              mv "$UNSIGNED_APK" "$OUTPUT_DIR/out/app-universal-test-release.apk"
+            else
+              echo "No APK found to move!"
+              ls -R "$OUTPUT_DIR"
+              exit 1
+            fi
+          fi
+
+      - name: Upload APK
         uses: actions/upload-artifact@v6
         with:
           name: app-universal-test-release
diff --git a/app/src/main/kotlin/com/metrolist/music/ui/theme/Theme.kt b/app/src/main/kotlin/com/metrolist/music/ui/theme/Theme.kt
index 4017f9d9e4..a1eaa88828 100644
--- a/app/src/main/kotlin/com/metrolist/music/ui/theme/Theme.kt
+++ b/app/src/main/kotlin/com/metrolist/music/ui/theme/Theme.kt
@@ -99,7 +99,12 @@ fun Bitmap.extractGradientColors(): List<Color> {
 fun ColorScheme.pureBlack(apply: Boolean) =
     if (apply) copy(
         surface = Color.Black,
-        background = Color.Black
+        background = Color.Black,
+        surfaceContainer = Color.Black,
+        surfaceContainerLow = Color.Black,
+        surfaceContainerLowest = Color.Black,
+        surfaceContainerHigh = Color.Black,
+        surfaceContainerHighest = Color.Black,
     ) else this
 
 val ColorSaver = object : Saver<Color, Int> {