diff --git a/sc2layout/frame_class.xml b/sc2layout/frame_class.xml
index 007a0ae..47e1a0b 100644
--- a/sc2layout/frame_class.xml
+++ b/sc2layout/frame_class.xml
@@ -953,6 +953,28 @@
         <property name="MapHandle" valueType="Uint32Pair" readonly="true"/>
     </frameClass>
 
+    <!--
+    ========================================
+    :: CBrowser
+    ========================================
+    -->
+    <frameClass name="CBrowser" parent="CLayer">
+        <property name="Address" valueType="String"/>
+        <property name="Title" valueType="String" readonly="true"/>
+        <property name="StickyFocus" valueType="Boolean"/>
+        <property name="IMEStyle" valueType="String"/>
+        <property name="Loading" valueType="Boolean" readonly="true"/>
+        <property name="CanGoForward" valueType="Boolean" readonly="true"/>
+        <property name="CanGoBackward" valueType="Boolean" readonly="true"/>
+        <property name="Error" valueType="Boolean" readonly="true"/>
+        <property name="Navigating" valueType="Boolean" readonly="true"/>
+        <property name="ExternalLinksUseOSBrowser" valueType="Boolean"/>
+        <property name="SmartStretch" valueType="Boolean"/>
+        <property name="TextureWidth" valueType="Int32"/>
+        <property name="TextureHeight" valueType="Int32"/>
+        <property name="Purpose" valueType="String"/>
+    </frameClass>
+
     <!--
     ========================================
     :: CBrowserDialog
@@ -3055,8 +3077,11 @@
     ========================================
     -->
     <frameClass name="CGlueUI" parent="CControl">
+        <property name="AccountCountry" valueType="String" readonly="true"/>
         <property name="CustomSoundtrack" valueType="String" readonly="false"/>
+        <property name="DebugMode" valueType="Boolean" readonly="true"/>
         <property name="IsOsVersionAllowed" valueType="Boolean" readonly="true"/>
+        <property name="PTRMode" valueType="Boolean" readonly="true"/>
     </frameClass>
 
     <!--
@@ -6032,6 +6057,14 @@
     <frameClass name="CSaveReplayDialog" parent="CDialog">
     </frameClass>
 
+    <!--
+    ========================================
+    :: CSceneBrowser
+    ========================================
+    -->
+    <frameClass name="CSceneBrowser" parent="CBrowser">
+    </frameClass>
+
     <!--
     ========================================
     :: CScoreRewardItem
@@ -9205,34 +9238,4 @@
     -->
     <frameClass name="CWorldTooltip" parent="CTooltip">
     </frameClass>
-
-    <!--
-    ========================================
-    :: CBrowser
-    ========================================
-    -->
-    <frameClass name="CBrowser" parent="CLayer">
-        <property name="Address" valueType="String"/>
-        <property name="Title" valueType="String" readonly="true"/>
-        <property name="StickyFocus" valueType="Boolean"/>
-        <property name="IMEStyle" valueType="String"/>
-        <property name="Loading" valueType="Boolean" readonly="true"/>
-        <property name="CanGoForward" valueType="Boolean" readonly="true"/>
-        <property name="CanGoBackward" valueType="Boolean" readonly="true"/>
-        <property name="Error" valueType="Boolean" readonly="true"/>
-        <property name="Navigating" valueType="Boolean" readonly="true"/>
-        <property name="ExternalLinksUseOSBrowser" valueType="Boolean"/>
-        <property name="SmartStretch" valueType="Boolean"/>
-        <property name="TextureWidth" valueType="Int32"/>
-        <property name="TextureHeight" valueType="Int32"/>
-        <property name="Purpose" valueType="String"/>
-    </frameClass>
-
-    <!--
-    ========================================
-    :: CSceneBrowser
-    ========================================
-    -->
-    <frameClass name="CSceneBrowser" parent="CBrowser">
-    </frameClass>
 </map>
