diff --git a/meta.xml b/meta.xml
index 0cef5db5..76c4aa4b 100644
--- a/meta.xml
+++ b/meta.xml
@@ -90,21 +90,24 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
diff --git a/scripts/client/gui/clanmgr.js b/scripts/client/gui/account-settings.js
similarity index 55%
rename from scripts/client/gui/clanmgr.js
rename to scripts/client/gui/account-settings.js
index 7928a7be..40d91e07 100644
--- a/scripts/client/gui/clanmgr.js
+++ b/scripts/client/gui/account-settings.js
@@ -3,19 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: clanmgr.js
-// DESC: Provides clan manager GUI
+// FILE: account-settings.js
+// DESC: Provides account settings GUI
// TYPE: Client (JavaScript)
// ===========================================================================
-
-let clanManager = {
- window: null,
- generalTab: null,
- ranksTab: null,
- membersTab: null,
- vehiclesTab: null,
- businessesTab: null,
- housesTab: null,
-};
-
-// ===========================================================================
\ No newline at end of file
diff --git a/scripts/client/gui/bizmgr.js b/scripts/client/gui/business-manager.js
similarity index 93%
rename from scripts/client/gui/bizmgr.js
rename to scripts/client/gui/business-manager.js
index 717eda31..055cfb32 100644
--- a/scripts/client/gui/bizmgr.js
+++ b/scripts/client/gui/business-manager.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: bizmgr.js
+// FILE: business-manager.js
// DESC: Provides business manager GUI
// TYPE: Client (JavaScript)
// ===========================================================================
\ No newline at end of file
diff --git a/scripts/client/gui/changepass.js b/scripts/client/gui/change-password.js
similarity index 99%
rename from scripts/client/gui/changepass.js
rename to scripts/client/gui/change-password.js
index 23f09d15..ee6c8686 100644
--- a/scripts/client/gui/changepass.js
+++ b/scripts/client/gui/change-password.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: changepass.js
+// FILE: change-password.js
// DESC: Provides change password GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/charselect.js b/scripts/client/gui/character-select.js
similarity index 99%
rename from scripts/client/gui/charselect.js
rename to scripts/client/gui/character-select.js
index f46f4a9c..2961fe73 100644
--- a/scripts/client/gui/charselect.js
+++ b/scripts/client/gui/character-select.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: charselect.js
+// FILE: character-select.js
// DESC: Provides character select GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/housemgr.js b/scripts/client/gui/house-manager.js
similarity index 100%
rename from scripts/client/gui/housemgr.js
rename to scripts/client/gui/house-manager.js
diff --git a/scripts/client/gui/keybind-manager.js b/scripts/client/gui/keybind-manager.js
new file mode 100644
index 00000000..9ac41f63
--- /dev/null
+++ b/scripts/client/gui/keybind-manager.js
@@ -0,0 +1,9 @@
+// ===========================================================================
+// Asshat Gaming Roleplay
+// https://github.com/VortrexFTW/agrp_main
+// (c) 2022 Asshat Gaming
+// ===========================================================================
+// FILE: keybind-manager.js
+// DESC: Provides keybind manager GUI
+// TYPE: Client (JavaScript)
+// ===========================================================================
\ No newline at end of file
diff --git a/scripts/client/gui/localechooser.js b/scripts/client/gui/locale-chooser.js
similarity index 99%
rename from scripts/client/gui/localechooser.js
rename to scripts/client/gui/locale-chooser.js
index b80980b3..71db1bad 100644
--- a/scripts/client/gui/localechooser.js
+++ b/scripts/client/gui/locale-chooser.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: localechooser.js
+// FILE: locale-chooser.js
// DESC: Provides locale chooser GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/newchar.js b/scripts/client/gui/new-character.js
similarity index 99%
rename from scripts/client/gui/newchar.js
rename to scripts/client/gui/new-character.js
index 6fbc75ed..ab3a2739 100644
--- a/scripts/client/gui/newchar.js
+++ b/scripts/client/gui/new-character.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: newchar.js
+// FILE: new-character.js
// DESC: Provides new character creation GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/resetpass.js b/scripts/client/gui/reset-password.js
similarity index 99%
rename from scripts/client/gui/resetpass.js
rename to scripts/client/gui/reset-password.js
index 148f1b30..67020b1d 100644
--- a/scripts/client/gui/resetpass.js
+++ b/scripts/client/gui/reset-password.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: resetpass.js
+// FILE: reset-password.js
// DESC: Provides password reset GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/server-settings.js b/scripts/client/gui/server-settings.js
new file mode 100644
index 00000000..e69de29b
diff --git a/scripts/client/gui/error.js b/scripts/client/gui/simple-error.js
similarity index 97%
rename from scripts/client/gui/error.js
rename to scripts/client/gui/simple-error.js
index 65f67f76..33745858 100644
--- a/scripts/client/gui/error.js
+++ b/scripts/client/gui/simple-error.js
@@ -3,8 +3,8 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: error.js
-// DESC: Provides error box GUI
+// FILE: simple-error.js
+// DESC: Provides a simple error box GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/info.js b/scripts/client/gui/simple-info.js
similarity index 99%
rename from scripts/client/gui/info.js
rename to scripts/client/gui/simple-info.js
index 3845de36..db98d3a6 100644
--- a/scripts/client/gui/info.js
+++ b/scripts/client/gui/simple-info.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: info.js
+// FILE: simple-info.js
// DESC: Provides info dialog box GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/list.js b/scripts/client/gui/simple-list.js
similarity index 99%
rename from scripts/client/gui/list.js
rename to scripts/client/gui/simple-list.js
index bbf5f1b3..ec4c26be 100644
--- a/scripts/client/gui/list.js
+++ b/scripts/client/gui/simple-list.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: list.js
+// FILE: simple-list.js
// DESC: Provides simple list GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/yesno.js b/scripts/client/gui/simple-prompt-yes-no.js
similarity index 98%
rename from scripts/client/gui/yesno.js
rename to scripts/client/gui/simple-prompt-yes-no.js
index 554fb094..f143b086 100644
--- a/scripts/client/gui/yesno.js
+++ b/scripts/client/gui/simple-prompt-yes-no.js
@@ -3,8 +3,8 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: yesno.js
-// DESC: Provides yes/no prompt dialog GUI
+// FILE: simple-prompt-yes-no.js
+// DESC: Provides simple yes/no prompt dialog GUI
// TYPE: Client (JavaScript)
// ===========================================================================
diff --git a/scripts/client/gui/2fa.js b/scripts/client/gui/two-factor-authentication.js
similarity index 99%
rename from scripts/client/gui/2fa.js
rename to scripts/client/gui/two-factor-authentication.js
index e72d09eb..ecb3e194 100644
--- a/scripts/client/gui/2fa.js
+++ b/scripts/client/gui/two-factor-authentication.js
@@ -3,7 +3,7 @@
// https://github.com/VortrexFTW/agrp_main
// (c) 2022 Asshat Gaming
// ===========================================================================
-// FILE: 2fa.js
+// FILE: two-factor-authentication.js
// DESC: Provides two factor authentication GUI
// TYPE: Client (JavaScript)
// ===========================================================================