diff --git a/Releases/nrg-1.2.3.zip b/Releases/nrg-1.2.3.zip
new file mode 100644
index 0000000..d8ce125
Binary files /dev/null and b/Releases/nrg-1.2.3.zip differ
diff --git a/nrg/Battery.lua b/nrg/Battery.lua
index 21d3593..021b953 100644
--- a/nrg/Battery.lua
+++ b/nrg/Battery.lua
@@ -274,8 +274,8 @@ function A:InitializeConfigSettings()
 	end
 
 	local x,y = NRGPowerButton:GetPoint();
-	self:SetOption(CONFIG_KEY_PowerButtonPosX, Buffalo_GetOption(CONFIG_KEY_PowerButtonPosX, x))
-	self:SetOption(CONFIG_KEY_PowerButtonPosY, Buffalo_GetOption(CONFIG_KEY_PowerButtonPosY, y))
+	self:SetOption(CONFIG_KEY_PowerButtonPosX, self:GetOption(CONFIG_KEY_PowerButtonPosX, x))
+	self:SetOption(CONFIG_KEY_PowerButtonPosY, self:GetOption(CONFIG_KEY_PowerButtonPosY, y))
 
 	local value = self:GetOption(CONFIG_KEY_PowerButtonVisible, CONFIG_DEFAULT_PowerButtonVisible);
 	if type(value) == "boolean" then
diff --git a/nrg/ReadMe.txt b/nrg/ReadMe.txt
index 51e92a7..7383e0e 100644
--- a/nrg/ReadMe.txt
+++ b/nrg/ReadMe.txt
@@ -8,6 +8,11 @@ No config, no switches, no nothing. Well almost: you can move the power button b
 
 Version history:
 ----------------
+NRG version 1.2.3
+* Fixed LUA error while initializing addon.
+* Removed retail support after Shadowlands went live.
+
+
 NRG version 1.2.2
 * Fixed LUA error, caused by a reference to the NRG configuration, which does not exist.
 * Added (untestet) support for WotLK
diff --git a/nrg/nrg-Classic.toc b/nrg/nrg-Classic.toc
index ae0518a..7d58944 100644
--- a/nrg/nrg-Classic.toc
+++ b/nrg/nrg-Classic.toc
@@ -1,6 +1,6 @@
 ## Title: NRG - mp5 Power Button
 ## Notes: Addon to check mp5 rule
-## Version: 1.2.2
+## Version: 1.2.3
 ## Author: Mimma @ <EU-Pyrewood Village>
 ## Interface: 11403
 ## SavedVariables: NRG_Options
diff --git a/nrg/nrg-Retail.toc b/nrg/nrg-Retail.toc
deleted file mode 100644
index c3fa7e6..0000000
--- a/nrg/nrg-Retail.toc
+++ /dev/null
@@ -1,13 +0,0 @@
-## Title: NRG - mp5 Power Button
-## Notes: Addon to check mp5 rule (yeah, I know .. irrelevant for retail, but anyway)
-## Version: 1.2.2
-## Author: Mimma @ <EU-Pyrewood Village>
-## Interface: 90205
-## SavedVariables: NRG_Options
-## X-Expansion-Level: 9
-## X-Curse-Project-ID: 637056
-## X-WoWI-ID: 26352
-## X-Wago-ID: rkGrarKy
-
-DigamAddonLib.lua
-Battery.xml
diff --git a/nrg/nrg-TBC.toc b/nrg/nrg-Wrath.toc
similarity index 79%
rename from nrg/nrg-TBC.toc
rename to nrg/nrg-Wrath.toc
index 87f66d2..38db138 100644
--- a/nrg/nrg-TBC.toc
+++ b/nrg/nrg-Wrath.toc
@@ -1,10 +1,10 @@
 ## Title: NRG - mp5 Power Button
 ## Notes: Addon to check mp5 rule
-## Version: 1.2.2
+## Version: 1.2.3
 ## Author: Mimma @ <EU-Pyrewood Village>
-## Interface: 20504
+## Interface: 30400
 ## SavedVariables: NRG_Options
-## X-Expansion-Level: 2
+## X-Expansion-Level: 3
 ## X-Curse-Project-ID: 637056
 ## X-WoWI-ID: 26352
 ## X-Wago-ID: rkGrarKy
diff --git a/nrg/nrg.toc b/nrg/nrg.toc
index d4be0ff..46aa231 100644
--- a/nrg/nrg.toc
+++ b/nrg/nrg.toc
@@ -1,6 +1,6 @@
 ## Title: NRG - mp5 Power Button
 ## Notes: Addon to check mp5 rule (yeah, I know .. irrelevant for retail, but anyway)
-## Version: 1.2.2
+## Version: 1.2.3
 ## Author: Mimma @ <EU-Pyrewood Village>
 ## Interface: 30400
 ## SavedVariables: NRG_Options
diff --git a/nrg/nrg.wowproj b/nrg/nrg.wowproj
index 921c769..ee0b2c3 100644
--- a/nrg/nrg.wowproj
+++ b/nrg/nrg.wowproj
@@ -23,7 +23,7 @@
     <Content Include="Bmp\power4.png" />
     <Content Include="Bmp\power5.bmp" />
     <Content Include="Bmp\power5.png" />
-    <Content Include="nrg-TBC.toc">
+    <Content Include="nrg-Wrath.toc">
       <SubType>TableOfContents</SubType>
     </Content>
     <Content Include="nrg-Classic.toc">