diff --git a/sprites/atlas/Revision 25115 Backup.png b/sprites/atlas/Revision 25385 Backup.png
similarity index 100%
rename from sprites/atlas/Revision 25115 Backup.png
rename to sprites/atlas/Revision 25385 Backup.png
diff --git a/themes/archetype/assets/Archetype.xml b/themes/archetype/assets/Archetype.xml
index 1137202a..689d5cac 100644
--- a/themes/archetype/assets/Archetype.xml
+++ b/themes/archetype/assets/Archetype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#3f4449"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#3f4449"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-arrow.png" filter="lineal">
 		<composed name="text-bubble.background" inset="8">
diff --git a/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml b/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml
index 438b3f80..5fb810e2 100644
--- a/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml
+++ b/themes/archetype/assets/DGD91ad3qx/SKhBbhenX8/ZuS2aS18ad.xml
@@ -119,7 +119,7 @@
 					<param name="border"><border>10,10,0,0</border></param>
 					<param name="background"><image>none</image></param>
 				</theme>
-				<theme name="dialoglayout" ref="-defaults">
+				<theme name="dialoglayout" ref="dialoglayout">
 					<theme name="label-info" ref="label">
 						<param name="background"><image>ui-inputbox.background</image></param>
 						<param name="textAlignment"><enum type="alignment">CENTER</enum></param>
diff --git a/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml b/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml
index f34c6c48..5fb73914 100644
--- a/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml
+++ b/themes/archetype/assets/DGD91ad3qx/g8YMKJ805g/DUbq0pesAW.xml
@@ -150,7 +150,7 @@
 			<param name="namedGaps"><map/></param>
 			<theme name="item-slot" ref="-defaults">
 				<param name="background"><image>Hotkey-Button</image></param>
-				<param name="border"><border>7,4,7,4</border></param>
+				<param name="border"><border>7,4,8,4</border></param>
 				<param name="font"><font>hotkey-button2</font></param>	
 				<param name="font2"><font>hotkey-button</font></param>
 				<param name="minWidth"><int>44</int></param>
diff --git a/themes/archetype/assets/Default-Black.xml b/themes/archetype/assets/Default-Black.xml
index 3aa453e0..805c8f87 100644
--- a/themes/archetype/assets/Default-Black.xml
+++ b/themes/archetype/assets/Default-Black.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="#ffffff" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="#ffffff" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-black.png" filter="lineal">
 		<area name="text-bubble.background" xywh="0,0,128,128" splitx="L63,R63" splity="T63,B63"/>
diff --git a/themes/archetype/assets/Default-White.xml b/themes/archetype/assets/Default-White.xml
index ae4afdb9..4f3ae38b 100644
--- a/themes/archetype/assets/Default-White.xml
+++ b/themes/archetype/assets/Default-White.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><themes>
-	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="#222222" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
+	<fontDef name="messagebox" filename="jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="#222222" kerning="false" hinting="Medium" size="24" shadow_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" border_width="0" border_color="#484848"/>
 
 	<images file="jaejGI7pIp/res/custom/WGRfhUrISa/text-bubble-white.png" filter="lineal">
 		<area name="text-bubble.background" xywh="0,0,128,128" splitx="L63,R63" splity="T63,B63"/>
diff --git a/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml b/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml
index 3b8da83b..c80508aa 100644
--- a/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml
+++ b/themes/archetype/assets/jaejGI7pIp/MAsXAmMZ9W.xml
@@ -327,6 +327,7 @@
 	</images>
 
 	<images file="res/custom/j4iabP1aXf/main-hud.png" filter="lineal">
+		<composed name="timer-background"><alias ref="Pure" tint="#95111111" inset="0,0,0,0"/></composed>
 		<composed name="label1.background"><alias ref="Pure-Edge" tint="#95111111" inset="0,0,0,0"/></composed>
 		<composed name="label2.background"><alias ref="label1.background" inset="0,0,0,0"/></composed>
 		<composed name="label3.background"><alias ref="label1.background" tint="#00aeff" inset="0,0,0,0"/></composed>
diff --git a/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml b/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml
index 305d500e..ca8a0cfe 100644
--- a/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml
+++ b/themes/archetype/assets/jaejGI7pIp/a3ZzQij90e.xml
@@ -1,54 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <themes>
 
-	<fontDef name="battle" filename="fonts/NotoSans-Medium.ttc" color="icon-color" border_width="1.0" border_color="#A6000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#A6000000" size="28" hinting="Medium" offsetY="4"/>
+	<fontDef name="battle" filename="fonts/NotoSans-Medium.ttf" color="icon-color" border_width="2.0" border_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#000000" size="28" hinting="Medium" offsetY="4"/>
 	<fontDef name="battle-map" ref="battle" color="#ffffff" offsetY="4"/>
-    <fontDef name="battle-name" filename="fonts/NotoSans-Medium.ttc" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
-	<fontDef name="battle-hp-text" filename="fonts/NotoSans-Medium.ttc" color="icon-color" border_width="0.9" border_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" size="16" hinting="Medium" offsetY="0" offsetX="-12"/>
-	<fontDef name="battle-item" filename="fonts/NotoSans-Medium.ttc" color="icon-color" border_width="1.0" border_color="#80000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" size="16" hinting="Medium" offsetY="6"/>
+    <fontDef name="battle-name" filename="fonts/NotoSans-Medium.ttf" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
+	<fontDef name="battle-hp-text" filename="fonts/NotoSans-Medium.ttf" color="icon-color" border_width="0.9" border_color="#40000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" size="16" hinting="Medium" offsetY="0" offsetX="-12"/>
+	<fontDef name="battle-item" filename="fonts/NotoSans-Medium.ttf" color="icon-color" border_width="1.0" border_color="#80000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" size="16" hinting="Medium" offsetY="6"/>
 	<fontDef name="braille" ref="battle"/>
-	<fontDef name="move-name" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="12" size_cjk="12">
+	<fontDef name="move-name" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="12" size_cjk="12">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
 		<fontParam if="keyboardFocus" color="font-main-color"/>
 	</fontDef>
-	<fontDef name="move-pp" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-disabled-color" kerning="true" hinting="AutoSlight" size="12" size_cjk="12">
+	<fontDef name="move-pp" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-disabled-color" kerning="true" hinting="AutoSlight" size="12" size_cjk="12">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
 		<fontParam if="keyboardFocus" color="font-main-color"/>
 	</fontDef>
 
-	<fontDef name="alphabeta-highlight-button" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11">
+	<fontDef name="battle-arrows" filename="fonts/NotoSansCJK-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11">
+		<fontParam if="disabled" color="font-disabled-color"/>
+		<fontParam if="hover" color="font-main-color"/>
+		<fontParam if="selected" color="font-main-color"/>
+		<fontParam if="keyboardFocus" color="font-main-color"/>
+	</fontDef>
+
+	<fontDef name="alphabeta-highlight-button" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
 		<fontParam if="keyboardFocus" color="font-main-color"/>
 	</fontDef>
 	
-	<fontDef name="alphabeta-highlight-button-pc" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="9" size_cjk="9">
+	<fontDef name="alphabeta-highlight-button-pc" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="9" size_cjk="9">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
 		<fontParam if="keyboardFocus" color="font-main-color"/>
 	</fontDef>
 	
-	<fontDef name="battle-label-highlight-new" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#26000000" size="12" size_cjk="12">
+	<fontDef name="battle-label-highlight-new" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#26000000" size="12" size_cjk="12">
         <fontParam if="disabled" color="font-disabled-color"/>
         <fontParam if="hover" color="font-main-color"/>
         <fontParam if="selected" color="font-main-color"/>
         <fontParam if="keyboardFocus" color="font-main-color"/>
     </fontDef>
 	
-	<fontDef name="battle-label-highlight-safari" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#26000000" size="12" size_cjk="12" offsetX="-20" offsetY="-8" incremental="false" characters="1234567890">
+	<fontDef name="battle-label-highlight-safari" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#26000000" size="12" size_cjk="12" offsetX="-20" offsetY="-8" incremental="false" characters="1234567890">
         <fontParam if="disabled" color="font-disabled-color"/>
         <fontParam if="hover" color="font-main-color"/>
         <fontParam if="selected" color="font-main-color"/>
         <fontParam if="keyboardFocus" color="font-main-color"/>
     </fontDef>
 
-	<fontDef name="alphabeta-highlight-button-battle" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="16" size_cjk="16">
+	<fontDef name="alphabeta-highlight-button-battle" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="16" size_cjk="16">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
@@ -76,7 +83,7 @@
         <fontParam if="keyboardFocus" color="font-main-color"/>
     </fontDef>
 	
-	<fontDef name="alphabeta-chat-highlight-button" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11">
+	<fontDef name="alphabeta-chat-highlight-button" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11">
 		<fontParam if="disabled" color="font-disabled-color"/>
 		<fontParam if="hover" color="font-main-color"/>
 		<fontParam if="selected" color="font-main-color"/>
@@ -97,18 +104,18 @@
 	
 	<fontDef name="pb-dark-disabled-button" ref="pb-dark-highlight-button" color="font-disabled-color"/>
 	
-	<fontDef name="mechabold-battle-ability-fix" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" border_width="1" border_color="#A6000000" offsetX="-77" offsetY="-69"/>
+	<fontDef name="mechabold-battle-ability-fix" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="icon-color" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" border_width="1" border_color="#A6000000" offsetX="-77" offsetY="-69"/>
 	<fontDef name="mechabold-battle-ability-fix-enemy" ref="mechabold-battle-ability-fix" color="icon-color" border_color="#A6000000" offsetX="-24" offsetY="79"/>
 	
 	<fontDef name="hotkey-button" ref="alphabeta-chat-highlight-button" color="font-button-color"/>
 	<fontDef name="hotkey-button2" ref="hotkey-button"  color="font-disabled-color"/>
 	
-	<fontDef name="title-font-black-bag" filename="fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="icon-color" border_width="0.9" border_color="#80000000" kerning="true" hinting="AutoSlight" size="14" size_cjk="14"/>
+	<fontDef name="title-font-black-bag" filename="fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="icon-color" border_width="0.9" border_color="#80000000" kerning="true" hinting="AutoSlight" size="14" size_cjk="14"/>
 	
-	<fontDef name="alphabeta" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="11" size_cjk="11" default="true" unique_atlas="true">
+	<fontDef name="alphabeta" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="11" size_cjk="11" default="true" unique_atlas="true">
 		<fontParam if="disabled" color="font-disabled-color"/>
 	</fontDef>
-	<fontDef name="alphabeta-markup" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="11" size_cjk="11" default="true" unique_atlas="true" markup="true"/>
+	<fontDef name="alphabeta-markup" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="11" size_cjk="11" default="true" unique_atlas="true" markup="true"/>
 	<fontDef name="alphabeta-white-chat" ref="alphabeta" color="font-main-color"/>
 	<fontDef name="alphabeta-main-system" ref="alphabeta" color="font-sub-color"/>
 	<fontDef name="alphabeta-main-battle" ref="alphabeta" color="font-sub-color"/>
@@ -139,16 +146,16 @@
 	<fontDef name="alphabeta-link" ref="alphabeta" color="#00e6b8"/>
 	<fontDef name="alphabeta-gtl-red" ref="alphabeta" color="hp-low-color"/>
 	<fontDef name="alphabeta-gtl-yellow" ref="alphabeta" color="hp-mid-color"/>
-	<fontDef name="alphabeta-pokename" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="1.2" border_color="#3d4d55"/>
-	<fontDef name="alphabeta-trainer-card" filename="fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" offsetX="51" offsetY="18"/>
-	<fontDef name="alphabeta-trainer-issue" ref="move-pp" color="font-main-color" offsetY="-3"/>
-	<fontDef name="alphabeta-border-overworld" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="#ffffff" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" border_width="1.1" border_color="#3c4c50"/>
-	<fontDef name="alphabeta-border-HUD" filename="fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="icon-color" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
+	<fontDef name="alphabeta-pokename" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="1.2" border_color="#3d4d55"/>
+	<fontDef name="alphabeta-trainer-card" filename="fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" offsetX="51" offsetY="20"/>
+	<fontDef name="alphabeta-trainer-issue" ref="move-pp" color="font-main-color" offsetY="-4"/>
+	<fontDef name="alphabeta-border-overworld" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="#ffffff" kerning="true" hinting="AutoSlight" size="14" size_cjk="14" border_width="1.1" border_color="#3c4c50"/>
+	<fontDef name="alphabeta-border-HUD" filename="fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="icon-color" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
 	<fontDef name="alphabeta-border-time" ref="alphabeta-border-HUD" offsetY="-1" color="font-main-color"/>
 	<fontDef name="alphabeta-border-active-item" ref="alphabeta-border-HUD" offsetY="-20" color="icon-color"/>
-	<fontDef name="alphabeta-border-TC" filename="fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="0.3" border_color="#80000000"/>
-	<fontDef name="alphabeta-border" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="#f1f2f3" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="1.2" border_color="#233031"/>
-	<fontDef name="alphabeta-pc" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="#a5b0b5" kerning="true" hinting="AutoSlight" size="10" size_cjk="10"/>
+	<fontDef name="alphabeta-border-TC" filename="fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="0.3" border_color="#80000000"/>
+	<fontDef name="alphabeta-border" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="#f1f2f3" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" border_width="1.2" border_color="#233031"/>
+	<fontDef name="alphabeta-pc" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="#a5b0b5" kerning="true" hinting="AutoSlight" size="10" size_cjk="10"/>
 	<fontDef name="alphabeta-border-red" ref="alphabeta-border-overworld" color="#f09999"/>
 	<fontDef name="alphabeta-border-friend" ref="alphabeta-border-overworld" color="#58ff64"/>
 	<fontDef name="alphabeta-border-team" ref="alphabeta-border-overworld" color="#00ffff"/>
@@ -163,7 +170,7 @@
 		<fontParam if="keyboardFocus" color="font-main-color"/>
 	</fontDef>
 
-	<fontDef name="chat-default" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="14" size_cjk="14" default="true" unique_atlas="true"/>
+	<fontDef name="chat-default" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-sub-color" kerning="true" hinting="AutoSlight" hinting_cjk="Slight" size="14" size_cjk="14" default="true" unique_atlas="true"/>
 	<fontDef name="chat-green" ref="chat-default" color="#7fc937"/>
 	<fontDef name="chat-link" ref="chat-default" color="#00e6b8"/>
 	<fontDef name="chat-white" ref="chat-default" color="font-main-color"/>
@@ -182,8 +189,8 @@
 		<fontParam if="disabled" color="font-disabled-color"/>
 	</fontDef>
 	<fontDef name="pb-dark-red" ref="pb-dark" color="#fc6a78"/>
-	<fontDef name="tooltip-font" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" shadow_color="#20FFFFFF" shadow_offset_x="1" shadow_offset_y="1"/>
-	<fontDef name="tooltip-font-markup" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" shadow_color="#20FFFFFF" shadow_offset_x="1" shadow_offset_y="1" markup="true"/>
+	<fontDef name="tooltip-font" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" shadow_color="#20FFFFFF" shadow_offset_x="1" shadow_offset_y="1"/>
+	<fontDef name="tooltip-font-markup" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11" shadow_color="#20FFFFFF" shadow_offset_x="1" shadow_offset_y="1" markup="true"/>
 	<fontDef name="pb-dark-link" ref="pb-dark" color="#434343"/>
 	<fontDef name="pb-tab" ref="alphabeta" color="font-button-color">
 		<fontParam if="disabled" color="font-disabled-color"/>
@@ -194,13 +201,20 @@
 	<fontDef name="pb-dark-green" ref="pb-dark" color="#56d245"/>
 	<fontDef name="listbox-display" ref="pb-dark" color="#d4dadc"/>
 	<fontDef name="pb-dark-orange" ref="pb-dark" color="#BBBBBB"/>
-	<fontDef name="noto-8pt" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" border_width="1" border_color="#3f4449" kerning="true" hinting="AutoSlight" size="8" incremental="false" characters="0123456789ABCDEF"/>
-	<fontDef name="mechabold" filename="fonts/NotoSans-Medium.ttc" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="11.7" size_cjk="11.7"/>
+	<fontDef name="noto-8pt" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" border_width="1" border_color="#3f4449" kerning="true" hinting="AutoSlight" size="8" incremental="false" characters="0123456789ABCDEF"/>
+	<fontDef name="mechabold" filename="fonts/NotoSans-Medium.ttf" faces="sc,tc,jp" color="font-button-color" kerning="true" hinting="AutoSlight" size="11.7" size_cjk="11.7"/>
+	<fontDef name="mechabold-red" ref="mechabold" color="#F09999" />
 	<fontDef name="mechabold-orange" ref="mechabold" color="#FF9900"/>
+	<fontDef name="mechabold-green" ref="mechabold" color="#9BFF9B" />
+	<fontDef name="mechabold-blue" ref="mechabold" color="#87ceeb" />
+	<fontDef name="mechabold-yellow" ref="mechabold" color="#e2c57e"/>
+	<fontDef name="mechabold-tm" ref="mechabold" color="#ffffff">
+      <fontParam if="disabled" color="#CCC"/>
+	</fontDef>
 	
-	<fontDef name="title-font" filename="fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
+	<fontDef name="title-font" filename="fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" color="font-main-color" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
 	<fontDef name="title-font-summary" ref="title-font"/>
-	<fontDef name="trainer-name" filename="fonts/NotoSans-Medium.ttc" color="font-button-color" kerning="true" hinting="AutoSlight" size="17" size_cjk="17" incremental="false" characters="AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"/>
+	<fontDef name="trainer-name" filename="fonts/NotoSans-Medium.ttf" color="font-button-color" kerning="true" hinting="AutoSlight" size="17" size_cjk="17" incremental="false" characters="AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"/>
 
 	<fontDef name="console-green" ref="alphabeta" color="#7CB147"/>
 	<fontDef name="console-red" ref="alphabeta" color="#FF0000"/>
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf
new file mode 100644
index 00000000..54ad879b
Binary files /dev/null and b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf differ
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf
new file mode 100644
index 00000000..5e9ef0f7
Binary files /dev/null and b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf differ
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSansCJK-Bold.ttc
similarity index 100%
rename from themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc
rename to themes/archetype/assets/jaejGI7pIp/fonts/NotoSansCJK-Bold.ttc
diff --git a/themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc b/themes/archetype/assets/jaejGI7pIp/fonts/NotoSansCJK-Medium.ttc
similarity index 100%
rename from themes/archetype/assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc
rename to themes/archetype/assets/jaejGI7pIp/fonts/NotoSansCJK-Medium.ttc
diff --git a/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml b/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml
index 3ffa559c..38d998cc 100644
--- a/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml
+++ b/themes/archetype/assets/jaejGI7pIp/mgZEOjSZ0a.xml
@@ -891,6 +891,8 @@
 			<param name="fonts"><map>
 				<param name="default"><font>alphabeta</font></param>
 				<param name="link"><font>alphabeta-blue</font></param>
+				<param name="big-yellow"><font>mechabold-yellow</font></param>
+				<param name="big-red"><font>mechabold-red</font></param>
 			</map></param>
 			<param name="classes"><map/>
 				</param><param name="images">
diff --git a/themes/archetype/fonts.xml b/themes/archetype/fonts.xml
index 9368ef7a..db8947e0 100644
--- a/themes/archetype/fonts.xml
+++ b/themes/archetype/fonts.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <themes>
-<fontDef name="battle-name" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
+<fontDef name="battle-name" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf" color="#ffffff" border_width="1.1" border_color="#000000" size="18" hinting="Full" offsetY="-3"/>
 
 
 
@@ -10,9 +10,9 @@ in here as you did for "icon-color" in the CHOOSE_YOUR_COLORS.xml file.-->
 
 
 <fontDef color="#ffffff" 
-name="battle" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttc" border_width="1.0" border_color="#A6000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#A6000000" size="28" hinting="Medium" offsetY="4"/>
+name="battle" filename="assets/jaejGI7pIp/fonts/NotoSans-Medium.ttf" border_width="1.0" border_color="#A6000000" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#A6000000" size="28" hinting="Medium" offsetY="4"/>
 
 
 <fontDef color="#ffffff" 
-name="alphabeta-border-HUD" filename="assets/jaejGI7pIp/fonts/NotoSans-Bold.ttc" faces="sc,tc,jp" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
+name="alphabeta-border-HUD" filename="assets/jaejGI7pIp/fonts/NotoSans-Bold.ttf" faces="sc,tc,jp" shadow_offset_x="1" shadow_offset_y="1" shadow_color="#80000000" kerning="true" hinting="AutoSlight" size="11" size_cjk="11"/>
 </themes>
