diff --git a/ui/EQUI_Animations.diff b/ui/EQUI_Animations.diff
index 4eab80c..f64df5d 100644
--- a/ui/EQUI_Animations.diff
+++ b/ui/EQUI_Animations.diff
@@ -1,21 +1,68 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_Animations.xml	2019-02-25 13:12:11.000000000 -0800
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Animations.xml	2019-03-16 15:38:00.018442000 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Animations.xml	2019-03-22 16:57:36.616215400 -0700
 @@ -93,6 +93,18 @@
  			<CY>256</CY>
  		</Size>
  	</TextureInfo>
-+ 	<TextureInfo item="dark_tile_64.tga">
-+ 		<Size>
-+ 			<CX>32</CX>
-+ 			<CY>32</CY>
-+ 		</Size>
-+ 	</TextureInfo>
-+ 	<TextureInfo item="dark_tile_192.tga">
-+ 		<Size>
-+ 			<CX>32</CX>
-+ 			<CY>32</CY>
-+ 		</Size>
-+ 	</TextureInfo>
++	<TextureInfo item="dark_tile_64.tga">
++		<Size>
++			<CX>32</CX>
++			<CY>32</CY>
++		</Size>
++	</TextureInfo>
++	<TextureInfo item="dark_tile_192.tga">
++		<Size>
++			<CX>32</CX>
++			<CY>32</CY>
++		</Size>
++	</TextureInfo>
  	<TextureInfo item="wnd_bg_dark_rock.tga">
  		<Size>
  			<CX>256</CX>
+@@ -6216,6 +6228,20 @@
+ 		</Frames>
+ 	</Ui2DAnimation>
+ 	<!-- Chat Window Border -->
++	<Ui2DAnimation item="A_WindowTitlePlaceholder">
++		<Cycle>true</Cycle>
++		<Frames>
++			<Texture>window_pieces05.tga</Texture>
++			<Location>
++				<X>254</X>
++				<Y>240</Y>
++			</Location>
++			<Size>
++				<CX>2</CX>
++				<CY>16</CY>
++			</Size>
++		</Frames>
++	</Ui2DAnimation>
+ 	<Ui2DAnimation item="A_ChatWindowTitleLeft">
+ 		<Cycle>true</Cycle>
+ 		<Frames>
+@@ -8213,6 +8239,25 @@
+ 	</Ui2DAnimation>
+ 
+ 	<!-- Border for pieces inside windows -->
++	<Ui2DAnimation item="A_InnerFramePlaceholder">
++		<Cycle>true</Cycle>
++		<Frames>
++			<Texture>window_pieces01.tga</Texture>
++			<Location>
++				<X>0</X>
++				<Y>0</Y>
++			</Location>
++			<Size>
++				<CX>2</CX>
++				<CY>2</CY>
++			</Size>
++			<Hotspot>
++				<X>0</X>
++				<Y>0</Y>
++			</Hotspot>
++			<Duration>1000</Duration>
++		</Frames>
++	</Ui2DAnimation>
+ 	<Ui2DAnimation item="A_InnerFrameTopLeft">
+ 		<Cycle>true</Cycle>
+ 		<Frames>
diff --git a/ui/EQUI_CastSpellWnd.diff b/ui/EQUI_CastSpellWnd.diff
index 691e69a..50e12ae 100644
--- a/ui/EQUI_CastSpellWnd.diff
+++ b/ui/EQUI_CastSpellWnd.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_CastSpellWnd.xml	2018-05-25 12:25:14.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_CastSpellWnd.xml	2019-03-16 15:38:00.044441300 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_CastSpellWnd.xml	2019-03-22 16:48:13.098523100 -0700
 @@ -357,13 +357,13 @@
  			<CY>373</CY>
  		</Size>
diff --git a/ui/EQUI_ChatWindow.diff b/ui/EQUI_ChatWindow.diff
index 8b60763..fb7b684 100644
--- a/ui/EQUI_ChatWindow.diff
+++ b/ui/EQUI_ChatWindow.diff
@@ -1,11 +1,11 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_ChatWindow.xml	2019-03-12 13:58:42.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_ChatWindow.xml	2019-03-16 20:27:11.624383600 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_ChatWindow.xml	2019-03-22 17:11:42.695289600 -0700
 @@ -3,7 +3,7 @@
  	<Schema xmlns="EverQuestData" xmlns:dt="EverQuestDataTypes" />
  	<Editbox item="CW_ChatInput">
  		<ScreenID>CW_ChatInput</ScreenID>
 -		<DrawTemplate>WDT_Inner</DrawTemplate>
-+ 		<DrawTemplate>WDT_InnerNull</DrawTemplate>
++		<DrawTemplate>WDT_Inner_Null</DrawTemplate>
  		<RelativePosition>true</RelativePosition>
  		<AutoStretch>true</AutoStretch>
  		<LeftAnchorOffset>2</LeftAnchorOffset>
@@ -14,7 +14,16 @@
  	<STMLbox item="CW_ChatOutput">
  		<ScreenID>CW_ChatOutput</ScreenID>
 -		<DrawTemplate>WDT_Inner</DrawTemplate>
-++		<DrawTemplate>WDT_InnerNull</DrawTemplate>
++		<DrawTemplate>WDT_Inner_Null</DrawTemplate>
  		<RelativePosition>true</RelativePosition>
  		<Style_VScroll>true</Style_VScroll>
  		<AutoStretch>true</AutoStretch>
+@@ -41,7 +41,7 @@
+ 		<Style_HScroll>false</Style_HScroll>
+ 		<Style_Transparent>true</Style_Transparent>
+ 		<DrawTemplate>WDT_Def2</DrawTemplate>
+-		<Style_Border>true</Style_Border>
++		<Style_Border>false</Style_Border>
+ 		<Style_Sizable>false</Style_Sizable>
+ 		<Escapable>false</Escapable>
+ 		<Pieces>CW_ChatOutput</Pieces>
diff --git a/ui/EQUI_HotButtonWnd.diff b/ui/EQUI_HotButtonWnd.diff
index bbe1baa..9479feb 100644
--- a/ui/EQUI_HotButtonWnd.diff
+++ b/ui/EQUI_HotButtonWnd.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_HotButtonWnd.xml	2018-05-25 12:26:04.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_HotButtonWnd.xml	2019-03-16 15:38:00.061440800 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_HotButtonWnd.xml	2019-03-22 16:48:13.136738400 -0700
 @@ -4,17 +4,13 @@
  	<Ui2DAnimation item="A_HotButton1Normal">
  		<Cycle>true</Cycle>
diff --git a/ui/EQUI_PlayerWindow.diff b/ui/EQUI_PlayerWindow.diff
index 7209f9a..e55076a 100644
--- a/ui/EQUI_PlayerWindow.diff
+++ b/ui/EQUI_PlayerWindow.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_PlayerWindow.xml	2018-04-09 20:54:48.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml	2019-03-16 15:38:00.080441200 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml	2019-03-22 16:48:13.153741400 -0700
 @@ -272,8 +272,8 @@
  			<EndCapRight>A_GaugeEndCapRight</EndCapRight>
  		</GaugeDrawTemplate>
diff --git a/ui/EQUI_Templates.diff b/ui/EQUI_Templates.diff
index 9d15c5e..84eab91 100644
--- a/ui/EQUI_Templates.diff
+++ b/ui/EQUI_Templates.diff
@@ -1,10 +1,67 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_Templates.xml	2017-09-07 15:13:29.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Templates.xml	2019-03-16 20:26:49.451185400 -0700
-@@ -638,6 +638,7 @@
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Templates.xml	2019-03-22 17:10:59.440953300 -0700
+@@ -638,6 +638,64 @@
  			<OverlapBottom>0</OverlapBottom>
  		</Titlebar>
  	</WindowDrawTemplate>
-+    <WindowDrawTemplate item="WDT_InnerNull" />
++	<WindowDrawTemplate item="WDT_Def2_Minimal">
++		<Background>dark_tile_192.tga</Background>
++		<CloseBox>
++			<Normal>A_CloseBtnNormal</Normal>
++			<Pressed>A_CloseBtnPressed</Pressed>
++			<Flyby>A_CloseBtnFlyby</Flyby>
++			<Disabled>A_CloseBtnDisabled</Disabled>
++			<PressedFlyby>A_CloseBtnPressedFlyby</PressedFlyby>
++		</CloseBox>
++		<QMarkBox>
++			<Normal>A_QMarkBtnNormal</Normal>
++			<Pressed>A_QMarkBtnPressed</Pressed>
++			<Flyby>A_QMarkBtnFlyby</Flyby>
++			<Disabled>A_QMarkBtnDisabled</Disabled>
++			<PressedFlyby>A_QMarkBtnPressedFlyby</PressedFlyby>
++		</QMarkBox>
++		<MinimizeBox>
++			<Normal>A_MinimizeBtnNormal</Normal>
++			<Pressed>A_MinimizeBtnPressed</Pressed>
++			<Flyby>A_MinimizeBtnFlyby</Flyby>
++			<Disabled>A_MinimizeBtnDisabled</Disabled>
++			<PressedFlyby>A_MinimizeBtnPressedFlyby</PressedFlyby>
++		</MinimizeBox>
++		<MaximizeBox>
++			<Normal>A_MaximizeBtnNormal</Normal>
++			<Pressed>A_MaximizeBtnPressed</Pressed>
++			<Flyby>A_MaximizeBtnFlyby</Flyby>
++			<Disabled>A_MaximizeBtnDisabled</Disabled>
++			<PressedFlyby>A_MaximizeBtnPressedFlyby</PressedFlyby>
++		</MaximizeBox>
++		<TileBox>
++			<Normal>A_TileBtnNormal</Normal>
++			<Pressed>A_TileBtnPressed</Pressed>
++			<Flyby>A_TileBtnFlyby</Flyby>
++			<Disabled>A_TileBtnDisabled</Disabled>
++			<PressedFlyby>A_TileBtnPressedFlyby</PressedFlyby>
++		</TileBox>
++		<Border>
++			<Top>A_InnerFramePlaceholder</Top>
++			<Right>A_InnerFramePlaceholder</Right>
++			<Bottom>A_InnerFramePlaceholder</Bottom>
++			<Left>A_InnerFramePlaceholder</Left>
++			<OverlapLeft>0</OverlapLeft>
++			<OverlapTop>0</OverlapTop>
++			<OverlapRight>0</OverlapRight>
++			<OverlapBottom>0</OverlapBottom>
++		</Border>
++		<Titlebar>
++			<Right>A_WindowTitlePlaceholder</Right>
++			<Left>A_WindowTitlePlaceholder</Left>
++			<Middle>A_WindowTitlePlaceholder</Middle>
++			<OverlapLeft>0</OverlapLeft>
++			<OverlapTop>0</OverlapTop>
++			<OverlapRight>0</OverlapRight>
++			<OverlapBottom>0</OverlapBottom>
++		</Titlebar>
++	</WindowDrawTemplate>
++    <WindowDrawTemplate item="WDT_Inner_Null" />
  	<WindowDrawTemplate item="WDT_Inner">
  		<Background>wnd_bg_light_rock.tga</Background>
  		<VSBTemplate>