diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 81107c4f..a8dd1cd8 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -188,7 +188,7 @@ async function setupApp() {
     }),
   )
 
-  // Patched by AstralRinth
+  /// [AR] Patch
   // useFetch(
   //   `https://api.modrinth.com/appCriticalAnnouncement.json?version=${version}`,
   //   'criticalAnnouncements',
diff --git a/apps/app-frontend/src/components/ui/AccountsCard.vue b/apps/app-frontend/src/components/ui/AccountsCard.vue
index f352c6d5..7b03e1f3 100644
--- a/apps/app-frontend/src/components/ui/AccountsCard.vue
+++ b/apps/app-frontend/src/components/ui/AccountsCard.vue
@@ -153,11 +153,11 @@ const loginErrorModal = ref(null)
 const unexpectedErrorModal = ref(null)
 const playerName = ref('')
 
-async function tryOfflineLogin() { // Patched by AstralRinth
+async function tryOfflineLogin() { // [AR] Feature
   loginOfflineModal.value.show()
 }
 
-async function offlineLoginFinally() { // Patched by AstralRinth
+async function offlineLoginFinally() { // [AR] Feature
   const name = playerName.value
   if (name.length > 1 && name.length < 20 && name !== '') {
     const loggedIn = await offline_login(name).catch(handleError)
@@ -176,12 +176,12 @@ async function offlineLoginFinally() { // Patched by AstralRinth
   }
 }
 
-function retryOfflineLogin() { // Patched by AstralRinth
+function retryOfflineLogin() { // [AR] Feature
   loginErrorModal.value.hide()
   tryOfflineLogin()
 }
 
-function getAccountType(account) { // Patched by AstralRinth
+function getAccountType(account) { // [AR] Feature
   if (account.access_token != "null" && account.access_token != null && account.access_token != "") {
     return License
   } else {
diff --git a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
index fffe8b02..13f5991c 100644
--- a/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
+++ b/apps/app-frontend/src/components/ui/settings/PrivacySettings.vue
@@ -30,7 +30,7 @@ watch(
         option, you opt out and ads will no longer be shown based on your interests.
       </p>
     </div>
-    <!-- AstralRinth disabled element by default -->
+    <!-- [AR] Patch. Disabled element by default -->
     <Toggle id="personalized-ads" v-model="settings.personalized_ads" :disabled="!settings.personalized_ads" />
   </div>
 
@@ -43,7 +43,7 @@ watch(
         longer be collected.
       </p>
     </div>
-    <!-- AstralRinth disabled element by default -->
+    <!-- [AR] Patch. Disabled element by default -->
     <Toggle id="opt-out-analytics" v-model="settings.telemetry" :disabled="!settings.telemetry"  />
   </div>
 
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index a62deec7..f1b5deb8 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -14,7 +14,7 @@ use chrono::Utc;
 use daedalus as d;
 use daedalus::minecraft::{LoggingSide, RuleAction, VersionInfo};
 use daedalus::modded::LoaderVersion;
-use rand::seq::SliceRandom; // AstralRinth
+use rand::seq::SliceRandom; // [AR] Feature
 use regex::Regex;
 use serde::Deserialize;
 use st::Profile;
@@ -633,7 +633,7 @@ pub async fn launch_minecraft(
         command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
     }
 
-    // Patched by AstralRinth
+    // [AR] Patch
     if credentials.access_token == "null" && credentials.refresh_token == "null" {
         if version_jar == "1.16.4" || version_jar == "1.16.5" {
             let invalid_url = "https://invalid.invalid";
@@ -743,6 +743,7 @@ pub async fn launch_minecraft(
         }
     }
 
+    // [AR] Feature
     let selected_phrase = ACTIVE_STATE.choose(&mut rand::thread_rng()).unwrap();
         let _ = state
             .discord_rpc
diff --git a/packages/app-lib/src/state/db.rs b/packages/app-lib/src/state/db.rs
index 44a1c76e..bebcf5fb 100644
--- a/packages/app-lib/src/state/db.rs
+++ b/packages/app-lib/src/state/db.rs
@@ -23,6 +23,7 @@ pub(crate) async fn connect() -> crate::Result<Pool<Sqlite>> {
     Ok(pool)
 }
 
+// [AR] Feature. Implement SQLite3 connection without SQLx migrations.
 async fn connect_without_migrate() -> crate::Result<Pool<Sqlite>> {
     let settings_dir = DirectoryInfo::get_initial_settings_dir().ok_or(
         ErrorKind::FSError("Could not find valid config dir".to_string()),
@@ -71,7 +72,7 @@ async fn stale_data_cleanup(pool: &Pool<Sqlite>) -> crate::Result<()> {
     Ok(())
 }
 /*
-// Patched by AstralRinth
+// [AR] Patch fix
 Problem files, view detailed information in .gitattributes:
 /packages/app-lib/migrations/20240711194701_init.sql !eol
 CRLF -> 4c47e326f16f2b1efca548076ce638d4c90dd610172fe48c47d6de9bc46ef1c5abeadfdea05041ddd72c3819fa10c040
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index 4dce9681..cabd33ad 100644
--- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs
@@ -22,6 +22,7 @@ pub struct DirectoryInfo {
 impl DirectoryInfo {
     // Get the settings directory
     // init() is not needed for this function
+    // [AR] Patch fix. From PR.
     pub fn get_initial_settings_dir() -> Option<PathBuf> {
         Self::env_path("THESEUS_CONFIG_DIR").or_else(|| {
             if std::env::current_dir().ok()?.join("portable.txt").exists() {
diff --git a/packages/app-lib/src/state/discord.rs b/packages/app-lib/src/state/discord.rs
index 39a8eaf0..b6135b66 100644
--- a/packages/app-lib/src/state/discord.rs
+++ b/packages/app-lib/src/state/discord.rs
@@ -1,16 +1,17 @@
+// [AR] Feature
 use std::{
     sync::{atomic::AtomicBool, Arc},
-    time::{SystemTime, UNIX_EPOCH}, // AstralRinth
+    time::{SystemTime, UNIX_EPOCH},
 };
 
 use discord_rich_presence::{
-    activity::{Activity, Assets, Timestamps}, // AstralRinth
+    activity::{Activity, Assets, Timestamps}, // [AR] Feature
     DiscordIpc, DiscordIpcClient,
 };
-use rand::seq::SliceRandom; // AstralRinth
+use rand::seq::SliceRandom; // [AR] Feature
 use tokio::sync::RwLock;
 
-use crate::util::utils; // AstralRinth
+use crate::util::utils; // [AR] Feature
 use crate::State;
 
 pub struct DiscordGuard {
diff --git a/packages/app-lib/src/state/minecraft_auth.rs b/packages/app-lib/src/state/minecraft_auth.rs
index fdd21b76..834120b1 100644
--- a/packages/app-lib/src/state/minecraft_auth.rs
+++ b/packages/app-lib/src/state/minecraft_auth.rs
@@ -213,7 +213,7 @@ pub async fn login_finish(
     Ok(credentials)
 }
 
-// Patched by AstralRinth
+// [AR] Feature
 #[tracing::instrument]
 pub async fn offline_auth(
     name: &str,
@@ -790,7 +790,7 @@ const MICROSOFT_CLIENT_ID: &str = "00000000402b5328";
 const REDIRECT_URL: &str = "https://login.live.com/oauth20_desktop.srf";
 const REQUESTED_SCOPES: &str = "service::user.auth.xboxlive.com::MBI_SSL";
 
-/* AstralRinth
+/* [AR] Fix
  * Weird visibility issue that didn't reproduce before
  * Had to make DeviceToken and RequestWithDate pub(crate) to fix compilation error
  */
diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs
index 1296e43a..8a946021 100644
--- a/packages/app-lib/src/util/mod.rs
+++ b/packages/app-lib/src/util/mod.rs
@@ -3,5 +3,5 @@ pub mod fetch;
 pub mod io;
 pub mod jre;
 pub mod platform;
-pub mod utils; // AstralRinth
+pub mod utils; // [AR] Feature
 pub mod server_ping;
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 237535cc..57a98db4 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -83,14 +83,14 @@ export const TwitterIcon = _TwitterIcon
 export const WindowsIcon = _WindowsIcon
 export const YouTubeIcon = _YouTubeIcon
 
-// AstralRinth Icons
+// [AR] Feature. Icons
 
 import _PirateIcon from './icons/pirate.svg?component'
 import _MicrosoftIcon from './icons/microsoft.svg?component'
 import _PirateShipIcon from './icons/pirate-ship.svg?component'
 import _AstralRinthLogo from './icons/astralrinth-logo.svg?component'
 
-// AstralRinth Exports
+// [AR] Feature. Exports
 
 export const PirateIcon = _PirateIcon
 export const MicrosoftIcon = _MicrosoftIcon