diff --git a/completions/bash b/completions/bash
index 67b2269bc..c340753cd 100644
--- a/completions/bash
+++ b/completions/bash
@@ -16,13 +16,13 @@ __fastfetch_complete_help()
         "display-format"
         "de-format"
         "wm-format"
-        "wm-theme-format"
+        "wmtheme-format"
         "theme-format"
         "icons-format"
         "font-format"
         "cursor-format"
         "terminal-format"
-        "terminal-font-format"
+        "terminalfont-format"
         "cpu-format"
         "cpu-usage-format"
         "gpu-format"
@@ -267,9 +267,9 @@ __fastfetch_completion()
         "--wm-key"
         "--wm-format"
         "--wm-key-color"
-        "--wm-theme-key"
-        "--wm-theme-format"
-        "--wm-theme-key-color"
+        "--wmtheme-key"
+        "--wmtheme-format"
+        "--wmtheme-key-color"
         "--theme-key"
         "--theme-format"
         "--theme-key-color"
@@ -285,9 +285,9 @@ __fastfetch_completion()
         "--terminal-key"
         "--terminal-format"
         "--terminal-key-color"
-        "--terminal-font-key"
-        "--terminal-font-format"
-        "--terminal-font-key-color"
+        "--terminalfont-key"
+        "--terminalfont-format"
+        "--terminalfont-key-color"
         "--cpu-key"
         "--cpu-format"
         "--cpu-key-color"
diff --git a/presets/examples/2 b/presets/examples/2
index a7eda7fd9..6bd5a0ce3 100644
--- a/presets/examples/2
+++ b/presets/examples/2
@@ -20,5 +20,5 @@
 --wm-key "  "
 --shell-key "  "
 --terminal-key "  "
---terminal-font-key "  "
+--terminalfont-key "  "
 --packages-key "  "
diff --git a/presets/neofetch b/presets/neofetch
index 9d42df956..9861e3b99 100644
--- a/presets/neofetch
+++ b/presets/neofetch
@@ -4,7 +4,7 @@
 --display-format "{}x{}"
 --de-format "{2} {3}"
 --theme-format "{?1}{1}{?3} {3}{?} [Plasma], {?}{7}"
---terminal-font-format "{/2}{-}{/}{2}{?3} {3}{?}"
+--terminalfont-format "{/2}{-}{/}{2}{?3} {3}{?}"
 --memory-format "{/1}{-}{/}{/2}{-}{/}{} / {}"
 --gpu-key "GPU"
 --display-key "Display"
diff --git a/presets/verbose b/presets/verbose
index 2afad13ea..f84880ad8 100644
--- a/presets/verbose
+++ b/presets/verbose
@@ -14,7 +14,7 @@
 --font-format Font1: {}; Font2: {}; Font3: {}; Font4: {}
 --cursor-format Theme: {}; Size: {}
 --terminal-format Process: {}; Path: {}; Exe: {}
---terminal-font-format Pretty: {}; Name: {}; Size: {}; Styles: {}
+--terminalfont-format Pretty: {}; Name: {}; Size: {}; Styles: {}
 --cpu-format Name: {}, Vendor: {}, CoresPhysical: {}, CoresLogical: {}, CoresOnline: {}, FrequencyMin: {}, FrequencyMax: {}, Temperature: {}
 --cpu-usage-format Percentage: {}
 --gpu-format Vendor: {}; Name: {}; Driver: {}; Temperature: {}; CoreCount: {}; Type: {}
diff --git a/src/data/config_user.txt b/src/data/config_user.txt
index c2842ad67..a25ecf913 100644
--- a/src/data/config_user.txt
+++ b/src/data/config_user.txt
@@ -299,13 +299,13 @@
 #--brightness-key Brightness ({1})
 #--de-key DE
 #--wm-key WM
-#--wm-theme-key WM Theme
+#--wmtheme-key WM Theme
 #--theme-key Theme
 #--icons-key Icons
 #--font-key Font
 #--cursor-key Cursor
 #--terminal-key Terminal
-#--terminal-font-key Terminal Font
+#--terminalfont-key Terminal Font
 #--cpu-key CPU
 #--cpu-usage-key CPU Usage
 #--gpu-key GPU {1}
@@ -349,13 +349,13 @@
 #--brightness-format
 #--de-format
 #--wm-format
-#--wm-theme-format
+#--wmtheme-format
 #--theme-format
 #--icons-format
 #--font-format
 #--cursor-format
 #--terminal-format
-#--terminal-font-format
+#--terminalfont-format
 #--cpu-format
 #--cpu-usage-format
 #--gpu-format
@@ -395,13 +395,13 @@
 #--brightness-key-color
 #--de-key-color
 #--wm-key-color
-#--wm-theme-key-color
+#--wmtheme-key-color
 #--theme-key-color
 #--icons-key-color
 #--font-key-color
 #--cursor-key-color
 #--terminal-key-color
-#--terminal-font-key-color
+#--terminalfont-key-color
 #--cpu-key-color
 #--cpu-usage-key-color
 #--gpu-key-color
diff --git a/src/fastfetch.c b/src/fastfetch.c
index 7fc96cdcb..07efb414a 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -204,9 +204,9 @@ static inline void printCommandHelp(const char* command)
             "WM protocol name"
         );
     }
-    else if(ffStrEqualsIgnCase(command, "wm-theme-format"))
+    else if(ffStrEqualsIgnCase(command, "wmtheme-format"))
     {
-        constructAndPrintCommandHelpFormat("wm-theme", "{}", 1,
+        constructAndPrintCommandHelpFormat("wmtheme", "{}", 1,
             "WM theme name"
         );
     }
@@ -259,9 +259,9 @@ static inline void printCommandHelp(const char* command)
             "User shell version"
         );
     }
-    else if(ffStrEqualsIgnCase(command, "terminal-font-format"))
+    else if(ffStrEqualsIgnCase(command, "terminalfont-format"))
     {
-        constructAndPrintCommandHelpFormat("terminal-font", "{}", 4,
+        constructAndPrintCommandHelpFormat("terminalfont", "{}", 4,
             "Terminal font",
             "Terminal font name",
             "Termianl font size",