diff --git a/Heimdall.lua b/Heimdall.lua
index 358cede..bde786c 100644
--- a/Heimdall.lua
+++ b/Heimdall.lua
@@ -123,6 +123,7 @@ local function init()
     ---@field enabled boolean
     ---@field masterChannel string
     ---@field commander string
+    ---@field commands table<string, boolean>
 
     --- Data ---
     ---@class HeimdallMessengerData
@@ -240,6 +241,7 @@ local function init()
             enabled = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "enabled" }, false),
             masterChannel = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "masterChannel" }, "Agent"),
             commander = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commander" }, "Heimdállr"),
+            commands = shared.GetOrDefault(Heimdall_Data, { "config", "commander", "commands" }, {}),
         },
     }
 
diff --git a/Heimdall.toc b/Heimdall.toc
index c4a09ac..8bdab32 100644
--- a/Heimdall.toc
+++ b/Heimdall.toc
@@ -1,6 +1,6 @@
 ## Interface: 70300
 ## Title: Heimdall
-## Version: 2.11.0
+## Version: 2.12.0
 ## Notes: Watches over areas and alerts when hostiles spotted
 ## Author: Cyka
 ## SavedVariables: Heimdall_Data
diff --git a/Heimdall.zip b/Heimdall.zip
index 9923efd..31937ad 100644
--- a/Heimdall.zip
+++ b/Heimdall.zip
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ae446869148dfc8987fce98fd6b80ef6510e0a4ab39f7d872194ca3bdd04dd0
-size 20965
+oid sha256:ce3fc2a76c3339b9f298aceaefd15d29443030867d7203043d39a69ae912687d
+size 21212
diff --git a/Modules/Commander.lua b/Modules/Commander.lua
index 54138f6..adbfc29 100644
--- a/Modules/Commander.lua
+++ b/Modules/Commander.lua
@@ -191,8 +191,11 @@ function shared.Commander.Init()
 		sender = string.match(sender, "^[^-]+")
 
 		for _, command in ipairs(commands) do
-			if not command.commanderOnly or
-				(command.commanderOnly and sender == Heimdall_Data.config.commander.commander) then
+			local enabled = Heimdall_Data.config.commander.commands[command.keywordRe] == true or false
+			if enabled and
+				(not command.commanderOnly
+					or (command.commanderOnly
+						and sender == Heimdall_Data.config.commander.commander)) then
 				if msg:match(command.keywordRe) then
 					local messages = command.callback({ strsplit(" ", msg) })
 					for _, message in ipairs(messages) do