diff --git a/sc2layout/frame_type.xml b/sc2layout/frame_type.xml
index 3f36227..2980264 100644
--- a/sc2layout/frame_type.xml
+++ b/sc2layout/frame_type.xml
@@ -6,9 +6,6 @@
     ========================================
     -->
 
-    <frameType name="Frame" classType="CFrame" blizzOnly="false">
-    </frameType>
-
     <frameType name="ABChoiceFrame" classType="CABChoiceFrame" blizzOnly="true">
     </frameType>
 
@@ -492,6 +489,15 @@
         <hookup path="HitTestFrame" class="CFrame" required="false"/>
     </frameType>
 
+    <frameType name="Browser" classType="CBrowser" blizzOnly="true">
+        <hookup path="BrowserImage" class="CImage" required="true"/>
+        <hookup path="ForwardButton" class="CButton" required="true"/>
+        <hookup path="BackButton" class="CButton" required="true"/>
+        <hookup path="GoButton" class="CButton" required="true"/>
+        <hookup path="ScrollBar" class="CScrollBar" required="true"/>
+        <hookup path="AddressEditBox" class="CEditBox" required="true"/>
+    </frameType>
+
     <frameType name="BrowserDialog" classType="CBrowserDialog" blizzOnly="true">
     </frameType>
 
@@ -1464,6 +1470,9 @@
     <frameType name="FlashFrame" classType="CFlashFrame" blizzOnly="true">
     </frameType>
 
+    <frameType name="Frame" classType="CFrame" blizzOnly="false">
+    </frameType>
+
     <frameType name="FramePropertiesPanel" classType="CFramePropertiesPanel" blizzOnly="true">
         <hookup path="ListBox" class="CTreeView" required="true"/>
         <hookup path="NameLabel" class="CLabel" required="true"/>
@@ -3535,6 +3544,15 @@
         <hookup path="ReplayPanel" class="CReplayFilePanel" required="true"/>
     </frameType>
 
+    <frameType name="SceneBrowser" classType="CSceneBrowser" blizzOnly="true">
+        <hookup path="BrowserImage" class="CImage" required="true"/>
+        <hookup path="ForwardButton" class="CButton" required="true"/>
+        <hookup path="BackButton" class="CButton" required="true"/>
+        <hookup path="GoButton" class="CButton" required="true"/>
+        <hookup path="ScrollBar" class="CScrollBar" required="true"/>
+        <hookup path="AddressEditBox" class="CEditBox" required="true"/>
+    </frameType>
+
     <frameType name="ScoreRewardItem" classType="CScoreRewardItem" blizzOnly="true">
         <hookup path="AmountLabel" class="CCountdownLabel" required="true"/>
         <hookup path="SourceLabel" class="CLabel" required="true"/>
@@ -5164,22 +5182,4 @@
         <hookup path="TipLabel" class="CLabel" required="true"/>
         <hookup path="SubTipLabel" class="CLabel" required="true"/>
     </frameType>
-
-    <frameType name="Browser" classType="CBrowser" blizzOnly="true">
-        <hookup path="BrowserImage" class="CImage" required="true"/>
-        <hookup path="ForwardButton" class="CButton" required="true"/>
-        <hookup path="BackButton" class="CButton" required="true"/>
-        <hookup path="GoButton" class="CButton" required="true"/>
-        <hookup path="ScrollBar" class="CScrollBar" required="true"/>
-        <hookup path="AddressEditBox" class="CEditBox" required="true"/>
-    </frameType>
-
-    <frameType name="SceneBrowser" classType="CSceneBrowser" blizzOnly="true">
-        <hookup path="BrowserImage" class="CImage" required="true"/>
-        <hookup path="ForwardButton" class="CButton" required="true"/>
-        <hookup path="BackButton" class="CButton" required="true"/>
-        <hookup path="GoButton" class="CButton" required="true"/>
-        <hookup path="ScrollBar" class="CScrollBar" required="true"/>
-        <hookup path="AddressEditBox" class="CEditBox" required="true"/>
-    </frameType>
 </map>