diff --git a/Isuldor_bertox.ini b/Isuldor_bertox.ini
deleted file mode 120000
index 9008311..0000000
--- a/Isuldor_bertox.ini
+++ /dev/null
@@ -1 +0,0 @@
-/home/meeseeks/eq/Isuldor_bertox.ini
\ No newline at end of file
diff --git a/UI_Isuldor_bertox.ini b/UI_Isuldor_bertox.ini
deleted file mode 120000
index cf4f96e..0000000
--- a/UI_Isuldor_bertox.ini
+++ /dev/null
@@ -1 +0,0 @@
-/home/meeseeks/eq/UI_Isuldor_bertox.ini
\ No newline at end of file
diff --git a/eqclient.ini b/eqclient.ini
deleted file mode 120000
index 93a94ec..0000000
--- a/eqclient.ini
+++ /dev/null
@@ -1 +0,0 @@
-/home/meeseeks/eq/eqclient.ini
\ No newline at end of file
diff --git a/ir_black.ini b/ir_black.ini
index bad0f86..f7546a3 100644
--- a/ir_black.ini
+++ b/ir_black.ini
@@ -411,3 +411,11 @@ User_102_Blue=78
 User_103_Red=78
 User_103_Green=78
 User_103_Blue=78
+#FF6C60 red
+User_104_Red=255
+User_104_Green=108
+User_104_Blue=96
+#FF6C60 red
+User_105_Red=255
+User_105_Green=108
+User_105_Blue=96
diff --git a/ui/EQUI_Animations.diff b/ui/EQUI_Animations.diff
old mode 100755
new mode 100644
index 4423854..ca5d1a9
--- a/ui/EQUI_Animations.diff
+++ b/ui/EQUI_Animations.diff
@@ -1,6 +1,6 @@
---- default/EQUI_Animations.xml	2016-07-01 11:56:28.000000000 -0700
-+++ isuldor/EQUI_Animations.xml	2016-09-11 23:06:27.691465300 -0700
-@@ -153,6 +153,24 @@
+--- /mnt/d/EverQuest/uifiles/default/EQUI_Animations.xml	2018-06-11 17:34:54.000000000 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Animations.xml	2018-07-31 13:44:32.538271000 -0700
+@@ -93,6 +93,24 @@
  			<CY>256</CY>
  		</Size>
  	</TextureInfo>
diff --git a/ui/EQUI_ChatWindow.diff b/ui/EQUI_ChatWindow.diff
deleted file mode 100755
index e69de29..0000000
diff --git a/ui/EQUI_HotButtonWnd.diff b/ui/EQUI_HotButtonWnd.diff
old mode 100755
new mode 100644
index e08880a..1083534
--- a/ui/EQUI_HotButtonWnd.diff
+++ b/ui/EQUI_HotButtonWnd.diff
@@ -1,5 +1,5 @@
---- default/EQUI_HotButtonWnd.xml	2013-04-12 18:05:58.000000000 -0700
-+++ isuldor/EQUI_HotButtonWnd.xml	2016-09-11 23:14:09.220464400 -0700
+--- /mnt/d/EverQuest/uifiles/default/EQUI_HotButtonWnd.xml	2018-05-25 12:26:04.000000000 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_HotButtonWnd.xml	2018-07-31 14:33:29.908768600 -0700
 @@ -4,11 +4,7 @@
  	<Ui2DAnimation item="A_HotButton1Normal">
  		<Cycle>true</Cycle>
@@ -791,7 +791,7 @@
  		<Size>
  			<CX>37</CX>
  			<CY>32</CY>
-@@ -1168,10 +924,6 @@
+@@ -1161,10 +917,6 @@
  	</SpellGem>
  	<InvSlot item="HB_InvSlot">
  		<ScreenID>HB_InvSlot</ScreenID>
@@ -802,7 +802,7 @@
  		<Size>
  			<CX>37</CX>
  			<CY>34</CY>
-@@ -1787,9 +1539,10 @@
+@@ -1705,9 +1457,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -814,7 +814,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1814,9 +1567,10 @@
+@@ -1732,9 +1485,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -826,7 +826,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1841,9 +1595,10 @@
+@@ -1759,9 +1513,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -838,7 +838,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1868,9 +1623,10 @@
+@@ -1786,9 +1541,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -850,7 +850,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1895,9 +1651,10 @@
+@@ -1813,9 +1569,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -862,7 +862,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1922,9 +1679,10 @@
+@@ -1840,9 +1597,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -874,7 +874,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1949,9 +1707,10 @@
+@@ -1867,9 +1625,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -886,7 +886,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -1976,9 +1735,10 @@
+@@ -1894,9 +1653,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -898,7 +898,7 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -2003,9 +1763,10 @@
+@@ -1921,9 +1681,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
@@ -910,7 +910,19 @@
  		<Style_Sizable>true</Style_Sizable>
  		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
-@@ -2030,9 +1791,10 @@
+@@ -1948,9 +1709,10 @@
+ 			<CY>53</CY>
+ 		</Size>
+ 		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
++		<Style_Transparent>true</Style_Transparent>
+ 		<Style_Qmarkbox>true</Style_Qmarkbox>
+ 		<Style_Closebox>true</Style_Closebox>
+-		<Style_Border>true</Style_Border>
++		<Style_Border>false</Style_Border>
+ 		<Style_Sizable>true</Style_Sizable>
+ 		<Style_ClientMovable>true</Style_ClientMovable>
+ 		<Escapable>false</Escapable>
+@@ -1975,9 +1737,10 @@
  			<CY>53</CY>
  		</Size>
  		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
diff --git a/ui/EQUI_PlayerWindow.diff b/ui/EQUI_PlayerWindow.diff
old mode 100755
new mode 100644
index 81d0f1a..c8c8089
--- a/ui/EQUI_PlayerWindow.diff
+++ b/ui/EQUI_PlayerWindow.diff
@@ -1,44 +1,54 @@
---- default/EQUI_PlayerWindow.xml	2014-02-14 11:00:32.000000000 -0800
-+++ isuldor/EQUI_PlayerWindow.xml	2016-09-11 22:49:26.471918600 -0700
-@@ -395,16 +395,32 @@
- 		</GaugeDrawTemplate>
- 		<AutoStretch>true</AutoStretch>
- 		<TopAnchorOffset>1</TopAnchorOffset>
--		<BottomAnchorOffset>45</BottomAnchorOffset>
-+		<BottomAnchorOffset>42</BottomAnchorOffset>
- 		<LeftAnchorOffset>2</LeftAnchorOffset>
+--- /mnt/d/EverQuest/uifiles/default/EQUI_PlayerWindow.xml	2018-04-09 20:54:48.000000000 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml	2018-07-31 18:16:39.365099800 -0700
+@@ -363,7 +363,7 @@
  		<RightAnchorToLeft>false</RightAnchorToLeft>
+ 		<LeftAnchorToLeft>false</LeftAnchorToLeft>
+ 	</Button>
+-	
++
+ 	<Gauge item="Player_HP">
+ 		<ScreenID>PlayerHP</ScreenID>
+ 		<TextColor>
+@@ -375,10 +375,10 @@
+ 		<TextOffsetX>1</TextOffsetX>
+         <TextOffsetY>-2</TextOffsetY>
+ 		<GaugeOffsetY>34</GaugeOffsetY>
+-		<FillTint>
++        <FillTint>
+ 			<R>240</R>
+ 			<G>0</G>
+-			<B>0</B>
++            <B>0</B>
+ 		</FillTint>
+ 		<EQType>1</EQType>
+ 		<GaugeDrawTemplate>
+@@ -388,43 +388,48 @@
+ 			<EndCapLeft>A_GaugeEndCapLeft</EndCapLeft>
+ 			<EndCapRight>A_GaugeEndCapRight</EndCapRight>
+ 		</GaugeDrawTemplate>
+-		<AutoStretch>true</AutoStretch>
++        <AutoStretch>true</AutoStretch>
+ 		<TopAnchorOffset>1</TopAnchorOffset>
+ 		<BottomAnchorOffset>45</BottomAnchorOffset>
+ 		<LeftAnchorOffset>2</LeftAnchorOffset>
+ 		<RightAnchorOffset>1</RightAnchorOffset>
+-		<RightAnchorToLeft>false</RightAnchorToLeft>
++        <RightAnchorToLeft>false</RightAnchorToLeft>
  	</Gauge>
 -   
+-	<Label item="Player_HPLabel">
+-		<ScreenID>HPLabel</ScreenID>
+-		<EQType>19</EQType>
 +	<Label item="Player_HPLabelShadow">
 +		<ScreenID>HPLabelShadow</ScreenID>
 +		<EQType>17</EQType>
-+		<RelativePosition>true</RelativePosition>
+ 		<RelativePosition>true</RelativePosition>
+-		<Text>100</Text>
 +		<TextColor>
 +			<R>0</R>
 +			<G>0</G>
 +			<B>0</B>
 +		</TextColor>
-+		<NoWrap>true</NoWrap>
-+		<AlignCenter>true</AlignCenter>
-+		<Font>5</Font>
-+		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>26</TopAnchorOffset>
-+		<BottomAnchorOffset>42</BottomAnchorOffset>
-+		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Label>
- 	<Label item="Player_HPLabel">
- 		<ScreenID>HPLabel</ScreenID>
--		<EQType>19</EQType>
-+		<EQType>17</EQType>
- 		<RelativePosition>true</RelativePosition>
--		<Text>100</Text>
- 		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -412,10 +428,10 @@
- 		</TextColor>
  		<NoWrap>true</NoWrap>
  		<AlignCenter>true</AlignCenter>
 -		<Font>1</Font>
@@ -46,102 +56,121 @@
  		<AutoStretch>true</AutoStretch>
 -		<TopAnchorOffset>35</TopAnchorOffset>
 -		<BottomAnchorOffset>45</BottomAnchorOffset>
-+		<TopAnchorOffset>24</TopAnchorOffset>
++		<TopAnchorOffset>26</TopAnchorOffset>
 +		<BottomAnchorOffset>42</BottomAnchorOffset>
  		<LeftAnchorOffset>2</LeftAnchorOffset>
  		<RightAnchorToLeft>false</RightAnchorToLeft>
- 		<Style_Tooltip>false</Style_Tooltip>
-@@ -423,7 +439,6 @@
- 	<Label item="Player_HPPercLabel">
- 		<ScreenID>HPPerLabel</ScreenID>
+-		<Style_Tooltip>false</Style_Tooltip>
+ 	</Label>
+-	<Label item="Player_HPPercLabel">
+-		<ScreenID>HPPerLabel</ScreenID>
++	<Label item="Player_HPLabel">
++		<ScreenID>HPLabel</ScreenID>
++		<EQType>17</EQType>
  		<RelativePosition>true</RelativePosition>
 -		<Text>%</Text>
+ 		<NoWrap>true</NoWrap>
+ 		<AlignCenter>true</AlignCenter>
+-		<Font>1</Font>
++		<Font>5</Font>
+ 		<AutoStretch>true</AutoStretch>
+-		<TopAnchorOffset>35</TopAnchorOffset>
+-		<BottomAnchorOffset>45</BottomAnchorOffset>
+-		<LeftAnchorOffset>24</LeftAnchorOffset>
++		<TopAnchorOffset>24</TopAnchorOffset>
++		<BottomAnchorOffset>42</BottomAnchorOffset>
++		<LeftAnchorOffset>2</LeftAnchorOffset>
+ 		<RightAnchorToLeft>false</RightAnchorToLeft>
+ 		<Style_Tooltip>false</Style_Tooltip>
+ 	</Label>
++	<Label item="Player_HPPercLabel">
++        <ScreenID>HPPerLabel</ScreenID><!-- REQUIRED -->
++	</Label>
+ 	<Gauge item="Pet_HP">
+ 		<ScreenID>PetHP</ScreenID>
  		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -488,12 +503,29 @@
- 		<LeftAnchorOffset>2</LeftAnchorOffset>
+@@ -475,33 +480,41 @@
+ 		<RightAnchorOffset>1</RightAnchorOffset>
  		<RightAnchorToLeft>false</RightAnchorToLeft>
  	</Gauge>
+-	<Label item="Player_ManaLabel">
+-		<ScreenID>ManaLabel</ScreenID>
+-		<EQType>20</EQType>
+-		<Font>1</Font>
 +	<Label item="Player_ManaLabelShadow">
 +		<ScreenID>ManaLabelShadow</ScreenID>
 +		<EQType>124</EQType>
 +		<Font>5</Font>
-+		<RelativePosition>true</RelativePosition>
+ 		<RelativePosition>true</RelativePosition>
+-		<Text>100</Text>
 +		<TextColor>
 +			<R>0</R>
 +			<G>0</G>
 +			<B>0</B>
 +		</TextColor>
-+		<NoWrap>true</NoWrap>
-+		<AlignCenter>true</AlignCenter>
-+		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>41</TopAnchorOffset>
-+		<BottomAnchorOffset>57</BottomAnchorOffset>
-+		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Label>
- 	<Label item="Player_ManaLabel">
- 		<ScreenID>ManaLabel</ScreenID>
--		<EQType>20</EQType>
--		<Font>1</Font>
-+		<EQType>124</EQType>
-+		<Font>5</Font>
- 		<RelativePosition>true</RelativePosition>
--		<Text>100</Text>
- 		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -502,8 +534,8 @@
  		<NoWrap>true</NoWrap>
  		<AlignCenter>true</AlignCenter>
  		<AutoStretch>true</AutoStretch>
 -		<TopAnchorOffset>45</TopAnchorOffset>
 -		<BottomAnchorOffset>55</BottomAnchorOffset>
-+		<TopAnchorOffset>39</TopAnchorOffset>
++		<TopAnchorOffset>41</TopAnchorOffset>
 +		<BottomAnchorOffset>57</BottomAnchorOffset>
  		<LeftAnchorOffset>2</LeftAnchorOffset>
  		<RightAnchorToLeft>false</RightAnchorToLeft>
- 		<Style_Tooltip>false</Style_Tooltip>
-@@ -511,7 +543,6 @@
- 	<Label item="Player_ManaPercLabel">
- 		<ScreenID>ManPercLabel</ScreenID>
- 		<Font>1</Font>
+-		<Style_Tooltip>false</Style_Tooltip>
+ 	</Label>
+-	<Label item="Player_ManaPercLabel">
+-		<ScreenID>ManPercLabel</ScreenID>
+-		<Font>1</Font>
 -		<Text>%</Text>
- 		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -553,7 +584,6 @@
- 		<EQType>21</EQType>
- 		<Font>1</Font>
- 		<RelativePosition>true</RelativePosition>
--		<Text>100</Text>
- 		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -571,7 +601,7 @@
- 	<Label item="Player_FatiguePercLabel">
- 		<ScreenID>FatiguePercLabel</ScreenID>
- 		<Font>1</Font>
--		<Text>%</Text>
-+		<Text>%Fuck</Text>
- 		<TextColor>
- 			<R>255</R>
- 			<G>255</G>
-@@ -584,7 +614,127 @@
- 		<LeftAnchorOffset>24</LeftAnchorOffset>
++	<Label item="Player_ManaLabel">
++		<ScreenID>ManaLabel</ScreenID>
++		<EQType>124</EQType>
++		<Font>5</Font>
++		<RelativePosition>true</RelativePosition>
++		<NoWrap>true</NoWrap>
+ 		<AlignCenter>true</AlignCenter>
+ 		<AutoStretch>true</AutoStretch>
+-		<TopAnchorOffset>45</TopAnchorOffset>
+-		<BottomAnchorOffset>55</BottomAnchorOffset>
+-		<LeftAnchorOffset>24</LeftAnchorOffset>
++		<TopAnchorOffset>39</TopAnchorOffset>
++		<BottomAnchorOffset>57</BottomAnchorOffset>
++		<LeftAnchorOffset>2</LeftAnchorOffset>
  		<RightAnchorToLeft>false</RightAnchorToLeft>
  		<Style_Tooltip>false</Style_Tooltip>
-+	</Label><!--
-+	<Gauge item="IW_ExpGauge">
-+		<ScreenID>PlayerExp</ScreenID>
-+		<RelativePosition>true</RelativePosition>
+ 	</Label>
++	<Label item="Player_ManaPercLabel">
++        <ScreenID>ManPercLabel</ScreenID><!-- REQUIRED -->
++	</Label>
+ 	<Gauge item="Player_Fatigue">
+ 		<ScreenID>PlayerFatigue</ScreenID>
+ 		<RelativePosition>true</RelativePosition>
+@@ -528,30 +541,133 @@
+ 	</Gauge>
+ 	<Label item="Player_FatigueLabel">
+ 		<ScreenID>FatigueLabel</ScreenID>
+-		<EQType>21</EQType>
+-		<Font>1</Font>
++	</Label>
++	<Label item="Player_FatiguePercLabel">
++        <ScreenID>FatiguePercLabel</ScreenID>
++	</Label>
++	<Gauge item="Player_ExpGauge">
++        <ScreenID>PlayerExp</ScreenID>
+ 		<RelativePosition>true</RelativePosition>
+-		<Text>100</Text>
 +		<GaugeOffsetY>0</GaugeOffsetY>
 +		<FillTint>
 +			<R>220</R>
 +			<G>150</G>
 +			<B>0</B>
 +		</FillTint>
++		<LinesFillTint>
++			<R>0</R>
++			<G>80</G>
++			<B>220</B>
++		</LinesFillTint>
 +		<DrawLinesFill>true</DrawLinesFill>
 + 		<EQType>4</EQType>
 +		<GaugeDrawTemplate>
@@ -153,11 +182,12 @@
 +			<EndCapRight>A_GaugeEndCapRight</EndCapRight>
 +		</GaugeDrawTemplate>
 +		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>77</TopAnchorOffset>
-+		<BottomAnchorOffset>87</BottomAnchorOffset>
++		<TopAnchorOffset>65</TopAnchorOffset>
++		<BottomAnchorOffset>75</BottomAnchorOffset>
 +		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Gauge>
++		<RightAnchorOffset>1</RightAnchorOffset>
++        <RightAnchorToLeft>false</RightAnchorToLeft>
++    </Gauge>
 +	<Label item="Player_ExpGaugeLabelShadow">
 +		<ScreenID>ExpGaugeLabel</ScreenID>
 + 		<EQType>26</EQType>
@@ -168,34 +198,36 @@
 +			<G>0</G>
 +			<B>0</B>
 +		</TextColor>
-+		<NoWrap>true</NoWrap>
-+		<AlignCenter>true</AlignCenter>
-+		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>77</TopAnchorOffset>
-+		<BottomAnchorOffset>89</BottomAnchorOffset>
+ 		<NoWrap>true</NoWrap>
+ 		<AlignCenter>true</AlignCenter>
+ 		<AutoStretch>true</AutoStretch>
+-		<TopAnchorOffset>55</TopAnchorOffset>
+-		<BottomAnchorOffset>65</BottomAnchorOffset>
++		<TopAnchorOffset>65</TopAnchorOffset>
++		<BottomAnchorOffset>77</BottomAnchorOffset>
 +		<LeftAnchorOffset>2</LeftAnchorOffset>
 +		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Label>
++    </Label>
 +	<Label item="Player_ExpGaugeLabel">
 +		<ScreenID>ExpGaugeLabel</ScreenID>
 + 		<EQType>26</EQType>
 +		<Font>2</Font>
 +		<RelativePosition>true</RelativePosition>
-+		<TextColor>
-+			<R>255</R>
-+			<G>255</G>
-+			<B>255</B>
-+		</TextColor>
 +		<NoWrap>true</NoWrap>
 +		<AlignCenter>true</AlignCenter>
 +		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>75</TopAnchorOffset>
-+		<BottomAnchorOffset>87</BottomAnchorOffset>
-+		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
++		<TopAnchorOffset>63</TopAnchorOffset>
++		<BottomAnchorOffset>75</BottomAnchorOffset>
+ 		<LeftAnchorOffset>2</LeftAnchorOffset>
+ 		<RightAnchorToLeft>false</RightAnchorToLeft>
+-		<Style_Tooltip>false</Style_Tooltip>
  	</Label>
+-	<Label item="Player_FatiguePercLabel">
+-		<ScreenID>FatiguePercLabel</ScreenID>
+-		<Font>1</Font>
+-		<Text>%</Text>
 +	<Gauge item="Player_AAExpGauge">
-+		<ScreenID>PlayerAAExp</ScreenID>
++        <ScreenID>PlayerAAExp</ScreenID>
 +		<RelativePosition>true</RelativePosition>
 +		<GaugeOffsetY>0</GaugeOffsetY>
 +		<FillTint>
@@ -203,20 +235,28 @@
 +			<G>150</G>
 +			<B>0</B>
 +		</FillTint>
++		<LinesFillTint>
++			<R>0</R>
++			<G>80</G>
++			<B>220</B>
++		</LinesFillTint>
++		<DrawLinesFill>true</DrawLinesFill>
 + 		<EQType>5</EQType>
 +		<GaugeDrawTemplate>
 +			<Background>A_GaugeBackground</Background>
 +			<Fill>A_GaugeFill</Fill>
 +			<Lines>A_GaugeLines</Lines>
++			<LinesFill>A_GaugeLinesFill</LinesFill>
 +			<EndCapLeft>A_GaugeEndCapLeft</EndCapLeft>
 +			<EndCapRight>A_GaugeEndCapRight</EndCapRight>
 +		</GaugeDrawTemplate>
 +		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>92</TopAnchorOffset>
-+		<BottomAnchorOffset>102</BottomAnchorOffset>
++		<TopAnchorOffset>75</TopAnchorOffset>
++		<BottomAnchorOffset>85</BottomAnchorOffset>
 +		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Gauge>
++		<RightAnchorOffset>1</RightAnchorOffset>
++        <RightAnchorToLeft>false</RightAnchorToLeft>
++    </Gauge>
 +	<Label item="Player_AAExpGaugeLabelShadow">
 +		<ScreenID>AAExpGaugeLabel</ScreenID>
 + 		<EQType>27</EQType>
@@ -228,10 +268,13 @@
 +			<B>0</B>
 +		</TextColor>
 +		<NoWrap>true</NoWrap>
-+		<AlignCenter>true</AlignCenter>
-+		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>92</TopAnchorOffset>
-+		<BottomAnchorOffset>104</BottomAnchorOffset>
+ 		<AlignCenter>true</AlignCenter>
+ 		<AutoStretch>true</AutoStretch>
+-		<TopAnchorOffset>55</TopAnchorOffset>
+-		<BottomAnchorOffset>65</BottomAnchorOffset>
+-		<LeftAnchorOffset>24</LeftAnchorOffset>
++		<TopAnchorOffset>75</TopAnchorOffset>
++		<BottomAnchorOffset>87</BottomAnchorOffset>
 +		<LeftAnchorOffset>2</LeftAnchorOffset>
 +		<RightAnchorToLeft>false</RightAnchorToLeft>
 +	</Label>
@@ -240,38 +283,33 @@
 + 		<EQType>27</EQType>
 +		<Font>2</Font>
 +		<RelativePosition>true</RelativePosition>
-+		<TextColor>
-+			<R>255</R>
-+			<G>255</G>
-+			<B>255</B>
-+		</TextColor>
 +		<NoWrap>true</NoWrap>
 +		<AlignCenter>true</AlignCenter>
 +		<AutoStretch>true</AutoStretch>
-+		<TopAnchorOffset>90</TopAnchorOffset>
-+		<BottomAnchorOffset>102</BottomAnchorOffset>
++		<TopAnchorOffset>73</TopAnchorOffset>
++		<BottomAnchorOffset>85</BottomAnchorOffset>
 +		<LeftAnchorOffset>2</LeftAnchorOffset>
-+		<RightAnchorToLeft>false</RightAnchorToLeft>
-+	</Label>-->
+ 		<RightAnchorToLeft>false</RightAnchorToLeft>
+-		<Style_Tooltip>false</Style_Tooltip>
+ 	</Label>
  	<Button item="PW_VoiceVolume">
  		<ScreenID>PW_VoiceVolume</ScreenID>
- 		<EQType>voicechat/SpeakingIndicator</EQType>
-@@ -743,12 +893,12 @@
+@@ -696,12 +812,12 @@
  		</Size>
  		<Style_VScroll>false</Style_VScroll>
  		<Style_HScroll>false</Style_HScroll>
 -		<Style_Transparent>false</Style_Transparent>
 +		<Style_Transparent>true</Style_Transparent>
- 		<DrawTemplate>WDT_Filigree3</DrawTemplate>
- 		<Style_Titlebar>true</Style_Titlebar>
+ 		<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
+ 		<Style_Titlebar>false</Style_Titlebar>
  		<Style_Closebox>false</Style_Closebox>
  		<Style_Minimizebox>false</Style_Minimizebox>
 -		<Style_Border>true</Style_Border>
 +		<Style_Border>false</Style_Border>
  		<Style_Sizable>true</Style_Sizable>
+ 		<Style_ClientMovable>true</Style_ClientMovable>
  		<Escapable>false</Escapable>
- 		<Pieces>Player_HP</Pieces>
-@@ -756,8 +906,10 @@
+@@ -710,13 +826,21 @@
  		<Pieces>Player_Mana</Pieces>
  		<Pieces>Player_Fatigue</Pieces>
  		<Pieces>Player_CombatTimer</Pieces>
@@ -282,3 +320,21 @@
  		<Pieces>Player_ManaLabel</Pieces>
  		<Pieces>Player_ManaPercLabel</Pieces>
  		<Pieces>Player_FatigueLabel</Pieces>
+ 		<Pieces>Player_FatiguePercLabel</Pieces>
+ 		<Pieces>Player_CombatTimerLabel</Pieces>
++        <Pieces>Player_ExpGauge</Pieces>
++        <Pieces>Player_ExpGaugeLabelShadow</Pieces>
++        <Pieces>Player_ExpGaugeLabel</Pieces>
++        <Pieces>Player_AAExpGauge</Pieces>
++        <Pieces>Player_AAExpGaugeLabelShadow</Pieces>
++        <Pieces>Player_AAExpGaugeLabel</Pieces>
+ 		<Pieces>PW_CombatStateAnim</Pieces>
+ 		<Pieces>PW_NewMailIcon</Pieces>
+ 		<Pieces>PW_ParcelsIcon</Pieces>
+@@ -735,4 +859,4 @@
+ 		<Pieces>PW_AggroNameSecondaryLabel</Pieces>
+ 		<Pieces>PW_AggroPctSecondaryLabel</Pieces>
+ 	</Screen>
+-</XML>
+\ No newline at end of file
++</XML>
diff --git a/ui/EQUI_Templates.diff b/ui/EQUI_Templates.diff
old mode 100755
new mode 100644
index af1cab7..36fe07e
--- a/ui/EQUI_Templates.diff
+++ b/ui/EQUI_Templates.diff
@@ -1,5 +1,5 @@
---- default/EQUI_Templates.xml	2015-03-23 11:23:56.000000000 -0700
-+++ isuldor/EQUI_Templates.xml	2016-09-11 22:49:26.481442000 -0700
+--- /mnt/d/EverQuest/uifiles/default/EQUI_Templates.xml	2017-09-07 15:13:29.000000000 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Templates.xml	2018-07-31 13:44:32.616395900 -0700
 @@ -510,7 +510,7 @@
  		</Titlebar>
  	</WindowDrawTemplate>
diff --git a/ui/install b/ui/install
index 47d604e..0058ca0 100755
--- a/ui/install
+++ b/ui/install
@@ -26,7 +26,7 @@ UI_FOLDER="${GAME_PATH}/uifiles/${UI_NAME}"
 if [[ "-u" == ${1} || "--update" == ${1} ]]
 then
     echo "Updating patch set!"
-    rm -v "${SCRIPT_PATH}/EQUI_*.diff"
+#   rm -v "${SCRIPT_PATH}/EQUI_*.diff"
     UI_FILES=( $( find "${UI_FOLDER}" -name '*.xml' -exec basename {} .xml \; ))
     for UI_FILE in "${UI_FILES[@]}"
     do