diff --git a/Weakauras/Config/export b/Weakauras/Config/export
index 196ce98..5e41a29 100644
--- a/Weakauras/Config/export
+++ b/Weakauras/Config/export
@@ -1 +1 @@
-!TZvBVTXXX)VlgOa2i2c6b)qsqtrfvKRTScLIo6yeKgkT84sYT8UBzVhKeDBi8d)dAqJrtrFaf4FqAAksrlcqqDCStvSJTFH)cq(LOX9BrNz37oU7XBpsrrL2x0OeP7MDMF7SZm7S7E7UP6cvRu1YTQvD8FHh5rHompAvRnUAL1VC5vRA1G7fAXUoTA5fwSQLn3H7dmwEbX)UO43lj(9zXFhc4Wc64q6wHUp8Y3RtvRUB0OranSA55RA5tBY4Ev62bQIqbhi(vTUOp769251Ji19jHKE7ub0fsuylU)gDcbjcK1jqniQwwsHs44nB6a)nkG(Q0a7Q1QA1M2TQf1JuZHcnqpIlv5160gKiNqKV9y1dBjvFOjncIsy2L63L7PxbkyeJEkxQyU041Yw8GqgwGeN0xhvlNFUZFoe0ZAqrjoomIN9yu0HCLb2ZnEDfunV2Dtqk5nZA65hcjZRtuOgIUGmmrmxc8E8qwJUR0I45rDgIR1YnPyOISwZWKd1RPWCpVETJ106YYQHQYfksv0euwnxh8LBa(uFwDfNHvSMQxQQoO1QYOdV4qDWlYTg1x3Eq2VA5xk(FqRlTdgfPRCUmpr3jPsg2YNhg6qRWCtcc0jLO3OQfI9rL1EtFEuhTkhXdYb4dXfLNxjgg5zfUJdPtaTAPupFhOoq1xgvK8MTcJomxwOS7UNOBHOoLecyUDWWRwG1Blk3VoiCjKSizZ8PDghBpE9U5f29mHPX0JpBeFD(1AbP1WwNeifcgYJS0rXlVWiU4qLEcLxC(e3mqwpvGXO6fm0ZrlsnBFn1q686BMjY(CtGESOw3iPkXA6X9r3YqLPuovEkBzQ2ZFOR20EVLfTNlY9v7WRqm)(0LYQcZGUucvAVw8efr8yMUgtsVj1EFQDLw674bpnf0Vqs0(8Zn)5gnGxqmnqF(5wmngXdsUSlXjjwi51zy(mxAqa4ttZOP8(mmN2z)F500h2sF8j9XVYKDBguR1JOovsRzPLqJuQYCUjnLMPuR5LXulDRA2LSPENICClCmoRLzvgU6usyRTOD4(HkrE6eNHz9o3XCwVKP4ob93GzCVCqalim)zJNuwgGxY0S8XOKGeHY4nYw8eTiIdxc7IMhA2(Wk9VN0UuQZb3bAdupMxtJljquDJY2KoH8ZFiviO62dIoJR303gFx7x4yOxvYOJ7Ygov803MHdBD()dnSvCwdB0WUryRmrOj5pulo)bVMzjWGbluYCf)2mmL1f(oEIAfnCs2oAAH4XtAIaD78ZTpNCsu6LFmf)lY3vXNy3oTtGoPzypHx87ah0mWWyNnYTwKJt3PkuvQYXYRAkEPJMPySjfYz41XKHo)VwuMGqJzQhFeR6aYt0GfD8Pny7ROy0xoUEskzYNbwgx3SiOG6YfJuOfTn5XejIRgua)(inuX0mPRdzurE(5XMoROPqmTrf5)1xcE5Cclte54zE5u7w8HdRL82mCyTfw4)6Zvm6NIUGOHCdxM6OIuv5suMB9N9jooP(cBURlXd9aJjVLcJhtJYQudzRXz44Rlu8x9DIMVYW(zmUplS74(0Id5lJlCXzzi6XWi7jHH2(tBh24a9ya0CelnDFy19KFgj5NrD43ZuJ4e(HvlVWzNoDqSRumAG2UujEFY)KU7RSXL2rbHCxCtnVAN6Kq5w9HjniraDsiZ(AcDXAz4DGQDsOluZe)q4bCVozESGwYNHhrQw15BlXw4zLpzDMZCMFyhIpXT3obH(IFblST3AiDFAyKVxVDcXyRVVSKt3BNACUdL49d6TMd3M40BNgrEcLO3owcEQWFnsNtc8FQER1Bh5pSg92XJhgxlWYNaUtW)N9o92H6vFiZX46s60BNxruE2IavomqwOaYGooSWtEIFS3joT49t1BhfHAWH6CBOe0ba6cuNSoeMFWjf4amxNpK70QsW8RiWdAxUNejCQr5dBAsE79ZbUpXjsAFJYAYpql7TqrEBb(H(r0r5vZIO9sIDdTpRjlzTjXpkP9wVDboUL99jDNbUoOCtUocwfhoxhlpxNaNJjxNrhh0UElM0RjKBk8AOPjXRLAAfdgtCC2(vfhkbProdXxr1CN4cT5EnynJnNP1v8oKML8q9smAHOysKpzBQ3UZjrAUyrNlMNtNJ0XN8GIfpMPCKp(ehuO4X8KJ0jhNGcfpHPCKxEickuAjl5iR2xyVqi04mhKu)Y4fcKkJ5GJ6UVxioAmMcZ7Oa5ET4tt8ciwbXkXBKQqs1bhYdLyEp1uz4ragNrhA)gLfklhjs3OkJYLYHbNC6o8orManjuneQoQ0nlCACxPcxKtlEhphdajSzqn12QLPrv1aOa1nj0EcajH1dTRwhMIC6JpuvhRJCMcD4gt(c1nGCsAOkSFAtPnuMTTwqUCUeJgMRWVAiEY8MhBhLegvfoEFiMMWSyrlial7(9uimzzoh8I3hNcHjMN8hauUBBfkFkx5HGYw2vmikmEy74LGryXHpYT1yQspiKSa3M6E1uecQ8zqlfFq6PrjfcMJoQcU62hmn1HQ8fyo0(asJhin2nO5YVj70OZsjpsABmeM0ZKFKFmZIqqYHPMO47tovnrHKhTMOeIJstuIqHnX4ViZunBcPOf0it(CxtWidjGLiIP5)K(TaNgnov4JKJzikJZ3ORSMXj9PmnACPWRPTqqdlutGVHIgdaQRNZuzfdH6s6muuXaOTQotLvmeklSl)skw8rN3wHmumyJmPTIkVyOgzfEfVWU8btzrAQyOs2SGQRHlhYMf0OjD0cndsYI2YqYSa6tKp3cml8OlzZyHMS1JSclvygTWXbI2IXmxQjTj3frPIv(mmjGPn9VI5ysGlx)MjwMeang(veBtcWM6DxaxtKbi7AZgpxM86zwtJkAzlQyaYDPpJJNIHuD1pgkQya0xaKXchdizxdurLxmu51pyKYm2)uBvmAUD9sku8rwQtbfBst0wQIki6fys88wfIkk5w(ea1OtgB8Czsh1x1HkyzkPqXnQr5wEHqPmZ9ClWydrBTfAYRxsHIBUHKx5fcvoneTcmoyP(ci0gKltrfdG26mmvMjTyKffOIYOfooqmAxnXY4auFrefuS55)L9J0LBbgMjQ6hMllnOgJpQb(SMWmsuodfscIDEMwlQrd5Hb4sRU(Mx8QRNSt74kIweVsFuhNlxpqUJ1br1e75TfifEqK2ELLTQSTvLL3calc3oBl8I)MCkIILkEBYVeL4GBpEciBgFAMS2C11xh5lYBOQjuDCl03Lwrs8141PvlFgX5sWcw2rlU)MCgc8kRwUYQBfFHG8ioVb0AzCVQLx88vT(jrbYJBW6RErSXZT3nP4lm)sZppiw94ZCdyFxryfXZxHxDwY(3JBBVpEWmcXBMS44yiR)lIuLwpRv2A1vlJfWWJcaaVY((BvhmMiXTL22akIFq6XUhpxg4HpIW8MCUtpjbtg)O9fBPKxFZRvQZ6rxOSnYQtJyJyPnQuzJxt4D2sCdTJB544(xZN0PQ11sFcCB06xl(GxGMqhorC3XTDibIt8G4uvK4gHyi7rigfq32dxflEioeh5KmCek8cO3OYWBwALHNOMsk3G5sdVU0LuUb21YEtxg5U4eFSVIVaZ1YCRzLhcMKJcNEDNCw8WdQxMJaMe0WHhPMSsMCqJ2I3ms4lLNRwf2QjpFiYZWFLmxMJskxScrWy6vhPMkcdVwcVWlK3DJyOAMEj30v00lyN4s4fMEupZ3qqlWqm8uIPlRYPht9uVLbMgCEnIV4)XcODlHQmQ7vXUmFMB1LGIsDp8UUvYqyrO8kyQ5we33wbuzUMOB430NbTgixFLwrYXek5a5j7T2vX3SfJZ9QrG2G8SQnURUxoWbtv)gGhKcP)5n6TdKTJ4a0uvWAkx81NFNV6F(r)9)1bF(Z)hF5Z)LF(Z)9pzeT)IP2RmN4kvBC81wOsMRornvBuyMJqVUZZKZE45SA5wTiWpT6T2YS6eB0RbTSLBZ8aY(e4rixj1NeebpcOW2Lbp0fMuEPAWO5LaJtGdy1kf51UnfhgDfIJR4VTI2L57WP1iEWBoeM)U8UepyjbR4tUE3AKAO1MsQJxCj8P9Qt3d(7E773iOfXffBvqyg4pGNC5bIXTGh9yKG2GUTk2PWMctrA1DBsCWtJZAx0Ns3huVFeXfujOtl8OpNluPlb1oDpY(4G1nfeCXpgXL9O7Z7T2A0q7wu8G)SwlojkObYXA8iCfixH8Sda7YvODrh)vyUWqi(GmxXNfqOyLCfFUl84UUCCjRxjQjuaA)wN42HB3QT4rOMltB6J65gK2bGvgEypNUniEaSBY8JC41rIBYUEDEa3VnXfEHBZTP7Ul8KpVjmGgG1MrbbDDzbqXBrG8UEnKBR9ABXOEI)YTB3MH)TzxhwB8bhNAOLClWl4eccdAZwp7ZGUMSN9z9wZcmy(KFkWGfTnJHToiuQohQbRwK689CzonsEoG7XSHx4oSWiSbBbeAxZreVbV5tAZ96crvwHq)leQiiEpAp)9Hqp8T2rGrVo(KNxxqrQq76zJ2LkCxoQ3qNmmTLd6DR43ULpOyvcIaoUAtNUDWpBZv92Je0cNu5BWzHeWcEnyWFFis9njeqWAuIpOmVjNh0IHgT()6(pAWDgCR(pO)xp4wI3FC)73)RG3Fu)Nm4MXuEC)dg8U9paODaW37bL(ySKb3qkjiXDfVFt497cCD3(FbiH4nG(VzW73)PdUr)Nas)LWFrooaO)Bbz)I(pyW)hq7byDiO9ea1pyWVqut3c(9tbQ)oO87bpF3(pEWTgC7(pcPn4d6FF4)UNG67bYjRT))b3gW7rqD(q4Tpu0wUF)Vb0NBH1dOv3uW3hc6dI5Ja8E8GBht5PaApvu(h1)Uyla0L3fOdAmwhcm)iaXNa67Df2LBaY)1a1)OOnFdbTBo4oaLpo2wCFSTiqg17pgQ)deycuaD(jqB9HIA8pHTfrlhRLprOB3bO9aS9iSZpwshTHicisck4tpuOppqylX6vGbGMSvChHf8U9)gb1Fv)7jSf3k2M9Nh8(cp3dbT6RHFJ((BlQTpfXgKwQHFki1bIwXFbQ)uVXGpaO8xbB8tG269e(sS2)Bql8b4tF779fF7F4dHSKdtTEeZxoMuJAjZYKWYywP8sfPN1z8zyItOKxMd1mgtzQHKmbf0nxTN9i9KNW(R51VC21RkV(oh2EkM7BC46jmtIUJxVqvRfNBHZp3svT2fp(3lIhA(Q)7d
\ No newline at end of file
+!TZvBVTXXX)VlgOaXi2c6b)qsqtrLKLRTSIKIo6yeKgkT84sYn8UBzVhKeDRj8dn4FqJrtrFafOb5FAksrlcqqDCStvSJTFH)cq(LOX9BrNz37oU7XBVJII29nnYH82DN53o7SZm7U3UlRox1kvTCRAvh)h8ipk0H5rRATXLRS2fxFLQwn4EHwSRsRU(CZx1YM7W9bcxFoX)Mx85cIppf(ziGdlOJdPBf6(qIFqNQwD3OrJaAy11NTQfXZUf3FtoZdkC5vwVYkBHzYCjHmUhkbbHe)q8H6r(Im3oSBhqGcO2CV6bvTKj94Gucy4syEJp1nyESGwJn9ahKOqqG3OdsBGSHJczuTSzjzmK3SPd8Dua9C0a7Q1QA1M2TQf1JuZHcAzpIlvjzDAdsKtis3ES6HTK6qqVocIsy2L63fLn1kqbJy0tPsfZfkxkBXdczybsCstoQuo7mN50iONYGGsCCyqFDjc6qQYa7PlxwbrZRD3eKsszwspZqizEDIc1q0f4Hjm8tG3JhYA0D5weppQZqCTwSjfnDL1AgICOEnfQ7z1RDSMwtwwnuuoBrIIgJYQ5QqF5gqFQpRUsNHvSKQxQQmO1QYidVYqzWlYTg1xxFq2V66VA8)HAxAh0ksx4Cbpp0NwkKHT85HHo0km3eJa9SsKBu0eUwYAVPppQJwLJ4bbI8b7I1NvXggPzzUJdPtaT6sP98DG6afFPvrskBfcDyUSWkdDSL1PmJaMBh08QfO92IY9RdmVeMTiI3SPoJL6XR7MxO7zcrL4XN1IVo)kTGyRyRtcKsggIJSWrPxEUr6Idv8ewF(zt6MHS1dfy0QEodEoAwQz91unPZZ3mJL9Phd5yEn3iPiXA6X9XULHcZs5u5PKLPApZHUAt9Exx0Eop3x1HxjZ89PxkRimfCPeI0ET4jcI4XmUgJJ3KQ3NQR0cVGh80Kr)Cjw7ZoZSNEudErMPg6ZoZ8P2iEqWLDjoj2cjjNIXZCPbbqFAAenL0tXyAN6)fttFyl9XN0h)kt0TPqTwpI6ujTMLAcTSsfMtpUH0mfAnViMAHBvJUKn07eeJBUNJZAzAfHRoLe2AlAhUFOILNEMtXOEN(5CuVKP4og(BWmUxmiGfeM)SXtkldWlyAw(Ovsqctz6nYw8yTiIdxa7IMhAwFyf)7X1LsDo4oqBG6X8AACjbIQBuYg3jKFMdPabv3EG1zC9MMQCx7x(5GxvYOJ7Ygov80utXHToZ)Lg2koQHnQy3iSvgl0K4hQfN)GxtTayWGfkrUItnfdzD2xWtuROHtY6OPzIhpPjc425NRpNCsu6L)CY(xeVRIpXUDQtGEwtrpHx5fqh0uqXyN1YTwKJt3jYuvkYX8RQkE1JMQO0Gc5m8AjrOZ)TfLXi0yK6YTyvhqESgSOJpTbBFfbJ(AX1tsjJ)mWY01nnmkOUCXifAwBJVnrc7QgfWNhPHkMKjDDiTkYRFU0WzfnfIj1Qi)3(sWRLJzzclpFMxo1UfF4WAjPMIdRn3CpNJvm1gxlpJd1EJCnuMa7bv54cuMB9N(zooPDb2CxxIhQ4ljCLcHzeItDifI3JdZEg7rprVDCOKDPX2uJQDIRZG8umdl750y9kn4SkGP4O8Zv87EESuOd92zCFwy3YEbNdPltp58tBhLP88lsCjS9N0WgXoDXaO1rSWK96D3t(YSKVm3HVvvTmhZxV76ZDQjtge7ngJgOTxzI0J)lwEFL9W1okiK7I7V7L7uNek3Wrp5ELYXnY1(kczXArinKRDIPB6E7QUtSHyJHj3Xx(2sSf9SYNSo5jp5pUdXN42BNGqFXhqaIERI57tdJ896TtiAB9dLLaHnQX5qKdVFuVvD42eNE70iYtie92Xsqtf(Bq68sa9aX1POLHh1)49wT3oY)yn6TJhpmUgHf0bCMux)8R1BhQx9HehxhUKo9251fLNTiq8ddKfkGmOJdl8LsR4tiY8492rHZgCOI3gdbcuaceuXSoeMFWljadiUoFi1P1NG4xxGh0qDFjmJJpkDy7tsBVFbq9XowCJCect(dACVdYW7kqp0pIokTAkfTejQoufTQSKvhNUvzEVZ7wq)4I((KUt5EsOCt9KeS6MGEswE9KcWEr3tcnU3Hj7gf8nbDJO(jPBmv)kM7aXXz7ZrcjjA6mz(6Q68K(uBUxdwZyDAADfVpUzZEOCjgnrumjYNSn1B3zKintmRZetZjYH74ZhrXShtuo8hFUikK9yAYH7Kd9qHSNquo8lpQdfYTKKC4vBFakecnkZbj13FFHaPsyo4OEgbkehnctH5AkqUxl(KyVaSvGTs829k4uDWJ8qjMwWx)y)uVJD8js)J4uMUhudg5fklhos3vnJ8LsHH(60TJES0eACKJ(qTBlDdoNKoVuMlQlmExAlbGeYmiMABp0KiQAauG4MyOpgGKq6HUhxhMI67l3IvhRJCCdD4kj6H6MMoonufYpHPGikZnxZwxovJrT2vOphl9KjBxQBtcH5Gr8oPmjgDXSwG5w2DSQqyYsCo4fVtufctmn5p4OC)clK)uQYdbLnDSyqui8W6gMGryXgtYnMzIcwi4SGUn1DBQieuPZGukEL6tIqkymhzufC1nazsQdv(lqDO9IWkhinYni5Y3Q8KiZsopssBmeMKZK)KVo2IqqsHPMO4nSornrbNhTMOeIJstuIqHnX43MZen3cjRf0itEvzJX4ejGLWsjtkk91jojcEkZhP(NHOuwxKUWAgN0NmJr5JtocCIrmpXiAsCj4RQTaudlquuJgkQeauxhPPYkgc1LsAOOIbqB1KMkRyiuwqz(Lum7JodXcjOyWgz6HfvEXqnYkllEbL5dMYIdvXqnBZmQU2XCY2mJgvPJwOzqswLyMSmZG(sgYTaZmp6AenwOjD9iRLtfMrlSmq0w2N5snjn5UCnvSYNGXbmTPwwmfJdC52VzIKXbqJMFfr24aSjV7cOASuazxfy5uzQxpZ6LurlBrfdqUlRQmAkgs1vwzOOIbqFXvglSeqYU(QIkVyOYZpyKYm6FQTcjTUD9skK9rwgvbfBss0wgKki6fyI98wHJkk5w(ya1OZWRCQmjJ6ROrfSmLui7gLOClVqOuwvqUfySHOTUfn(1lPq2n3qYR8cHkNgIwbghSuFXjAdYLPOIbqBnmMkZKumYknurz0cldeJ6vtKugG6RmPGIhtGckeNGcMgz23QyUfyycTQVcXS5b1y8jPWN1eMyJYrerMHyJ1P1IA0qEwhUWkRT55V8AjhKaC5vZJ3BsQJZfRhi3q(GOAIT03c4cpTxBV8Iwv22QYIBbGfH7wVfEfVfhsIys3m(GHzT5kRTw6jc4cuIdEsaWdEGeB8ql4nu0K3XA7q2U0kYmFdEDA11pP4yxy5tBY4EsbpuCHYfZBZJ48wqtfVX4Rp)zQA9ErbYJsXARCEqcXHcVIpPtvRRK(eRE85Bc0Ull0HYR2EvRZ7ZUAVDEZisDFXUuwbqOHpE(tcXmeN6e51w)8yUsHXA5TwzL1XdcJ9UjsYzNDHzNfAEyvrEZnVYsDwl6SRBJN1H9P1Vs85ZajbuABjAzj6BQtJ47e)sBuPYgVbEWw8QZchsIdNiUG(2oKaXzPqCEns0Gq3N9izgfq32dxhkE8qehMLmuekQguvuz4nNTYWZQZsk3q7LgEDWxs5gMxl7n5zK7Au8HBl(cAxlZTcwE8AsobN61DYznepRQzoOBsqdhEyDYYzYryAlEZiXn)F4HEzXwTiWFT6T6IS6eBCYHGB0ITzEq2(e4rxcuxKGi4rO6y7YGh6cZezPAqiSLCG1q4a(Qlf51UnfJDSmXXv8DRODz(oCAnIhKYHW83L3L4bZdAzFYv7wJud47CusD8USGpTxD6EW37TVFJGwexKTvaMzGgcEYLhi8YGh9yKG2GSTcU(fBkmUWk72K4GNfIvpVpLUpiE)eIlisWCoGh95CHiDbO2P7r2hdT0uKHlUcSl6r3N3B1vPH2TO4XUy1wCsuqdKIv5r40UUe5Pha6Llr76GFXCzUeFGNl5ZciuSsUKp3fECxxoop9lf1eka1FRrC7WTB1w8iuZRJhHpqo3G0oa0YWd750TbXdGDtMFKdVoM5MSRwNhW9BtCHeCBUnD3DHN85nb3oaRnJcc66YcGI3IaMQEnK7A4QBXOEIV52TBZWVB21H1gFWXPgQj3c6fCcbMbPzRN(fGXk7PFrVvTafMp5NbeyrBZyyRdSIQZHAWQfPoFpxMtJKNd4EmBib3HfgHnyliJ21CegMqkFsBUxxWQYkeIAIqfvJ4hTN)(GPhMQDeO0RJp551feKk0UE2OEPc3LJYneaen5DWE3k(TB5dcwLGiGIl30PBhCTQx2BpsqlCK03IZcjGg8kqikFWs9TjeGXAuIpimVnNh0IHkT()M(pCWThCZ(3V)3o4MI0pQ)96)nq6h2)XdUrCopQ)bdE)(ha5Daq3haL(iSKbxxYjWXDePVbK(oav3P)xbCisb5)Bh8H9FYGR3)Xa3Fn8nsXbq()oG3VQ)9h8lH8UpwhI8EmG6hn4)tut3e(8jqU)EO87cpFN(pAWnhCR(peZBWh1)EW)FxrUFaWNS2(tdUfG3dH68bqQpw0wUx)VdKNBI1div3qq3hdYdI5db8E0GBfNZta0EIO8pP)DWwailVpKpiXyDiW8taeFmiV3rOxUoW)3c5()lAZxxK3ngCBiNpnwxCpSTiqgL7pfQ)deyc5aY8JH26de14FgBlIwowlFMq2UnK39X2Jqp)iz(OoerarsKd(0deYZ9f6sSEfyaOjBf3wObVt)VtK7VU)Df6IBgRZ(ld(qrp3daP6BHpX((BjQTphXg4wkHFoW1bIwXFfQ)0EJbFeKZFd0XpgAR3v0xI1(FhAH3hF67)GV67)JFmeLCyO1Jy8YscnQfmltalJrLYluKEuNYJWehqjVihQrmMWqdjrckWnx1ZEep5X0Fnp)YPNxvE(ohwpfZ(ghopHPI19WRYyLm3P1LuUFPIPjMEdARnC(i1uUDMV8lN3veD4SzsVR)6ZNj93zaXVfbHPxnI8NVuqbZxA4XuxNxLJV(M(p9lDJcupd99UMYPY)AANkFd1J(LPUYOZsurVnBMl)UihfzB4pjalzy2LHYFPkQOP0XFwseqL5xtJn8B6ZGwg4zwPvKCXHl5aoMOFhKYwSG3ZfbsdsZk24Xk7Ibo4SeFlOhMclGJ3awNGpJGtnsvaRP87dYZU938V(K)X)(GV8z)ZV(z)QV8z)HhpI0FEohceifFTJeU6nXi(2DwjZnmTMQokmZnnuVZ1uNK8U0PP1Ixwa0Np)mZDMzwOQ1U4bpFE846x9)a
\ No newline at end of file
diff --git a/Weakauras/Config/init.lua b/Weakauras/Config/init.lua
index 7486845..02fc532 100644
--- a/Weakauras/Config/init.lua
+++ b/Weakauras/Config/init.lua
@@ -1,12 +1,12 @@
 ---@param str string
 ---@return table<string, boolean>
-local function StringToMap(str)
+local function StringToMap(str, deliminer)
 	if not str then return {} end
 	local map = {}
-	local parts = { strsplit("\n", str) }
+	local parts = { strsplit(deliminer, str) }
 	for _, line in ipairs(parts) do
 		line = strtrim(line)
-		if line ~= "" then 
+		if line ~= "" then
 			map[line] = true
 		end
 	end
@@ -15,10 +15,10 @@ end
 
 ---@param str string
 ---@return string[]
-local function StringToArray(str)
+local function StringToArray(str, deliminer)
 	if not str then return {} end
 	local ret = {}
-	local array = { strsplit("\n", str) }
+	local array = { strsplit(deliminer, str) }
 	for i, line in ipairs(array) do
 		line = strtrim(line)
 		if line ~= "" then
@@ -43,11 +43,11 @@ local config = {
 	},
 	who = {
 		enabled = aura_env.config.who.enabled,
-		ignored = StringToMap(aura_env.config.who.ignored),
+		ignored = StringToMap(aura_env.config.who.ignored, "\n"),
 		notifyChannel = aura_env.config.who.notifyChannel,
 		ttl = aura_env.config.who.ttl,
 		doWhisper = aura_env.config.who.doWhisper,
-		zoneNotifyFor = StringToMap(aura_env.config.who.zoneNotifyFor),
+		zoneNotifyFor = StringToMap(aura_env.config.who.zoneNotifyFor, "\n"),
 	},
 	messenger = {
 		enabled = aura_env.config.messenger.enabled,
@@ -61,8 +61,8 @@ local config = {
 		zoneOverride = aura_env.config.deathReporter.zoneOverride,
 		duelThrottle = aura_env.config.deathReporter.duelThrottle,
 	},
-	whisperNotify = StringToArray(aura_env.config.whisperNotify),
-	stinkies = StringToMap(aura_env.config.stinkies),
+	whisperNotify = StringToArray(aura_env.config.whisperNotify, "\n"),
+	stinkies = StringToMap(aura_env.config.stinkies, "\n"),
 	inviter = {
 		enabled = aura_env.config.inviter.enabled,
 		listeningChannel = aura_env.config.inviter.listeningChannel,
@@ -94,12 +94,13 @@ local config = {
 	},
 	macroer = {
 		enabled = aura_env.config.macroer.enabled,
-		priority = StringToArray(aura_env.config.macroer.priority),
+		priority = StringToArray(aura_env.config.macroer.priority, "\n"),
 	},
 	commander = {
 		enabled = aura_env.config.commander.enabled,
 		masterChannel = aura_env.config.commander.masterChannel,
 		commander = aura_env.config.commander.commander,
+		commands = StringToMap(aura_env.config.commander.commands, ","),
 	},
 }
 
@@ -158,6 +159,7 @@ Heimdall_Data.config.macroer.priority = config.macroer.priority
 Heimdall_Data.config.commander.enabled = config.commander.enabled
 Heimdall_Data.config.commander.masterChannel = config.commander.masterChannel
 Heimdall_Data.config.commander.commander = config.commander.commander
+Heimdall_Data.config.commander.commands = config.commander.commands
 
 Heimdall_Data.config.whisperNotify = config.whisperNotify
 Heimdall_Data.config.stinkies = config.stinkies