diff --git a/api/config.lua b/api/config.lua
index 5b06afb6..09d228e4 100644
--- a/api/config.lua
+++ b/api/config.lua
@@ -122,6 +122,8 @@ function pfUI:LoadConfig()
   pfUI:UpdateConfig("bars",       nil,           "background",       "1")
   pfUI:UpdateConfig("bars",       nil,           "glowrange",        "1")
   pfUI:UpdateConfig("bars",       nil,           "rangecolor",       "1,0.1,0.1,1")
+  pfUI:UpdateConfig("bars",       nil,           "showmacro",        "1")
+  pfUI:UpdateConfig("bars",       nil,           "showkeybind",      "1")
   pfUI:UpdateConfig("bars",       nil,           "hunterbar",        "1")
   pfUI:UpdateConfig("bars",       nil,           "hide_time",        "1")
   pfUI:UpdateConfig("bars",       nil,           "hide_actionmain",  "0")
diff --git a/modules/actionbar.lua b/modules/actionbar.lua
index bd4e84bc..3f2943ff 100644
--- a/modules/actionbar.lua
+++ b/modules/actionbar.lua
@@ -499,16 +499,24 @@ pfUI:RegisterModule("actionbar", function ()
       border:SetTexture(0,1,0,.75)
 
       local hotkey = _G[actionbutton..i..'HotKey']
-      hotkey:SetAllPoints(button)
-      hotkey:SetFont(pfUI.font_square, C.global.font_size -2, "OUTLINE")
-      hotkey:SetJustifyH("RIGHT")
-      hotkey:SetJustifyV("TOP")
+      if C.bars.showkeybind == "1" then
+        hotkey:SetAllPoints(button)
+        hotkey:SetFont(pfUI.font_square, C.global.font_size -2, "OUTLINE")
+        hotkey:SetJustifyH("RIGHT")
+        hotkey:SetJustifyV("TOP")
+      else
+        hotkey:SetAlpha(0)
+      end
 
       local name = _G[actionbutton..i..'Name']
-      name:SetAllPoints(button)
-      name:SetFont(pfUI.font_square, C.global.font_size -2, "OUTLINE")
-      name:SetJustifyH("CENTER")
-      name:SetJustifyV("BOTTOM")
+      if C.bars.showmacro == "1" then
+        name:SetAllPoints(button)
+        name:SetFont(pfUI.font_square, C.global.font_size -2, "OUTLINE")
+        name:SetJustifyH("CENTER")
+        name:SetJustifyV("BOTTOM")
+      else
+        name:SetAlpha(0)
+      end
     end
   end
 end)
diff --git a/modules/gui.lua b/modules/gui.lua
index 18ea44fd..b8767d1a 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -916,6 +916,8 @@ pfUI:RegisterModule("gui", function ()
   pfUI.gui:CreateConfig(pfUI.gui.bar, "Enable Action Bar Backgrounds", C.bars, "background", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.bar, "Enable Range Display On Hotkeys", C.bars, "glowrange", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.bar, "Range Display Color", C.bars, "rangecolor", "color")
+  pfUI.gui:CreateConfig(pfUI.gui.bar, "Show Macro Text", C.bars, "showmacro", "checkbox")
+  pfUI.gui:CreateConfig(pfUI.gui.bar, "Show Hotkey Text", C.bars, "showkeybind", "checkbox")
   pfUI.gui:CreateConfig(pfUI.gui.bar, "Enable Range Based Auto Paging (Hunter)", C.bars, "hunterbar", "checkbox")
 
   pfUI.gui:CreateConfig(pfUI.gui.bar, "Seconds Until Action Bars Autohide", C.bars, "hide_time")