diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
index 333c15d..b2bc15f 100644
--- a/.github/workflows/Release.yml
+++ b/.github/workflows/Release.yml
@@ -9,8 +9,8 @@ on:
 
 env:
      module_id: ClockMod
-     BSVersion: 1.28.0_4124311467
-     ndkname: android-ndk-r25
+     BSVersion: 1.35.0_8016709773 # TODO: Remove usage of this variable
+     ndkname: android-ndk-r25     # TODO: Is this variable still used?
 
 jobs:
   build:
@@ -64,14 +64,14 @@ jobs:
       with:
         github_token: ${{secrets.GITHUB_TOKEN}}
         workflow: cargo-build.yml
-        name: linux-qpm-rust
+        name: linux-qpm
         path: QPM
-        repo: RedBrumbler/QuestPackageManager-Rust
+        repo: QuestPackageManager/QPM.CLI
         
     - name: QPM Collapse
       run: |
-        chmod +x ./QPM/qpm-rust
-        ./QPM/qpm-rust collapse
+        chmod +x ./QPM/qpm
+        ./QPM/qpm collapse
         
     - name: QPM Dependencies Cache
       id: cache-qpm-deps
@@ -79,15 +79,15 @@ jobs:
       env:
         cache-name: cache-qpm-deps
       with:
-        path: /home/runner/.local/share/QPM-Rust/cache
-        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('qpm.json', '.github/BuildQSounds.yml') }}
+        path: /home/runner/.local/share/QPM-RS/cache
+        key: ${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('qpm.json') }}
         restore-keys: |
           ${{ runner.os }}-${{ env.cache-name }}-
           ${{ runner.os }}-${{ env.cache-name }}
       
     - name: QPM Restore
       run: |
-        ./QPM/qpm-rust restore
+        ./QPM/qpm restore
 
     - name: Check dependency Folders
       run: |
@@ -97,15 +97,15 @@ jobs:
         echo "Checking libs"
         ls -lh ${GITHUB_WORKSPACE}/extern/libs
         echo ""
-        echo "Checking QPM-Rust/cache Folder"
-        ls -lh $HOME/.local/share/QPM-Rust/cache
+        echo "Checking QPM/cache Folder"
+        ls -lh $HOME/.local/share/QPM-RS/cache
         echo ""
 
     - name: Build
       run: |
         cd ${GITHUB_WORKSPACE}
-        ./QPM/qpm-rust package edit --version ${{ env.version }}
-        ./QPM/qpm-rust qmod build
+        ./QPM/qpm package edit --version ${{ env.version }}
+        ./QPM/qpm qmod build
         pwsh -Command ./build.ps1 --actions
 
     - name: Get Library Name
