diff --git a/.github/workflows/spotube-nightly.yml b/.github/workflows/spotube-nightly.yml
index 0ef18b84..b3e23f95 100644
--- a/.github/workflows/spotube-nightly.yml
+++ b/.github/workflows/spotube-nightly.yml
@@ -50,17 +50,16 @@ jobs:
       - run: |
           sudo apt-get update -y
           sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse
-      - run: |
-          flutter pub get
-          dart bin/create-secrets.dart '${{ secrets.LYRICS_SECRET }}' '${{ secrets.SPOTIFY_SECRET }}'
-          dart pub global activate flutter_distributor
-          flutter_distributor package --platform=android --targets=apk --skip-clean
-      - run: |
-          mv dist/**/spotube-*-android.apk dist/Spotube-android-all-arch.apk
-      - uses: actions/upload-artifact@v3
+
+      - run: echo '${{ secrets.KEYSTORE }}' | base64 --decode > android/app/upload-keystore.jks
+      - run: echo '${{ secrets.KEY_PROPERTIES }}' > android/key.properties
+      - run: flutter build apk
+      - run: make apk
+      - uses: actions/upload-artifact@v2
         with:
           name: Spotube-Android-Bundle
-          path: dist/
+          path: |
+            build/Spotube-android-all-arch.apk
 
   build_windows:
     runs-on: windows-latest
diff --git a/.github/workflows/spotube-release.yml b/.github/workflows/spotube-release.yml
index 1951583c..06d33737 100644
--- a/.github/workflows/spotube-release.yml
+++ b/.github/workflows/spotube-release.yml
@@ -46,8 +46,8 @@ jobs:
           Set-Variable -Name HASH -Value (Get-FileHash dist\Spotube-windows-x86_64-setup.exe).Hash
           sed -i "s/%{{WIN_SHA256}}%/$HASH/" choco-struct/tools/VERIFICATION.txt
           make choco
-      
-      - run: mv dist/spotube.*.nupkg dist/Spotube-windows-x86_64.nupkg 
+
+      - run: mv dist/spotube.*.nupkg dist/Spotube-windows-x86_64.nupkg
 
       # Publish to Chocolatey Repository
       - run: |
@@ -145,17 +145,16 @@ jobs:
       - run: |
           sudo apt-get update -y
           sudo apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev make python3-pip python3-setuptools patchelf desktop-file-utils libgdk-pixbuf2.0-dev fakeroot strace fuse
-      - run: |
-          flutter pub get
-          dart bin/create-secrets.dart '${{ secrets.LYRICS_SECRET }}' '${{ secrets.SPOTIFY_SECRET }}'
-          dart pub global activate flutter_distributor
-          flutter_distributor package --platform=android --targets=apk --skip-clean
-      - run: |
-          mv dist/**/spotube-*-android.apk dist/Spotube-android-all-arch.apk
-      - uses: actions/upload-artifact@v3
+
+      - run: echo '${{ secrets.KEYSTORE }}' | base64 --decode > android/app/upload-keystore.jks
+      - run: echo '${{ secrets.KEY_PROPERTIES }}' > android/key.properties
+      - run: flutter build apk
+      - run: make apk
+      - uses: actions/upload-artifact@v2
         with:
           name: Spotube-Android-Bundle
-          path: dist/
+          path: |
+            build/Spotube-android-all-arch.apk
 
   update_release:
     needs:
diff --git a/pubspec.lock b/pubspec.lock
index fd237e39..af68e4b4 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -828,6 +828,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
+  resizable_widget:
+    dependency: "direct main"
+    description:
+      name: resizable_widget
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.5"
   riverpod:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 4c4b00ab..ac400e50 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -63,6 +63,7 @@ dependencies:
   hive_flutter: ^1.1.0
   dbus: ^0.7.3
   audioplayers: ^1.0.1
+  resizable_widget: ^1.0.5
 
 dev_dependencies:
   flutter_test: