diff --git a/api/config.lua b/api/config.lua
index 15f94f95..8065ae11 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -210,6 +210,31 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("unitframes", nil,           "clickcast_alt",    "")
   pfUI:UpdateConfig("unitframes", nil,           "clickcast_ctrl",   "")
 
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast",        "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast_shift",  "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast_alt",    "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast_ctrl",   "")
+
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast2",        "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast2_shift",  "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast2_alt",    "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast2_ctrl",   "")
+
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast3",        "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast3_shift",  "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast3_alt",    "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast3_ctrl",   "")
+
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast4",        "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast4_shift",  "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast4_alt",    "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast4_ctrl",   "")
+
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast5",        "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast5_shift",  "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast5_alt",    "")
+  pfUI:UpdateConfig("unitframes", nil,           "clickcast5_ctrl",   "")
+
   pfUI:UpdateConfig("unitframes", "player",      "showPVPMinimap",   "0")
   pfUI:UpdateConfig("unitframes", "player",      "showRest",         "0")
   pfUI:UpdateConfig("unitframes", "player",      "energy",           "1")
diff --git a/modules/gui.lua b/modules/gui.lua
index d724b222..c49c8188 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -1537,11 +1537,38 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
       CreateConfig(nil, T["Show Procs of all Classes"], C.unitframes, "all_procs", "checkbox")
       CreateConfig(nil, T["Buff Indicator Size"], C.unitframes, "indicator_size")
       CreateConfig(nil, T["Only Show Indicators for Dispellable Debuffs"], C.unitframes, "debuffs_class", "checkbox")
-      CreateConfig(nil, T["Clickcast Spells"], nil, nil, "header")
+    end)
+
+    CreateGUIEntry(T["Group Frames"], T["Click Casting"], function()
+      CreateConfig(nil, T["Left Mouse Button"], nil, nil, "header")
       CreateConfig(nil, T["Click Action"], C.unitframes, "clickcast", nil, nil, nil, nil, "STRING")
       CreateConfig(nil, T["Shift-Click Action"], C.unitframes, "clickcast_shift", nil, nil, nil, nil, "STRING")
       CreateConfig(nil, T["Alt-Click Action"], C.unitframes, "clickcast_alt", nil, nil, nil, nil, "STRING")
       CreateConfig(nil, T["Ctrl-Click Action"], C.unitframes, "clickcast_ctrl", nil, nil, nil, nil, "STRING")
+
+      CreateConfig(nil, T["Right Mouse Button"], nil, nil, "header")
+      CreateConfig(nil, T["Click Action"], C.unitframes, "clickcast2", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Shift-Click Action"], C.unitframes, "clickcast2_shift", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Alt-Click Action"], C.unitframes, "clickcast2_alt", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Ctrl-Click Action"], C.unitframes, "clickcast2_ctrl", nil, nil, nil, nil, "STRING")
+
+      CreateConfig(nil, T["Middle Mouse Button"], nil, nil, "header")
+      CreateConfig(nil, T["Click Action"], C.unitframes, "clickcast3", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Shift-Click Action"], C.unitframes, "clickcast3_shift", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Alt-Click Action"], C.unitframes, "clickcast3_alt", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Ctrl-Click Action"], C.unitframes, "clickcast3_ctrl", nil, nil, nil, nil, "STRING")
+
+      CreateConfig(nil, T["Mouse Button 4"], nil, nil, "header")
+      CreateConfig(nil, T["Click Action"], C.unitframes, "clickcast4", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Shift-Click Action"], C.unitframes, "clickcast4_shift", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Alt-Click Action"], C.unitframes, "clickcast4_alt", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Ctrl-Click Action"], C.unitframes, "clickcast4_ctrl", nil, nil, nil, nil, "STRING")
+
+      CreateConfig(nil, T["Mouse Button 5"], nil, nil, "header")
+      CreateConfig(nil, T["Click Action"], C.unitframes, "clickcast5", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Shift-Click Action"], C.unitframes, "clickcast5_shift", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Alt-Click Action"], C.unitframes, "clickcast5_alt", nil, nil, nil, nil, "STRING")
+      CreateConfig(nil, T["Ctrl-Click Action"], C.unitframes, "clickcast5_ctrl", nil, nil, nil, nil, "STRING")
     end)
 
     -- Shared Unit- and Groupframes