diff --git a/mod.json b/mod.json
index b293c56..b77cd45 100644
--- a/mod.json
+++ b/mod.json
@@ -4,14 +4,14 @@
   "id": "ClockMod",
   "modloader": "Scotland2",
   "author": "BoopetyDoopety, EnderdracheLP",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "packageId": "com.beatgames.beatsaber",
   "packageVersion": "1.35.0_8016709773",
   "description": "Displays the time in game. Alternatively also the Battery Percentage",
   "coverImage": "Cover.jpg",
   "dependencies": [
     {
-      "version": "^0.17.2",
+      "version": "^0.17.7",
       "id": "custom-types",
       "downloadIfMissing": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/CustomTypes.qmod"
     },
diff --git a/qpm.json b/qpm.json
index 9833078..0531b7b 100644
--- a/qpm.json
+++ b/qpm.json
@@ -5,13 +5,16 @@
   "info": {
     "name": "Clock Mod",
     "id": "ClockMod",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "url": null,
     "additionalData": {
       "overrideSoName": "libClockMod.so",
       "cmake": true
     }
   },
+  "workspace": {
+    "scripts": {}
+  },
   "dependencies": [
     {
       "id": "beatsaber-hook",
@@ -33,7 +36,7 @@
     },
     {
       "id": "custom-types",
-      "versionRange": "^0.17.2",
+      "versionRange": "^0.17.7",
       "additionalData": {}
     },
     {
diff --git a/qpm.shared.json b/qpm.shared.json
new file mode 100644
index 0000000..aebe184
--- /dev/null
+++ b/qpm.shared.json
@@ -0,0 +1,237 @@
+{
+  "config": {
+    "version": "0.1.0",
+    "sharedDir": "shared",
+    "dependenciesDir": "extern",
+    "info": {
+      "name": "Clock Mod",
+      "id": "ClockMod",
+      "version": "1.9.0",
+      "url": null,
+      "additionalData": {
+        "overrideSoName": "libClockMod.so",
+        "cmake": true
+      }
+    },
+    "workspace": {
+      "scripts": {}
+    },
+    "dependencies": [
+      {
+        "id": "beatsaber-hook",
+        "versionRange": "^5.1.6",
+        "additionalData": {}
+      },
+      {
+        "id": "scotland2",
+        "versionRange": "^0.1.4",
+        "additionalData": {
+          "includeQmod": false,
+          "private": true
+        }
+      },
+      {
+        "id": "bs-cordl",
+        "versionRange": "^3500.0.0",
+        "additionalData": {}
+      },
+      {
+        "id": "custom-types",
+        "versionRange": "^0.17.7",
+        "additionalData": {}
+      },
+      {
+        "id": "bsml",
+        "versionRange": "^0.4.31",
+        "additionalData": {}
+      },
+      {
+        "id": "config-utils",
+        "versionRange": "^1.4.2",
+        "additionalData": {}
+      },
+      {
+        "id": "paper",
+        "versionRange": "^3.6.3",
+        "additionalData": {}
+      }
+    ]
+  },
+  "restoredDependencies": [
+    {
+      "dependency": {
+        "id": "paper",
+        "versionRange": "=3.6.3",
+        "additionalData": {
+          "soLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/libpaperlog.so",
+          "debugSoLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/debug_libpaperlog.so",
+          "overrideSoName": "libpaperlog.so",
+          "modLink": "https://github.com/Fernthedev/paperlog/releases/download/v3.6.3/paperlog.qmod",
+          "branchName": "version/v3_6_3",
+          "compileOptions": {
+            "systemIncludes": [
+              "shared/utfcpp/source"
+            ]
+          },
+          "cmake": false
+        }
+      },
+      "version": "3.6.3"
+    },
+    {
+      "dependency": {
+        "id": "bsml",
+        "versionRange": "=0.4.31",
+        "additionalData": {
+          "soLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/libbsml.so",
+          "debugSoLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/debug_libbsml.so",
+          "overrideSoName": "libbsml.so",
+          "modLink": "https://github.com/RedBrumbler/Quest-BSML/releases/download/v0.4.31/BSML.qmod",
+          "branchName": "version/v0_4_31",
+          "cmake": true
+        }
+      },
+      "version": "0.4.31"
+    },
+    {
+      "dependency": {
+        "id": "config-utils",
+        "versionRange": "=1.4.2",
+        "additionalData": {
+          "headersOnly": true,
+          "soLink": "https://github.com/darknight1050/config-utils/releases/download/v1.4.2/libconfig-utils_test.so",
+          "overrideSoName": "libconfig-utils_test.so",
+          "branchName": "version/v1_4_2",
+          "cmake": true
+        }
+      },
+      "version": "1.4.2"
+    },
+    {
+      "dependency": {
+        "id": "custom-types",
+        "versionRange": "=0.17.7",
+        "additionalData": {
+          "soLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/libcustom-types.so",
+          "debugSoLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/debug_libcustom-types.so",
+          "overrideSoName": "libcustom-types.so",
+          "modLink": "https://github.com/QuestPackageManager/Il2CppQuestTypePatching/releases/download/v0.17.7/CustomTypes.qmod",
+          "branchName": "version/v0_17_7",
+          "compileOptions": {
+            "cppFlags": [
+              "-Wno-invalid-offsetof"
+            ]
+          },
+          "cmake": true
+        }
+      },
+      "version": "0.17.7"
+    },
+    {
+      "dependency": {
+        "id": "rapidjson-macros",
+        "versionRange": "=1.2.1",
+        "additionalData": {
+          "headersOnly": true,
+          "branchName": "version/v1_2_1",
+          "cmake": true
+        }
+      },
+      "version": "1.2.1"
+    },
+    {
+      "dependency": {
+        "id": "libil2cpp",
+        "versionRange": "=0.3.2",
+        "additionalData": {
+          "headersOnly": true,
+          "cmake": false
+        }
+      },
+      "version": "0.3.2"
+    },
+    {
+      "dependency": {
+        "id": "bs-cordl",
+        "versionRange": "=3500.0.0",
+        "additionalData": {
+          "headersOnly": true,
+          "branchName": "version/v3500_0_0",
+          "compileOptions": {
+            "includePaths": [
+              "include"
+            ],
+            "cppFeatures": [],
+            "cppFlags": [
+              "-DNEED_UNSAFE_CSHARP",
+              "-fdeclspec",
+              "-DUNITY_2021",
+              "-DHAS_CODEGEN"
+            ]
+          }
+        }
+      },
+      "version": "3500.0.0"
+    },
+    {
+      "dependency": {
+        "id": "beatsaber-hook",
+        "versionRange": "=5.1.6",
+        "additionalData": {
+          "soLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.6/libbeatsaber-hook_5_1_6.so",
+          "debugSoLink": "https://github.com/QuestPackageManager/beatsaber-hook/releases/download/v5.1.6/debug_libbeatsaber-hook_5_1_6.so",
+          "branchName": "version/v5_1_6",
+          "cmake": true
+        }
+      },
+      "version": "5.1.6"
+    },
+    {
+      "dependency": {
+        "id": "scotland2",
+        "versionRange": "=0.1.4",
+        "additionalData": {
+          "soLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/libsl2.so",
+          "debugSoLink": "https://github.com/sc2ad/scotland2/releases/download/v0.1.4/debug_libsl2.so",
+          "overrideSoName": "libsl2.so",
+          "branchName": "version/v0_1_4"
+        }
+      },
+      "version": "0.1.4"
+    },
+    {
+      "dependency": {
+        "id": "fmt",
+        "versionRange": "=10.0.0",
+        "additionalData": {
+          "headersOnly": true,
+          "branchName": "version/v10_0_0",
+          "compileOptions": {
+            "systemIncludes": [
+              "fmt/include/"
+            ],
+            "cppFlags": [
+              "-DFMT_HEADER_ONLY"
+            ]
+          }
+        }
+      },
+      "version": "10.0.0"
+    },
+    {
+      "dependency": {
+        "id": "tinyxml2",
+        "versionRange": "=10.0.0",
+        "additionalData": {
+          "soLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/libtinyxml2.so",
+          "debugSoLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/debug_libtinyxml2.so",
+          "overrideSoName": "libtinyxml2.so",
+          "modLink": "https://github.com/MillzyDev/NDK-tinyxml2/releases/download/v10.0.0/tinyxml2.qmod",
+          "branchName": "version/v10_0_0",
+          "cmake": true
+        }
+      },
+      "version": "10.0.0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/rl-notes.md b/rl-notes.md
index ab4aa4a..85eb097 100644
--- a/rl-notes.md
+++ b/rl-notes.md
@@ -9,4 +9,5 @@
 - Option to choose between the Clock being at the Top or the Bottom.
 
 __**Changelog:**__
-- Update to 1.28.0_4124311467
\ No newline at end of file
+- Update to 1.35.0_8016709773
+- Switch to BSML-Lite
\ No newline at end of file