diff --git a/.github/workflows/Deploy-pages.yml b/.github/workflows/Deploy-pages.yml
deleted file mode 100644
index e894f38..0000000
--- a/.github/workflows/Deploy-pages.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# Sample workflow for building and deploying a Jekyll site to GitHub Pages
-name: Deploy GitHub Pages
-on:
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  # Build job
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Pages
-        uses: actions/configure-pages@v3
-      - name: Build with Jekyll
-        uses: actions/jekyll-build-pages@v1
-        with:
-          source: ./
-          destination: ./_site
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-
-  # Deployment job
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v2
diff --git a/.github/workflows/patch-test.yml b/.github/workflows/patch-test.yml
deleted file mode 100644
index 06a5964..0000000
--- a/.github/workflows/patch-test.yml
+++ /dev/null
@@ -1,218 +0,0 @@
-name: TEST Patch Revanced & Revanced Extended 
-on:
-  schedule:
-    - cron: "0 0 */5 * *"
-  workflow_dispatch:
-jobs:
-  patch:
-    name: Patch Revanced & Revanced Extended
-    permissions: write-all
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up jdk
-        uses: actions/setup-java@v3.10.0
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-
-      - name: Patch Youtube Revanced & Revanced Extended non-root
-        run: bash src/yt/patch.sh
-
-      - name: Patch Youtube Music Revanced & Revanced Extended non-root
-        run: bash src/ytm/patch.sh
-
-      - name: Patch Messenger Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/messenger/patch.sh  
-
-      - name: Patch Tiktok Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/tiktok/patch.sh         
-
-      - name: Patch Twitch Revanced
-        run: bash src/twitch/patch.sh
-
-      - name: Patch Twitter Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/twitter/patch.sh
-
-      - name: Patch Instagram Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/instagram/patch.sh
-
-      - name: Generate Changelog 
-        run: |
-          curl -s https://api.github.com/repos/revanced/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTRVVERSION=$(jq -r '.[] | select(.name == "video-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json)
-          rm -rf patches.json
-          
-          curl -s https://api.github.com/repos/inotia00/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTRVEVERSION=$(jq -r '.[] | select(.name == "hide-general-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json)
-          rm -rf patches.json
-          
-          curl -s https://api.github.com/repos/revanced/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTMRVVERSION=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json)
-          YTMRVEVERSION=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json)
-          rm -rf patches.json    
-          echo "[Change Log](https://github.com/revanced/revanced-patches/releases/latest)
-          **Download Below** :point_down:
-          " > ${{ github.workspace }}-CHANGELOG-rv.txt
-          echo "[Change Log](https://github.com/inotia00/revanced-patches/releases/latest)
-          **Download Below** :point_down:
-          " > ${{ github.workspace }}-CHANGELOG-rve.txt
-          echo "INFO-YT-RV=Youtube Revanced v${YTRVVERSION}" >> $GITHUB_ENV
-          echo "INFO-YT-RVE=Youtube Revanced Extended v${YTRVEVERSION}" >> $GITHUB_ENV
-          echo "INFO-YTM-RV=Youtube Music Revanced v${YTMRVVERSION}" >> $GITHUB_ENV
-          echo "INFO-YTM-RVE=Youtube Music Revanced Extended v${YTMRVEVERSION}" >> $GITHUB_ENV
-
-      - uses: vishnudxb/cancel-workflow@v1.2
-        if: failure()
-        with:
-          repo: octocat/hello-world
-          workflow_id: ${{ github.run_id }}
-          access_token: ${{ github.token }}      
-
-      - name: Delete Release
-        uses: dev-drprasad/delete-older-releases@v0.2.1
-        with:
-          repo: ${{ github.repository }}
-          keep_latest: 0
-          delete_tags: false
-        env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Music Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: ytm-revanced.apk 
-          name: ${{ env.INFO-YTM-RV }}
-          tag_name: YTM-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Music Revanced Extended
-        uses: softprops/action-gh-release@v1
-        with:
-          files: ytm-revanced-extended.apk
-          name: ${{ env.INFO-YTM-RVE }}
-          tag_name: YTM-Revanced-Extended
-          body_path: ${{ github.workspace }}-CHANGELOG-rve.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
-
-      - name: Release Youtube Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: yt-revanced.apk 
-          name: ${{ env.INFO-YT-RV }}
-          tag_name: YT-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Revanced Extended
-        uses: softprops/action-gh-release@v1
-        with:
-          files: yt-revanced-extended.apk
-          name: ${{ env.INFO-YT-RVE }}
-          tag_name: YT-Revanced-Extended
-          body_path: ${{ github.workspace }}-CHANGELOG-rve.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}            
-
-      - name: Release Tiktok Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Tiktok.apk
-          name: "Tiktok"
-          tag_name: Tiktok-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
-
-      - name: Release Twitch Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Twitch.apk
-          name: "Twitch"
-          tag_name: Twitch-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Facebook Messenger Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Messenger.apk
-          name: "Facebook Messenger"
-          tag_name: Facebook-Messenger-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Twitter Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Twitter.apk
-          name: "Twitter"
-          tag_name: Twitter-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Instagram Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Instagram.apk
-          name: "Instagram"
-          tag_name: Instagram-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Delete workflow runs
-        uses: Mattraks/delete-workflow-runs@v2
-        with:
-          token: ${{ github.token }}
-          repository: ${{ github.repository }}
-          retain_days: 0
-          keep_minimum_runs: 5                    
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index 25f23b0..e719156 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -1,9 +1,12 @@
-name: Patch Revanced & Revanced Extended 
+name: Patch Revanced 
 on:
+#  push:
+  schedule:
+    - cron: "0 */4 * * *"
   workflow_dispatch:
 jobs:
-  patch:
-    name: Patch Revanced & Revanced Extended
+  patch1:
+    name: Patch Revanced 
     permissions: write-all
     runs-on: ubuntu-latest
     steps:
@@ -14,176 +17,96 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: '17'
-
-      - name: Patch Youtube Revanced & Revanced Extended non-root
-        run: bash src/yt/patch.sh
-
-      - name: Patch Youtube Music Revanced & Revanced Extended non-root
-        run: bash src/ytm/patch.sh
-
-      - name: Patch Messenger Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/messenger/patch.sh  
-
-      - name: Patch Instagram Revanced
-        run: bash src/instagram/patch.sh
-
-      - name: Patch Tiktok Revanced
-        env:
-          GMAIL: ${{ secrets.GMAIL }}
-          PASSWORD: ${{ secrets.PASSWORD }}
-        run: |
-          echo "[google]
-          username = $GMAIL
-          password = $PASSWORD" >> ~/apkeep.ini
-          bash src/tiktok/patch.sh         
-
-      - name: Patch Twitch Revanced
-        run: bash src/twitch/patch.sh
-
-      - name: Generate Changelog 
-        run: |
-          curl -s https://api.github.com/repos/revanced/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTRVVERSION=$(jq -r '.[] | select(.name == "video-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json)
-          rm -rf patches.json
+      
+      - name: Patch apk
+        run: bash src/build/build-rv.sh  
+        
+      - name: Generate release info
+        run: | 
+          echo "
+          **Change log** :point_down:
+          [Revanced](https://github.com/revanced/revanced-patches/releases/latest)
+          [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
+          "> ${{ github.workspace }}-CHANGELOG.txt
+         
           
-          curl -s https://api.github.com/repos/inotia00/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTRVEVERSION=$(jq -r '.[] | select(.name == "hide-general-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json)
-          rm -rf patches.json
-          
-          curl -s https://api.github.com/repos/revanced/revanced-patches/releases/latest \
-          | grep "browser_download_url.*json" \
-          | cut -d : -f 2,3 \
-          | tr -d \" \
-          | wget -qi -
-          YTMRVVERSION=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json)
-          YTMRVEVERSION=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json)
-          rm -rf patches.json    
-          echo "[Change Log](https://github.com/revanced/revanced-patches/releases/latest)
-          **Download Below** :point_down:
-          " > ${{ github.workspace }}-CHANGELOG-rv.txt
-          echo "[Change Log](https://github.com/inotia00/revanced-patches/releases/latest)
-          **Download Below** :point_down:
-          " > ${{ github.workspace }}-CHANGELOG-rve.txt
-          echo "INFO-YT-RV=Youtube Revanced v${YTRVVERSION}" >> $GITHUB_ENV
-          echo "INFO-YT-RVE=Youtube Revanced Extended v${YTRVEVERSION}" >> $GITHUB_ENV
-          echo "INFO-YTM-RV=Youtube Music Revanced v${YTMRVVERSION}" >> $GITHUB_ENV
-          echo "INFO-YTM-RVE=Youtube Music Revanced Extended v${YTMRVEVERSION}" >> $GITHUB_ENV
-
-      - uses: vishnudxb/cancel-workflow@v1.2
-        if: failure()
+      - name: Release
+        uses: softprops/action-gh-release@v0.1.15
         with:
-          repo: octocat/hello-world
-          workflow_id: ${{ github.run_id }}
-          access_token: ${{ github.token }}      
+          files: |
+            ./build/*
+            revanced-version.txt
+          name: Revanced & Revanced Extended
+          tag_name: all
+          body_path: ${{ github.workspace }}-CHANGELOG.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
 
-      - name: Delete Release
+      - name: Delete older releases
         uses: dev-drprasad/delete-older-releases@v0.2.1
         with:
-          repo: ${{ github.repository }}
-          keep_latest: 0
-          delete_tags: false
-        env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Music Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: ytm-revanced.apk 
-          name: ${{ env.INFO-YTM-RV }}
-          tag_name: YTM-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
+          keep_latest: 1
+          delete_tags: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Music Revanced Extended
-        uses: softprops/action-gh-release@v1
-        with:
-          files: ytm-revanced-extended.apk
-          name: ${{ env.INFO-YTM-RVE }}
-          tag_name: YTM-Revanced-Extended
-          body_path: ${{ github.workspace }}-CHANGELOG-rve.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
-
-      - name: Release Youtube Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: yt-revanced.apk 
-          name: ${{ env.INFO-YT-RV }}
-          tag_name: YT-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Youtube Revanced Extended
-        uses: softprops/action-gh-release@v1
-        with:
-          files: yt-revanced-extended.apk
-          name: ${{ env.INFO-YT-RVE }}
-          tag_name: YT-Revanced-Extended
-          body_path: ${{ github.workspace }}-CHANGELOG-rve.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}            
-
-      - name: Release Tiktok Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Tiktok.apk
-          name: "Tiktok"
-          tag_name: Tiktok-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}    
-
-      - name: Release Twitch Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Twitch.apk
-          name: "Twitch"
-          tag_name: Twitch-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Facebook Messenger Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Messenger.apk
-          name: "Facebook Messenger"
-          tag_name: Facebook-Messenger-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release Instagram Revanced
-        uses: softprops/action-gh-release@v1
-        with:
-          files: Instagram.apk
-          name: "Instagram"
-          tag_name: Instagram-Revanced
-          body_path: ${{ github.workspace }}-CHANGELOG-rv.txt
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
+          
       - name: Delete workflow runs
         uses: Mattraks/delete-workflow-runs@v2
         with:
           token: ${{ github.token }}
           repository: ${{ github.repository }}
           retain_days: 0
-          keep_minimum_runs: 5
+          keep_minimum_runs: 10
+
+  patch2:
+    name: Patch Revanced Extended 
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up jdk
+        uses: actions/setup-java@v3.10.0
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      
+      - name: Patch apk
+        run: bash src/build/build-rve.sh  
+        
+      - name: Generate release info
+        run: | 
+          echo "
+          **Change log** :point_down:
+          [Revanced](https://github.com/revanced/revanced-patches/releases/latest)
+          [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
+          "> ${{ github.workspace }}-CHANGELOG.txt
+         
+          
+      - name: Release
+        uses: softprops/action-gh-release@v0.1.15
+        with:
+          files: |
+            ./build/*
+            revanced-extended-version.txt
+          name: Revanced & Revanced Extended
+          tag_name: all
+          body_path: ${{ github.workspace }}-CHANGELOG.txt
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}   
+
+      - name: Delete older releases
+        uses: dev-drprasad/delete-older-releases@v0.2.1
+        with:
+          keep_latest: 1
+          delete_tags: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Delete workflow runs
+        uses: Mattraks/delete-workflow-runs@v2
+        with:
+          token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          retain_days: 0
+          keep_minimum_runs: 15
diff --git a/README.md b/README.md
index 8925b22..ed27f7e 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,15 @@
 
 # Youtube:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/YT-Revanced-Extended/total?label=Revanced%20Extended&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/YT-Revanced-Extended/yt-revanced-extended.apk) 
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced%20Extended&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced-extended.apk) 
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/YT-Revanced/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/YT-Revanced/yt-revanced.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-revanced.apk)
 
 # Youtube Music:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/YTM-Revanced-Extended/total?label=Revanced%20Extended&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/YTM-Revanced-Extended/ytm-revanced-extended.apk) 
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced%20Extended&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced-extended) 
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/YTM-Revanced-Extended/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/YTM-Revanced/ytm-revanced.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/youtube-music-revanced.apk)
 
 # MicroG from inotia00 source:
 
@@ -18,20 +18,27 @@
 
 # Instagram:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Instagram-Revanced/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Instagram-Revanced/Instagram.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/instagram-revanced.apk)
 
 # Facebook Messenger:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Facebook-Messenger-Revanced/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Facebook-Messenger-Revanced/Messenger.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/messenger-revanced.apk)
 
 # TikTok:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Tiktok-Revanced/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Tiktok-Revanced/Tiktok.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/tiktok-revanced.apk)
 
 # Twitch:
 
-[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Twitch-Revanced/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Twitch-Revanced/Twitch.apk)
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/twitch-revanced.apk)
 
+# Reddit:
+
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/reddit-revanced.apk)
+
+# Windy:
+
+[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/all/total?label=Revanced&style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/all/windy-revanced.apk)
 
 # License:
 
diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh
new file mode 100644
index 0000000..6ebad8a
--- /dev/null
+++ b/src/build/build-rv.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# Revanced build
+source src/build/tools.sh
+
+release=$(curl -s "https://api.github.com/repos/revanced/revanced-patches/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+curl -sL -O "$asset"
+ls revanced-patches*.jar >> new.txt
+rm -f revanced-patches*.jar
+release=$(curl -s "https://api.github.com/repos/siritami/Revanced-And-Revanced-Extended-Non-Root/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
+curl -sL -O "$asset"
+if diff -q revanced-version.txt new.txt >/dev/null ; then
+echo "Old patch!!! Not build"
+exit 1
+else
+rm -f *.txt
+
+dl_gh "revanced" 
+
+# Patch Twitter
+#get_patches_key "twitter"
+#get_apk_with_ver "twitter" "9.86.0-release.0" "twitter-inc/twitter/twitter"
+#patch "twitter" "twitter-revanced"
+
+# Patch Windy
+get_patches_key "windy"
+get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
+patch "windy" "windy-revanced"
+
+# Patch Reddit
+get_patches_key "reddit"
+get_ver "general-reddit-ads" "com.reddit.frontpage"
+get_apk "reddit" "reddit" "redditinc/reddit/reddit"
+patch "reddit" "reddit-revanced"
+
+# Patch Instagram
+get_patches_key "instagram"
+get_apk_arch_with_ver "instagram" "271.1.0.21.84" "instagram/instagram-instagram/instagram-instagram"
+patch "instagram" "instagram-revanced"
+
+# Patch Messenger
+get_patches_key "messenger"
+get_apk_arch "messenger" "messenger" "facebook-2/messenger/messenger"
+patch "messenger" "messenger-revanced"
+
+# Patch Twitch 
+get_patches_key "twitch"
+get_ver "block-video-ads" "tv.twitch.android.app"
+get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
+patch "twitch" "twitch-revanced"
+
+# Patch Tiktok 
+get_patches_key "tiktok"
+get_ver "sim-spoof" "com.ss.android.ugc.trill"
+get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
+patch "tiktok" "tiktok-revanced"
+
+# Patch YouTube 
+get_patches_key "youtube-revanced"
+get_ver "video-ads" "com.google.android.youtube"
+get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+patch "youtube" "youtube-revanced"
+
+# Patch YouTube Music 
+get_patches_key "youtube-music-revanced"
+get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
+get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music"
+patch "youtube-music" "youtube-music-revanced"
+
+ls revanced-patches*.jar >> revanced-version.txt
+fi
\ No newline at end of file
diff --git a/src/build/build-rve.sh b/src/build/build-rve.sh
new file mode 100644
index 0000000..4a57b61
--- /dev/null
+++ b/src/build/build-rve.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Revanced Extended build
+source src/build/tools.sh
+
+release=$(curl -s "https://api.github.com/repos/inotia00/revanced-patches/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+curl -sL -O "$asset"
+ls revanced-patches*.jar >> new.txt
+rm -f revanced-patches*.jar
+release=$(curl -s "https://api.github.com/repos/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest")
+asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-version.txt") | .browser_download_url')
+curl -sL -O "$asset"
+if diff -q revanced-extended-version.txt new.txt >/dev/null ; then
+echo "Old patch!!! Not build"
+exit 1
+else
+rm -f *.txt
+
+dl_gh "inotia00"
+
+# Patch YouTube Extended
+get_patches_key "youtube-revanced-extended"
+get_ver "hide-general-ads" "com.google.android.youtube"
+get_apk "youtube" "youtube" "google-inc/youtube/youtube"
+patch "youtube" "youtube-revanced-extended"
+
+# Patch YouTube Music Extended 
+get_patches_key "youtube-music-revanced-extended"
+get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-music"
+patch "youtube-music" "youtube-music-revanced-extended"
+
+ls revanced-patches*.jar >> revanced-extended-version.txt
+fi
\ No newline at end of file
diff --git a/src/build/tools.sh b/src/build/tools.sh
new file mode 100644
index 0000000..e403459
--- /dev/null
+++ b/src/build/tools.sh
@@ -0,0 +1,120 @@
+dl_gh() {
+    for repo in revanced-patches revanced-cli revanced-integrations ; do
+    asset_urls=$(wget -qO- "https://api.github.com/repos/$1/$repo/releases/latest" \
+                 | jq -r '.assets[] | "\(.browser_download_url) \(.name)"')
+        while read -r url names
+        do
+            echo "Downloading $names from $url"
+            wget -q -O "$names" $url
+        done <<< "$asset_urls"
+    done
+echo "All assets downloaded"
+}
+get_patches_key() {
+    EXCLUDE_PATCHES=()
+        for word in $(cat src/patches/$1/exclude-patches) ; do
+            EXCLUDE_PATCHES+=("-e $word")
+        done
+    INCLUDE_PATCHES=()
+        for word in $(cat src/patches/$1/include-patches) ; do
+            INCLUDE_PATCHES+=("-i $word")
+        done
+}
+req() { 
+    wget -nv -O "$2" -U "Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" "$1"
+}
+get_apk_vers() { 
+    req "$1" - | sed -n 's;.*Version:</span><span class="infoSlide-value">\(.*\) </span>.*;\1;p'
+}
+get_largest_ver() {
+  local max=0
+  while read -r v || [ -n "$v" ]; do   		
+	if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi
+	  done
+      	if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi
+}
+dl_apk() {
+  local url=$1 regexp=$2 output=$3
+  url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
+  echo "$url"
+  url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
+  url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
+  req "$url" "$output"
+}
+get_apk() {
+  echo "Downloading $1"
+  local last_ver
+  last_ver="$version"
+  last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}"
+  echo "Choosing version '${last_ver}'"
+  local base_apk="$1.apk"
+  dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \
+			"APK</span>[^@]*@\([^#]*\)" \
+			"$base_apk")
+  echo "$1 version: ${last_ver}"
+  echo "downloaded from: [APKMirror - $1]($dl_url)"
+}
+get_apk_with_ver() {
+  echo "Downloading $1"
+  local version
+  version="$2"
+  echo "Choosing version '${version}'"
+  local base_apk="$1.apk"
+  dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \
+			"APK</span>[^@]*@\([^#]*\)" \
+			"$base_apk")
+  echo "$1 version: ${version}"
+  echo "downloaded from: [APKMirror - $1]($dl_url)"
+}
+get_apk_arch() {
+  echo "Downloading $1 (${arm64-v8a})"
+  local last_ver
+  last_ver="$version"
+  last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}"
+  echo "Choosing version '${last_ver}'"
+  local base_apk="$1.apk"
+  local regexp_arch='arm64-v8a</div>[^@]*@\([^"]*\)'
+  dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \
+			"$regexp_arch" \
+			"$base_apk")
+  echo "$1 (${arm64-v8a}) version: ${last_ver}"
+  echo "downloaded from: [APKMirror - $1 ${arm64-v8a}]($dl_url)"
+}
+get_apk_arch_with_ver() {
+  echo "Downloading $1 (${arm64-v8a})"
+  local version
+  version="$2"
+  local base_apk="$1.apk"
+  local regexp_arch='arm64-v8a</div>[^@]*@\([^"]*\)'
+  dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \
+			"$regexp_arch" \
+			"$base_apk")
+  echo "$1 (${arm64-v8a}) version: ${version}"
+  echo "downloaded from: [APKMirror - $1 ${arm64-v8a}]($dl_url)"
+}
+get_ver() {
+    version=$(jq -r --arg patch_name "$1" --arg pkg_name "$2" '
+    .[]
+    | select(.name == $patch_name)
+    | .compatiblePackages[]
+    | select(.name == $pkg_name)
+    | .versions[-1]
+    ' patches.json)
+}
+patch() {
+    if [ -f "$1.apk" ]; then
+    java -jar revanced-cli*.jar \
+    -m revanced-integrations*.apk \
+    -b revanced-patches*.jar \
+    -a $1.apk \
+    ${EXCLUDE_PATCHES[@]} \
+    ${INCLUDE_PATCHES[@]} \
+    --keystore=ks.keystore \
+    -o ./build/$2.apk
+    unset version
+    unset EXCLUDE_PATCHES
+    unset INCLUDE_PATCHES
+    else 
+        exit 1
+    fi
+}
diff --git a/src/instagram/exclude-patches.txt b/src/instagram/exclude-patches.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/instagram/patch.sh b/src/instagram/patch.sh
deleted file mode 100644
index dfcb157..0000000
--- a/src/instagram/patch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-DIR_TMP="$(mktemp -d)"
-
-echo "⏬ Downloading Revanced resources..."
-for repos in revanced-patches revanced-cli revanced-integrations; do
-    curl -s "https://api.github.com/repos/revanced/$repos/releases/latest" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -sL -O
-done
-
-echo "⚙️ Importing Patches..."
-EXCLUDE_PATCHES=()
-for word in $(cat src/instagram/exclude-patches.txt) ; do
-    EXCLUDE_PATCHES+=("-e $word")
-done
-
-echo "⏬ Downloading apkeep resources..."
-curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/EFForg/apkeep/releases/latest/download/apkeep-x86_64-unknown-linux-gnu -o ${DIR_TMP}/apkeep
-
-echo "⏬ Downloading Instagram..."
-chmod +x ${DIR_TMP}/apkeep
-${DIR_TMP}/apkeep -a com.instagram.android@271.1.0.21.84 .
-
-echo "⚙️ Patching Instagram..."
-java -jar revanced-cli*.jar -m revanced-integrations*.apk -b revanced-patches*.jar ${EXCLUDE_PATCHES[@]} -a com.instagram.android@271.1.0.21.84.apk --keystore=ks.keystore -o Instagram.apk
diff --git a/ks.keystore b/src/ks.keystore
similarity index 100%
rename from ks.keystore
rename to src/ks.keystore
diff --git a/src/messenger/exclude-patches.txt b/src/messenger/exclude-patches.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/messenger/patch.sh b/src/messenger/patch.sh
deleted file mode 100644
index fb2a33e..0000000
--- a/src/messenger/patch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-DIR_TMP="$(mktemp -d)"
-
-echo "⏬ Downloading Revanced resources..."
-for repos in revanced-patches revanced-cli revanced-integrations; do
-    curl -s "https://api.github.com/repos/revanced/$repos/releases/latest" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -sL -O
-done
-
-echo "⚙️ Importing Patches..."
-EXCLUDE_PATCHES=()
-for word in $(cat src/messenger/exclude-patches.txt) ; do
-    EXCLUDE_PATCHES+=("-e $word")
-done
-
-echo "⏬ Downloading apkeep resources..."
-curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/EFForg/apkeep/releases/latest/download/apkeep-x86_64-unknown-linux-gnu -o ${DIR_TMP}/apkeep
-
-echo "⏬ Downloading Messenger..."
-chmod +x ${DIR_TMP}/apkeep
-${DIR_TMP}/apkeep -a com.facebook.orca -d google-play -o split_apk=false,locale=vi_VN -i ~/apkeep.ini .
-
-echo "⚙️ Patching Messenger..."
-java -jar revanced-cli*.jar -m revanced-integrations*.apk -b revanced-patches*.jar ${EXCLUDE_PATCHES[@]} -a com.facebook.orca.apk --keystore=ks.keystore -o Messenger.apk
\ No newline at end of file
diff --git a/src/patches/instagram/exclude-patches b/src/patches/instagram/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/instagram/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/instagram/include-patches b/src/patches/instagram/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/instagram/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/messenger/exclude-patches b/src/patches/messenger/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/messenger/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/messenger/include-patches b/src/patches/messenger/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/messenger/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/reddit/exclude-patches b/src/patches/reddit/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/reddit/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/reddit/include-patches b/src/patches/reddit/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/reddit/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/tiktok/exclude-patches b/src/patches/tiktok/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/tiktok/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/tiktok/include-patches b/src/patches/tiktok/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/tiktok/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/twitch/exclude-patches b/src/patches/twitch/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/twitch/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/twitch/include-patches b/src/patches/twitch/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/twitch/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/twitter/exclude-patches b/src/patches/twitter/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/twitter/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/twitter/include-patches b/src/patches/twitter/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/twitter/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/windy/exclude-patches b/src/patches/windy/exclude-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/windy/exclude-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/windy/include-patches b/src/patches/windy/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/windy/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/youtube-music-revanced-extended/exclude-patches b/src/patches/youtube-music-revanced-extended/exclude-patches
new file mode 100644
index 0000000..893b2c5
--- /dev/null
+++ b/src/patches/youtube-music-revanced-extended/exclude-patches
@@ -0,0 +1,12 @@
+custom-branding-music-afn-red
+compact-header
+disable-auto-captions
+enable-force-minimized-player
+enable-force-shuffle
+hide-button-shelf
+hide-carousel-shelf
+hide-category-bar
+hide-music-cast-button
+hide-new-playlist
+hide-playlist-card
+optimize-resource-music
diff --git a/src/patches/youtube-music-revanced-extended/include-patches b/src/patches/youtube-music-revanced-extended/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/youtube-music-revanced-extended/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/youtube-music-revanced/exclude-patches b/src/patches/youtube-music-revanced/exclude-patches
new file mode 100644
index 0000000..bf7ff24
--- /dev/null
+++ b/src/patches/youtube-music-revanced/exclude-patches
@@ -0,0 +1 @@
+compact-header
diff --git a/src/patches/youtube-music-revanced/include-patches b/src/patches/youtube-music-revanced/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/youtube-music-revanced/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/youtube-revanced-extended/exclude-patches b/src/patches/youtube-revanced-extended/exclude-patches
new file mode 100644
index 0000000..8b76486
--- /dev/null
+++ b/src/patches/youtube-revanced-extended/exclude-patches
@@ -0,0 +1,24 @@
+custom-branding-icon-afn-red
+debugging
+custom-seekbar-color
+disable-startup-shorts-player
+disable-quic-protocol
+enable-old-quality-layout
+force-premium-heading
+force-vp9-codec
+header-switch
+hide-cast-button
+hide-account-menu
+hide-auto-captions
+hide-autoplay-button
+hide-autoplay-preview
+hide-captions-button
+hide-email-address
+hide-endscreen-cards
+hide-endscreen-overlay
+hide-filmstrip-overlay
+hide-mix-playlists
+hide-seekbar
+hide-search-terms
+optimize-resource
+spoof-app-version
\ No newline at end of file
diff --git a/src/patches/youtube-revanced-extended/include-patches b/src/patches/youtube-revanced-extended/include-patches
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/src/patches/youtube-revanced-extended/include-patches
@@ -0,0 +1 @@
+
diff --git a/src/patches/youtube-revanced/exclude-patches b/src/patches/youtube-revanced/exclude-patches
new file mode 100644
index 0000000..b72f129
--- /dev/null
+++ b/src/patches/youtube-revanced/exclude-patches
@@ -0,0 +1,18 @@
+custom-branding
+premium-heading
+enable-debugging
+disable-auto-captions
+hide-my-mix
+hide-autoplay-button
+hide-cast-button
+hide-email-address
+hide-endscreen-cards
+hide-player-buttons
+hide-seekbar
+hide-timestamp
+hide-video-action-buttons
+hide-watch-in-vr
+hide-captions-button
+hide-timestamp
+hide-shorts-button
+spoof-app-version
\ No newline at end of file
diff --git a/src/patches/youtube-revanced/include-patches b/src/patches/youtube-revanced/include-patches
new file mode 100644
index 0000000..69ee73d
--- /dev/null
+++ b/src/patches/youtube-revanced/include-patches
@@ -0,0 +1 @@
+client-spoof
diff --git a/src/tiktok/exclude-patches.txt b/src/tiktok/exclude-patches.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/tiktok/patch.sh b/src/tiktok/patch.sh
deleted file mode 100644
index 2b405e0..0000000
--- a/src/tiktok/patch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-DIR_TMP="$(mktemp -d)"
-
-echo "⏬ Downloading Revanced resources..."
-for repos in revanced-patches revanced-cli revanced-integrations; do
-    curl -s "https://api.github.com/repos/revanced/$repos/releases/latest" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -sL -O
-done
-
-echo "⚙️ Importing Patches..."
-EXCLUDE_PATCHES=()
-for word in $(cat src/tiktok/exclude-patches.txt) ; do
-    EXCLUDE_PATCHES+=("-e $word")
-done
-
-echo "⏬ Downloading apkeep resources..."
-curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/EFForg/apkeep/releases/latest/download/apkeep-x86_64-unknown-linux-gnu -o ${DIR_TMP}/apkeep
-
-echo "⏬ Downloading Titok..."
-chmod +x ${DIR_TMP}/apkeep
-${DIR_TMP}/apkeep -a com.ss.android.ugc.trill -d google-play -o split_apk=false,locale=vi_VN -i ~/apkeep.ini .
-
-echo "⚙️ Patching Tiktok..."
-java -jar revanced-cli*.jar -m revanced-integrations*.apk -b revanced-patches*.jar ${EXCLUDE_PATCHES[@]} -a com.ss.android.ugc.trill.apk --keystore=ks.keystore -o Tiktok.apk
diff --git a/src/twitch/exclude-patches.txt b/src/twitch/exclude-patches.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/twitch/patch.sh b/src/twitch/patch.sh
deleted file mode 100644
index 2479d29..0000000
--- a/src/twitch/patch.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-DIR_TMP="$(mktemp -d)"
-
-echo "⏬ Downloading Revanced resources..."
-for repos in revanced-patches revanced-cli revanced-integrations; do
-    curl -s "https://api.github.com/repos/revanced/$repos/releases/latest" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -sL -O
-done
-
-echo "⚙️ Importing Patches..."
-EXCLUDE_PATCHES=()
-for word in $(cat src/twitch/exclude-patches.txt) ; do
-    EXCLUDE_PATCHES+=("-e $word")
-done
-
-"⚙️ Finding Twitch patches..."
-version=$(jq -r '.[] | select(.name == "block-video-ads") | .compatiblePackages[] | select(.name == "tv.twitch.android.app") | .versions[-1]' patches.json)
-
-echo "⏬ Downloading apkeep resources..."
-curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/EFForg/apkeep/releases/latest/download/apkeep-x86_64-unknown-linux-gnu -o ${DIR_TMP}/apkeep
-
-echo "⏬ Downloading Twitch..."
-chmod +x ${DIR_TMP}/apkeep
-${DIR_TMP}/apkeep -a tv.twitch.android.app@$version .
-
-echo "⚙️ Patching Twitch..."
-java -jar revanced-cli*.jar -m revanced-integrations*.apk -b revanced-patches*.jar ${EXCLUDE_PATCHES[@]} -a tv.twitch.android.app*.apk --keystore=ks.keystore -o Twitch.apk
\ No newline at end of file
diff --git a/src/twitter/exclude-patches.txt b/src/twitter/exclude-patches.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/src/twitter/patch.sh b/src/twitter/patch.sh
deleted file mode 100644
index 84059a3..0000000
--- a/src/twitter/patch.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-DIR_TMP="$(mktemp -d)"
-
-echo "⏬ Downloading Revanced resources..."
-for repos in revanced-patches revanced-cli revanced-integrations; do
-    curl -s "https://api.github.com/repos/revanced/$repos/releases/latest" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -sL -O
-done
-
-echo "⚙️ Importing Patches..."
-EXCLUDE_PATCHES=()
-for word in $(cat src/twitter/exclude-patches.txt) ; do
-    EXCLUDE_PATCHES+=("-e $word")
-done
-
-echo "⏬ Downloading apkeep resources..."
-curl --retry 10 --retry-max-time 60 -H "Cache-Control: no-cache" -fsSL github.com/EFForg/apkeep/releases/latest/download/apkeep-x86_64-unknown-linux-gnu -o ${DIR_TMP}/apkeep
-
-echo "⏬ Downloading Twitter..."
-chmod +x ${DIR_TMP}/apkeep
-${DIR_TMP}/apkeep -a com.twitter.android -d google-play -o split_apk=false,locale=vi_VN -i ~/apkeep.ini .
-
-echo "⚙️ Patching Twitter..."
-java -jar revanced-cli*.jar -m revanced-integrations*.apk -b revanced-patches*.jar ${EXCLUDE_PATCHES[@]} -a com.twitter.android.apk --keystore=ks.keystore -o Twitter.apk
diff --git a/src/yt/patch.sh b/src/yt/patch.sh
deleted file mode 100644
index a4839c4..0000000
--- a/src/yt/patch.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/bash
-set -e
-# Set variables for Revanced
-readonly revanced_name="revanced"
-readonly revanced_user="revanced"
-readonly revanced_patch="src/yt/patches.rv"
-readonly revanced_ytversion="" # Input version supported if you need patch specific YT version.Example: "18.03.36"
-# Set variables for Revanced Extended
-readonly revanced_extended_name="revanced-extended"
-readonly revanced_extended_user="inotia00"
-readonly revanced_extended_patch="src/yt/patches.rve"
-readonly revanced_extended_ytversion="" # Input version supported if you need patch specific YT version.Example: "18.07.35"
-# Function prepare patches keywords
-get_patch() {
-    local excluded_start=$(grep -n -m1 'EXCLUDE PATCHES' "$patch_file" | cut -d':' -f1)
-    local included_start=$(grep -n -m1 'INCLUDE PATCHES' "$patch_file" | cut -d':' -f1)
-    local excluded_patches=$(tail -n +$excluded_start $patch_file | head -n "$(( included_start - excluded_start ))"  | grep '^[^#[:blank:]]')
-    local included_patches=$(tail -n +$included_start $patch_file | grep '^[^#[:blank:]]')
-    patches=()
-    if [[ -n "$excluded_patches" ]]; then
-        while read -r patch; do
-            patches+=("-e $patch")
-        done <<< "$excluded_patches"
-    fi
-    if [[ -n "$included_patches" ]]; then
-        while read -r patch; do
-            patches+=("-i $patch")
-        done <<< "$included_patches"
-    fi
-}
-# Function download latest github releases 
-download_latest_release() {
-    echo "⏬ Downloading $name resources..."
-    for repos in revanced-patches revanced-cli revanced-integrations; do
-       local url="https://api.github.com/repos/$user/$repos/releases/latest"
-       curl -s "$url" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -O -s -L
-   done
-}
-# Function download YouTube apk from APKmirror
-req() {
-    curl -sSL -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" "$1" -o "$2"
-}
-dl_yt() {
-    rm -rf $2
-        echo "🔽 Downloading YouTube version $1"
-    url="https://www.apkmirror.com/apk/google-inc/youtube/youtube-${1//./-}-release/"
-        echo "🔍 Searching for download link at $url"
-    url="$url$(req "$url" - | grep Variant -A50 | grep ">APK<" -A2 | grep android-apk-download | sed "s#.*-release/##g;s#/\#.*##g")"
-    url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
-    url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
-        echo "📥 Downloading from $url"
-    if req "$url" "$2" ; then
-        echo "✅ Download complete!"
-    else 
-        echo "❌ Download failed."
-    fi
-}
-get_support_version() {
-    if [[ "$name" = "$revanced_name" ]] ; then
-        ytversion=$(jq -r '.[] | select(.name == "video-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json) 
-        echo "✅️ Found YouTube version: $ytversion"
-    else 
-        ytversion=$(jq -r '.[] | select(.name == "hide-general-ads") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json) 
-        echo "✅️ Found YouTube version: $ytversion"
-    fi
-}
-
-# Function Patch APK
-patch_apk() {
-echo "⚙️ Patching YouTube..."
-java -jar revanced-cli*.jar \
-     -m revanced-integrations*.apk \
-     -b revanced-patches*.jar \
-     -a youtube-v$ytversion.apk \
-     ${patches[@]} \
-     --keystore=ks.keystore \
-     -o yt-$name.apk
-}
-# Function clean caches to new build
-clean_cache() {
-echo "🧹 Clean caches..."
-rm -f revanced-cli*.jar \
-      revanced-integrations*.apk \
-      revanced-patches*.jar \
-      patches.json \
-      options.toml \
-      youtube*.apk \ 
-}
-# Loop over Revanced & Revanced Extended 
-for name in $revanced_name $revanced_extended_name ; do
-    # Select variables based on name
-    if [[ "$name" = "$revanced_name" ]]; then
-        user="$revanced_user"
-        patch_file="$revanced_patch"
-        ytversion="$revanced_ytversion"
-    else
-        user="$revanced_extended_user"
-        patch_file="$revanced_extended_patch"
-        ytversion="$revanced_extended_ytversion"
-    fi  
-get_patch
-download_latest_release
- if [[ $ytversion ]] ; then 
-    dl_yt $ytversion youtube-v$ytversion.apk 
-    patch_apk
- else
-    get_support_version 
-    dl_yt $ytversion youtube-v$ytversion.apk
-    patch_apk
-fi
-clean_cache
-done
diff --git a/src/yt/patches.rv b/src/yt/patches.rv
deleted file mode 100644
index 4dda106..0000000
--- a/src/yt/patches.rv
+++ /dev/null
@@ -1,25 +0,0 @@
-# EXCLUDE PATCHES FROM BELOW
-custom-video-buffer
-enable-debugging
-hide-my-mix
-hide-autoplay-button
-premium-heading
-hide-cast-button
-hide-watch-in-vr
-hide-captions-button
-hide-timestamp
-hide-shorts-button
-# INCLUDE PATCHES FROM BELOW
-open-links-externally
-custom-branding-icon-mmt
-return-youtube-dislike
-sponsorblock
-swipe-controls
-disable-shorts-on-startup
-hide-watermark
-downloads
-remember-video-quality
-client-spoof
-spoof-signature-verification
-general-ads
-video-ads
diff --git a/src/yt/patches.rve b/src/yt/patches.rve
deleted file mode 100644
index 0b49a9e..0000000
--- a/src/yt/patches.rve
+++ /dev/null
@@ -1,35 +0,0 @@
-# EXCLUDE PATCHES FROM BELOW
-custom-video-buffer
-debugging
-hide-my-mix
-hide-autoplay-button
-premium-heading
-hide-cast-button
-hide-watch-in-vr
-hide-captions-button
-hide-timestamp
-hide-shorts-button
-force-vp9-codec
-optimize-resource
-hide-auto-captions
-hide-comment-component
-hide-mix-playlists
-hide-subscriptions-button
-hide-autoplay-preview
-hide-search-terms
-hide-seekbar
-disable-quic-protocol
-# INCLUDE PATCHES FROM BELOW
-open-links-externally
-custom-branding-icon-mmt
-return-youtube-dislike
-sponsorblock
-swipe-controls
-disable-shorts-on-startup
-hide-watermark
-downloads
-remember-video-quality
-client-spoof
-protobuf-spoof
-general-ads
-video-ads
diff --git a/src/ytm/patch.sh b/src/ytm/patch.sh
deleted file mode 100644
index d520129..0000000
--- a/src/ytm/patch.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-set -e
-# Set variables for Revanced
-readonly revanced_name="revanced"
-readonly revanced_user="revanced"
-readonly revanced_patch="src/ytm/patches.rv"
-readonly revanced_ytmversion="" # Input version supported if you need patch specific YT version.Example: "18.03.36"
-# Set variables for Revanced Extended
-readonly revanced_extended_name="revanced-extended"
-readonly revanced_extended_user="inotia00"
-readonly revanced_extended_patch="src/ytm/patches.rve"
-readonly revanced_extended_ytmversion="" # Input version supported if you need patch specific YT version.Example: "18.07.35"
-# Function prepare patches keywords
-get_patch() {
-    local excluded_start=$(grep -n -m1 'EXCLUDE PATCHES' "$patch_file" | cut -d':' -f1)
-    local included_start=$(grep -n -m1 'INCLUDE PATCHES' "$patch_file" | cut -d':' -f1)
-    local excluded_patches=$(tail -n +$excluded_start $patch_file | head -n "$(( included_start - excluded_start ))"  | grep '^[^#[:blank:]]')
-    local included_patches=$(tail -n +$included_start $patch_file | grep '^[^#[:blank:]]')
-    patches=()
-    if [[ -n "$excluded_patches" ]]; then
-        while read -r patch; do
-            patches+=("-e $patch")
-        done <<< "$excluded_patches"
-    fi
-    if [[ -n "$included_patches" ]]; then
-        while read -r patch; do
-            patches+=("-i $patch")
-        done <<< "$included_patches"
-    fi
-}
-# Function download latest github releases 
-download_latest_release() {
-    echo "⏬ Downloading $name resources..."
-    for repos in revanced-patches revanced-cli revanced-integrations; do
-       local url="https://api.github.com/repos/$user/$repos/releases/latest"
-       curl -s "$url" | jq -r '.assets[].browser_download_url' | xargs -n 1 curl -O -s -L
-   done
-}
-# Function download YouTube apk from APKmirror
-req() {
-    curl -sSL -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" "$1" -o "$2"
-}
-dl_ytm() {
-    rm -rf $2
-    echo "Downloading YouTube Music $1"
-    url="https://www.apkmirror.com/apk/google-inc/youtube/youtube-music-${1//./-}-release/"
-    url="$url$(req "$url" - | grep arm64 -A30 | grep youtube-music | head -1 | sed "s#.*-release/##g;s#/\".*##g")"
-    url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
-    url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
-    req "$url" "$2"
-}
-get_latestytmversion() {
-    url="https://www.apkmirror.com/apk/google-inc/youtube-music/"
-    ytmversion=$(req "$url" - | grep "All version" -A200 | grep app_release | sed 's:.*/youtube-music-::g;s:-release/.*::g;s:-:.:g' | sort -r | head -1)
-    echo "Latest Youtube Music Version: $ytmversion"
-}
-get_support_version() {
-ytmversion=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json)
-}
-# Function Patch APK
-patch_ms() {
-echo "⚙️ Patching YouTube Music..."
-java -jar revanced-cli*.jar \
-     -m revanced-integrations*.apk \
-     -b revanced-patches*.jar \
-     -a youtube-music-v$ytmversion.apk \
-     ${patches[@]} \
-     --keystore=ks.keystore \
-     -o ytm-$name.apk
-}
-# Function clean caches to new build
-clean_cache() {
-echo "🧹 Clean caches..."
-rm -f revanced-cli*.jar \
-      revanced-integrations*.apk \
-      revanced-patches*.jar \
-      patches.json \
-      options.toml \
-      youtube-music*.apk \ 
-}
-# Loop over Revanced & Revanced Extended 
-for name in $revanced_name $revanced_extended_name ; do
-    # Select variables based on name
-    if [[ "$name" = "$revanced_name" ]]; then
-        user="$revanced_user"
-        patch_file="$revanced_patch"
-        ytmversion="$revanced_ytmversion"
-    else
-        user="$revanced_extended_user"
-        patch_file="$revanced_extended_patch"
-        ytmversion="$revanced_extended_ytmversion"
-    fi  
-get_patch
-download_latest_release
- if [[ "$name" = "$revanced_name" ]] ; then
-   get_support_version
-   dl_ytm $ytmversion youtube-music-v$ytmversion.apk 
- else get_latestytmversion 
-  dl_ytm $ytmversion youtube-music-v$ytmversion.apk 
-fi
-patch_ms
-clean_cache
-done
diff --git a/src/ytm/patches.rv b/src/ytm/patches.rv
deleted file mode 100644
index 42b8b55..0000000
--- a/src/ytm/patches.rv
+++ /dev/null
@@ -1,12 +0,0 @@
-# EXCLUDE PATCHES FROM BELOW
-compact-header
-# INCLUDE PATCHES FROM BELOW
-background-play
-codecs-unlock
-exclusive-audio-playback
-hide-get-premium
-minimized-playback-music
-music-video-ads
-tasteBuilder-remover
-upgrade-button-remover
-custom-branding-icon-afn-red
diff --git a/src/ytm/patches.rve b/src/ytm/patches.rve
deleted file mode 100644
index 42b8b55..0000000
--- a/src/ytm/patches.rve
+++ /dev/null
@@ -1,12 +0,0 @@
-# EXCLUDE PATCHES FROM BELOW
-compact-header
-# INCLUDE PATCHES FROM BELOW
-background-play
-codecs-unlock
-exclusive-audio-playback
-hide-get-premium
-minimized-playback-music
-music-video-ads
-tasteBuilder-remover
-upgrade-button-remover
-custom-branding-icon-afn-red