diff --git a/themes/archetype/main-widgets.xml b/themes/archetype/main-widgets.xml
index c3e15172..34406b9e 100644
--- a/themes/archetype/main-widgets.xml
+++ b/themes/archetype/main-widgets.xml
@@ -33,11 +33,9 @@
 	</theme>
 
 	<theme name="logingui" ref="-defaults">
-	<param name="background"><image>login-background-animation</image></param>
-		<theme name="logo" ref="-defaults">
-		</theme>
-		<theme name="logo-hween" ref="-defaults">
-		</theme>
+		<param name="background"><image>login-background-animation</image></param>
+		<theme name="logo" ref="-defaults"></theme>
+		<theme name="logo-hween" ref="-defaults"></theme>
 		<theme name="login-window" ref="new-base-frame" allowWildcard="true">
 			<param name="background"><image>Login-Window</image></param>
 			<param name="minWidth"><int>355</int></param>
@@ -51,6 +49,17 @@
 				<theme name="label" ref="label">
 					<param name="border"><border>0,7,0,0</border></param>
 				</theme>
+				<theme name="combobox" ref="combobox" allowWildcard="true">
+					<theme name="display" ref="display">
+						<param name="border"><border>5,17,5,0</border></param>
+					</theme>
+				</theme>
+				<theme name="editfield" ref="editfield" allowWildcard="true">
+					<theme name="renderer" ref="renderer">
+						<param name="textAlignment"><enum type="alignment">center</enum></param>
+					<param name="border"><border>0,0,2,2</border></param>
+					</theme>
+				</theme>
 				<theme name="button" ref="button">
 					<param name="minWidth"><int>100</int></param>
 				</theme>
@@ -1404,4 +1413,15 @@
 			<param name="font"><font>noto-8pt</font></param>
 		</theme>
 	</theme>
+
+	<theme name="hall-of-fame" ref="-defaults">
+		<param name="background"><image>none</image></param>
+		<theme name="label" ref="-defaults" allowWildcard="true">
+			<param name="background"><image>none</image></param>
+			<param name="font"><font>battle</font></param>
+		</theme>
+		<theme name="trainer-name" ref="-defaults">
+			<param name="font"><font>battle</font></param>
+		</theme>
+	</theme>
 </themes>
diff --git a/themes/archetype/ui/battle.xml b/themes/archetype/ui/battle.xml
index b5012b98..bfade0a9 100644
--- a/themes/archetype/ui/battle.xml
+++ b/themes/archetype/ui/battle.xml
@@ -216,7 +216,7 @@
 	</theme>
 
 	<theme name="battle-frame" ref="-defaults" allowWildcard="true">
-		<param name="background"><image>label1.background</image></param>
+		<param name="background"><image>timer-background</image></param>
 	</theme>
 	
 	<theme name="battle-panel" ref="-defaults" allowWildcard="true">
@@ -269,7 +269,8 @@
 			<param name="maxWidth"><int>106</int></param>
 		</theme>
 		<theme name="button" ref="-defaults" allowWildcard="true">
-			<param name="font"><font>alphabeta-highlight-button</font></param>
+			<param name="font"><font>battle-arrows</font></param>
+			<param name="border"><border>0,0,2,0</border></param>
 			<param name=""><image>button-small.*</image></param>
 			<param name="textAlignment"><enum type="alignment">CENTER</enum></param>
 		</theme>
@@ -295,10 +296,12 @@
 			<param name="minHeight"><int>500</int></param>
 			<param name="namedGaps"><map/></param>
 			<theme name="scrollpane" ref="scrollpane" allowWildcard="true">
+					<param name="border"><border>0,0,6,0</border></param>
 				<theme name="label-black" ref="-defaults" allowWildcard="true">
 					<param name="font"><font>battle-item</font></param>
 					<param name="border"><border>0,0,0,0</border></param>
-					<param name="minHeight"><int>208</int></param>
+					<param name="minHeight"><int>204</int></param>
+					<param name="minWidth"><int>450</int></param>
 					<param name="textAlignment"><enum type="alignment">topleft</enum></param>
 				</theme>
 			</theme>