Merge pull request #36 from wiktorwiktor12/longhorn

Never let me use git again....... (Revert last commit)
wiktorwiktor12 · Sep 3, 2024 · de85212 · de85212
2 parents e29ed7d + d259ad7
commit de85212
Show file tree

Hide file tree

Showing 123 changed files with 170 additions and 169 deletions.
diff --git a/ConsoleLogonUI/resources/1.bmp b/ConsoleLogonUI/resources/1.bmp
diff --git a/ConsoleLogonUI/resources/10.bmp b/ConsoleLogonUI/resources/10.bmp
diff --git a/ConsoleLogonUI/resources/1000.bmp b/ConsoleLogonUI/resources/1000.bmp
diff --git a/ConsoleLogonUI/resources/1001.bmp b/ConsoleLogonUI/resources/1001.bmp
diff --git a/ConsoleLogonUI/resources/1002.bmp b/ConsoleLogonUI/resources/1002.bmp
diff --git a/ConsoleLogonUI/resources/1003.bmp b/ConsoleLogonUI/resources/1003.bmp
diff --git a/ConsoleLogonUI/resources/1004.bmp b/ConsoleLogonUI/resources/1004.bmp
diff --git a/ConsoleLogonUI/resources/1005.bmp b/ConsoleLogonUI/resources/1005.bmp
diff --git a/ConsoleLogonUI/resources/1006.bmp b/ConsoleLogonUI/resources/1006.bmp
diff --git a/ConsoleLogonUI/resources/1007.bmp b/ConsoleLogonUI/resources/1007.bmp
diff --git a/ConsoleLogonUI/resources/11.bmp b/ConsoleLogonUI/resources/11.bmp
diff --git a/ConsoleLogonUI/resources/12.bmp b/ConsoleLogonUI/resources/12.bmp
diff --git a/ConsoleLogonUI/resources/12201.bmp b/ConsoleLogonUI/resources/12201.bmp
diff --git a/ConsoleLogonUI/resources/12202.bmp b/ConsoleLogonUI/resources/12202.bmp
diff --git a/ConsoleLogonUI/resources/12203.bmp b/ConsoleLogonUI/resources/12203.bmp
diff --git a/ConsoleLogonUI/resources/12204.bmp b/ConsoleLogonUI/resources/12204.bmp
diff --git a/ConsoleLogonUI/resources/12205.bmp b/ConsoleLogonUI/resources/12205.bmp
diff --git a/ConsoleLogonUI/resources/12206.bmp b/ConsoleLogonUI/resources/12206.bmp
diff --git a/ConsoleLogonUI/resources/12207.bmp b/ConsoleLogonUI/resources/12207.bmp
diff --git a/ConsoleLogonUI/resources/12208.bmp b/ConsoleLogonUI/resources/12208.bmp
diff --git a/ConsoleLogonUI/resources/12209.bmp b/ConsoleLogonUI/resources/12209.bmp
diff --git a/ConsoleLogonUI/resources/12210.bmp b/ConsoleLogonUI/resources/12210.bmp
diff --git a/ConsoleLogonUI/resources/12211.bmp b/ConsoleLogonUI/resources/12211.bmp
diff --git a/ConsoleLogonUI/resources/12212.bmp b/ConsoleLogonUI/resources/12212.bmp
diff --git a/ConsoleLogonUI/resources/12259.bmp b/ConsoleLogonUI/resources/12259.bmp
diff --git a/ConsoleLogonUI/resources/12260.bmp b/ConsoleLogonUI/resources/12260.bmp
diff --git a/ConsoleLogonUI/resources/12261.bmp b/ConsoleLogonUI/resources/12261.bmp
diff --git a/ConsoleLogonUI/resources/12262.bmp b/ConsoleLogonUI/resources/12262.bmp
diff --git a/ConsoleLogonUI/resources/12263.bmp b/ConsoleLogonUI/resources/12263.bmp
diff --git a/ConsoleLogonUI/resources/12264.bmp b/ConsoleLogonUI/resources/12264.bmp
diff --git a/ConsoleLogonUI/resources/12265.bmp b/ConsoleLogonUI/resources/12265.bmp
diff --git a/ConsoleLogonUI/resources/12266.bmp b/ConsoleLogonUI/resources/12266.bmp
diff --git a/ConsoleLogonUI/resources/12267.bmp b/ConsoleLogonUI/resources/12267.bmp
diff --git a/ConsoleLogonUI/resources/12268.bmp b/ConsoleLogonUI/resources/12268.bmp
diff --git a/ConsoleLogonUI/resources/12269.bmp b/ConsoleLogonUI/resources/12269.bmp
diff --git a/ConsoleLogonUI/resources/12270.bmp b/ConsoleLogonUI/resources/12270.bmp
diff --git a/ConsoleLogonUI/resources/12271.bmp b/ConsoleLogonUI/resources/12271.bmp
diff --git a/ConsoleLogonUI/resources/12272.bmp b/ConsoleLogonUI/resources/12272.bmp
diff --git a/ConsoleLogonUI/resources/12273.bmp b/ConsoleLogonUI/resources/12273.bmp
diff --git a/ConsoleLogonUI/resources/12292.bmp b/ConsoleLogonUI/resources/12292.bmp
diff --git a/ConsoleLogonUI/resources/12293.bmp b/ConsoleLogonUI/resources/12293.bmp
diff --git a/ConsoleLogonUI/resources/12294.bmp b/ConsoleLogonUI/resources/12294.bmp
diff --git a/ConsoleLogonUI/resources/12295.bmp b/ConsoleLogonUI/resources/12295.bmp
diff --git a/ConsoleLogonUI/resources/12296.bmp b/ConsoleLogonUI/resources/12296.bmp
diff --git a/ConsoleLogonUI/resources/12298.bmp b/ConsoleLogonUI/resources/12298.bmp
diff --git a/ConsoleLogonUI/resources/12299.bmp b/ConsoleLogonUI/resources/12299.bmp
diff --git a/ConsoleLogonUI/resources/12300.bmp b/ConsoleLogonUI/resources/12300.bmp
diff --git a/ConsoleLogonUI/resources/12301.bmp b/ConsoleLogonUI/resources/12301.bmp
diff --git a/ConsoleLogonUI/resources/12302.bmp b/ConsoleLogonUI/resources/12302.bmp
diff --git a/ConsoleLogonUI/resources/12303.bmp b/ConsoleLogonUI/resources/12303.bmp
diff --git a/ConsoleLogonUI/resources/12304.bmp b/ConsoleLogonUI/resources/12304.bmp
diff --git a/ConsoleLogonUI/resources/12305.bmp b/ConsoleLogonUI/resources/12305.bmp
diff --git a/ConsoleLogonUI/resources/12306.bmp b/ConsoleLogonUI/resources/12306.bmp
diff --git a/ConsoleLogonUI/resources/12307.bmp b/ConsoleLogonUI/resources/12307.bmp
diff --git a/ConsoleLogonUI/resources/12309.bmp b/ConsoleLogonUI/resources/12309.bmp
diff --git a/ConsoleLogonUI/resources/12310.bmp b/ConsoleLogonUI/resources/12310.bmp
diff --git a/ConsoleLogonUI/resources/12311.bmp b/ConsoleLogonUI/resources/12311.bmp
diff --git a/ConsoleLogonUI/resources/12312.bmp b/ConsoleLogonUI/resources/12312.bmp
diff --git a/ConsoleLogonUI/resources/12313.bmp b/ConsoleLogonUI/resources/12313.bmp
diff --git a/ConsoleLogonUI/resources/12314.bmp b/ConsoleLogonUI/resources/12314.bmp
diff --git a/ConsoleLogonUI/resources/12315.bmp b/ConsoleLogonUI/resources/12315.bmp
diff --git a/ConsoleLogonUI/resources/12316.bmp b/ConsoleLogonUI/resources/12316.bmp
diff --git a/ConsoleLogonUI/resources/12317.bmp b/ConsoleLogonUI/resources/12317.bmp
diff --git a/ConsoleLogonUI/resources/12318.bmp b/ConsoleLogonUI/resources/12318.bmp
diff --git a/ConsoleLogonUI/resources/12320.bmp b/ConsoleLogonUI/resources/12320.bmp
diff --git a/ConsoleLogonUI/resources/12321.bmp b/ConsoleLogonUI/resources/12321.bmp
diff --git a/ConsoleLogonUI/resources/12322.bmp b/ConsoleLogonUI/resources/12322.bmp
diff --git a/ConsoleLogonUI/resources/12323.bmp b/ConsoleLogonUI/resources/12323.bmp
diff --git a/ConsoleLogonUI/resources/12324.bmp b/ConsoleLogonUI/resources/12324.bmp
diff --git a/ConsoleLogonUI/resources/13.bmp b/ConsoleLogonUI/resources/13.bmp
diff --git a/ConsoleLogonUI/resources/14.bmp b/ConsoleLogonUI/resources/14.bmp
diff --git a/ConsoleLogonUI/resources/15.bmp b/ConsoleLogonUI/resources/15.bmp
diff --git a/ConsoleLogonUI/resources/16.bmp b/ConsoleLogonUI/resources/16.bmp
diff --git a/ConsoleLogonUI/resources/17.bmp b/ConsoleLogonUI/resources/17.bmp
diff --git a/ConsoleLogonUI/resources/18.bmp b/ConsoleLogonUI/resources/18.bmp
diff --git a/ConsoleLogonUI/resources/19.bmp b/ConsoleLogonUI/resources/19.bmp
diff --git a/ConsoleLogonUI/resources/2.bmp b/ConsoleLogonUI/resources/2.bmp
diff --git a/ConsoleLogonUI/resources/20.bmp b/ConsoleLogonUI/resources/20.bmp
diff --git a/ConsoleLogonUI/resources/21.bmp b/ConsoleLogonUI/resources/21.bmp
diff --git a/ConsoleLogonUI/resources/22.bmp b/ConsoleLogonUI/resources/22.bmp
diff --git a/ConsoleLogonUI/resources/23.bmp b/ConsoleLogonUI/resources/23.bmp
diff --git a/ConsoleLogonUI/resources/3.bmp b/ConsoleLogonUI/resources/3.bmp
diff --git a/ConsoleLogonUI/resources/4.bmp b/ConsoleLogonUI/resources/4.bmp
diff --git a/ConsoleLogonUI/resources/5.bmp b/ConsoleLogonUI/resources/5.bmp
diff --git a/ConsoleLogonUI/resources/5031.jpg b/ConsoleLogonUI/resources/5031.jpg
diff --git a/ConsoleLogonUI/resources/5032.jpg b/ConsoleLogonUI/resources/5032.jpg
diff --git a/ConsoleLogonUI/resources/5033.jpg b/ConsoleLogonUI/resources/5033.jpg
diff --git a/ConsoleLogonUI/resources/5034.jpg b/ConsoleLogonUI/resources/5034.jpg
diff --git a/ConsoleLogonUI/resources/5035.jpg b/ConsoleLogonUI/resources/5035.jpg
diff --git a/ConsoleLogonUI/resources/5036.jpg b/ConsoleLogonUI/resources/5036.jpg
diff --git a/ConsoleLogonUI/resources/5037.jpg b/ConsoleLogonUI/resources/5037.jpg
diff --git a/ConsoleLogonUI/resources/5038.jpg b/ConsoleLogonUI/resources/5038.jpg
diff --git a/ConsoleLogonUI/resources/5039.jpg b/ConsoleLogonUI/resources/5039.jpg
diff --git a/ConsoleLogonUI/resources/5040.jpg b/ConsoleLogonUI/resources/5040.jpg
diff --git a/ConsoleLogonUI/resources/5041.jpg b/ConsoleLogonUI/resources/5041.jpg
diff --git a/ConsoleLogonUI/resources/5042.jpg b/ConsoleLogonUI/resources/5042.jpg
diff --git a/ConsoleLogonUI/resources/5043.jpg b/ConsoleLogonUI/resources/5043.jpg
diff --git a/ConsoleLogonUI/resources/5044.jpg b/ConsoleLogonUI/resources/5044.jpg
diff --git a/ConsoleLogonUI/resources/5045.jpg b/ConsoleLogonUI/resources/5045.jpg
diff --git a/ConsoleLogonUI/resources/5046.jpg b/ConsoleLogonUI/resources/5046.jpg
diff --git a/ConsoleLogonUI/resources/5047.jpg b/ConsoleLogonUI/resources/5047.jpg
diff --git a/ConsoleLogonUI/resources/5048.jpg b/ConsoleLogonUI/resources/5048.jpg
diff --git a/ConsoleLogonUI/resources/5049.jpg b/ConsoleLogonUI/resources/5049.jpg
diff --git a/ConsoleLogonUI/resources/5050.jpg b/ConsoleLogonUI/resources/5050.jpg
diff --git a/ConsoleLogonUI/resources/5051.jpg b/ConsoleLogonUI/resources/5051.jpg
diff --git a/ConsoleLogonUI/resources/5052.jpg b/ConsoleLogonUI/resources/5052.jpg
diff --git a/ConsoleLogonUI/resources/5053.jpg b/ConsoleLogonUI/resources/5053.jpg
diff --git a/ConsoleLogonUI/resources/5054.jpg b/ConsoleLogonUI/resources/5054.jpg
diff --git a/ConsoleLogonUI/resources/5055.jpg b/ConsoleLogonUI/resources/5055.jpg
diff --git a/ConsoleLogonUI/resources/5056.jpg b/ConsoleLogonUI/resources/5056.jpg
diff --git a/ConsoleLogonUI/resources/6.bmp b/ConsoleLogonUI/resources/6.bmp
diff --git a/ConsoleLogonUI/resources/7.bmp b/ConsoleLogonUI/resources/7.bmp
diff --git a/ConsoleLogonUI/resources/8.bmp b/ConsoleLogonUI/resources/8.bmp
diff --git a/ConsoleLogonUI/resources/9.bmp b/ConsoleLogonUI/resources/9.bmp
diff --git a/ConsoleLogonUI/resources/ConsoleLogonUI.rc b/ConsoleLogonUI/resources/ConsoleLogonUI.rc
@@ -15,31 +15,32 @@ IDB_SPINNER2							BITMAP				  "Bitmap5001.bmp"
 IDB_SPINNER3							BITMAP				  "Bitmap5002.bmp"
 IDB_SPINNER4							BITMAP				  "Bitmap5003.bmp"
 IDB_SPINNER5							BITMAP				  "Bitmap5004.bmp"
-IDB_BG								    BITMAP				  "IMAGE5035.bmp"
-
-IDB_1 BITMAP "1.bmp"
-IDB_2 BITMAP "2.bmp"
-IDB_3 BITMAP "3.bmp"
-IDB_4 BITMAP "4.bmp"
-IDB_5 BITMAP "5.bmp"
-IDB_6 BITMAP "6.bmp"
-IDB_7 BITMAP "7.bmp"
-IDB_8 BITMAP "8.bmp"
-IDB_9 BITMAP "9.bmp"
-IDB_10 BITMAP "10.bmp"
-IDB_11 BITMAP "11.bmp"
-IDB_12 BITMAP "12.bmp"
-IDB_13 BITMAP "13.bmp"
-IDB_14 BITMAP "14.bmp"
-IDB_15 BITMAP "15.bmp"
-IDB_16 BITMAP "16.bmp"
-IDB_17 BITMAP "17.bmp"
-IDB_18 BITMAP "18.bmp"
-IDB_19 BITMAP "19.bmp"
-IDB_20 BITMAP "20.bmp"
-IDB_21 BITMAP "21.bmp"
-IDB_22 BITMAP "22.bmp"
-IDB_23 BITMAP "23.bmp"
+IDB_BG								IMAGE				  "5031.jpg"
+IDB_BG2								IMAGE				  "5032.jpg"
+IDB_BG3								IMAGE				  "5033.jpg"
+IDB_BG4								IMAGE				  "5034.jpg"
+IDB_BG5								IMAGE				  "5035.jpg"
+IDB_BG6								IMAGE				  "5036.jpg"
+IDB_BG7								IMAGE				  "5037.jpg"
+IDB_BG8 IMAGE "5038.jpg"
+IDB_BG9 IMAGE "5039.jpg"
+IDB_BG10 IMAGE "5040.jpg"
+IDB_BG11 IMAGE "5041.jpg"
+IDB_BG12 IMAGE "5042.jpg"
+IDB_BG13 IMAGE "5043.jpg"
+IDB_BG14 IMAGE "5044.jpg"
+IDB_BG15 IMAGE "5045.jpg"
+IDB_BG16 IMAGE "5046.jpg"
+IDB_BG17 IMAGE "5047.jpg"
+IDB_BG18 IMAGE "5048.jpg"
+IDB_BG19 IMAGE "5049.jpg"
+IDB_BG20 IMAGE "5050.jpg"
+IDB_BG21 IMAGE "5051.jpg"
+IDB_BG22 IMAGE "5052.jpg"
+IDB_BG23 IMAGE "5053.jpg"
+IDB_BG24 IMAGE "5054.jpg"
+IDB_BG25 IMAGE "5055.jpg"
+IDB_BG26 IMAGE "5056.jpg"
 
 
 IDB_EDITDISABLED						BITMAP                "11000.bmp"

diff --git a/ConsoleLogonUI/resources/IMAGE5035.bmp b/ConsoleLogonUI/resources/IMAGE5035.bmp
diff --git a/ConsoleLogonUI/resources/Main.xml b/ConsoleLogonUI/resources/Main.xml
@@ -1,16 +1,13 @@
 <duixml>
     <stylesheets>
         <style resid="LogonStyle">
-
+            <if id="atom(MainFrame)">
+                <element background="gradient(rgb(0,132,217), rgb(0,36,58), 1)" accessible="true" accrole="9" accname="Logon Frame"/>
+            </if>
             <if class="status">
                 <element background="argb(0,0,0,0)" foreground="argb(255,255,255,255)" shadowintensity="75" fontsize="18pt" fontstyle="Shadow" padding="rect(24rp,0,0,100rp)"/>
             </if>
 
-
-            <if id="atom(Background)">
-                <element background="resbmp(113,4,-1,0,0,0,0)"/>
-            </if>
-
             <if class="passwordBox">
                 <edit width="225rp" height="25rp" font="resstr(11800)" shadowintensity="75" margin = "rect(0rp, 3rp, 0rp, 3rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" borderthickness = "rect(4, 4, 4, 4)"
 				bordercolor="gray" accessible="true" accrole="42" background="resbmp(11003, 7,-1,0,0,1,1)" passwordcharacter="9679"/>
@@ -61,33 +58,33 @@
                 <element margin="rect(6rp, 0rp, 6rp, 0rp)"/>
             </if>
             <if id="atom(Shutdown)">
-                <button height="28rp" borderthickness="rect(4rp, 1rp, 4rp, 1rp)" background="resbmp(12296,7,-1,0,0,1,1)" foreground="white" contentalign="middlecenter" content="Shut down" margin="rect(0,0,0,0)" accdesc="resstr(12128)" bordercolor="white" borderstyle="raised"/>
+                <button width="38rp" height="28rp" borderthickness="rect(4rp, 1rp, 4rp, 1rp)" background="resbmp(12296,7,-1,0,0,1,1)" contentalign="middlecenter" content="resbmp(12215,2,-1,0,0,1,1)" margin="rect(0,0,0,0)" accdesc="resstr(12128)" bordercolor="gray" borderstyle="raised"/>
                 <if selected="true">
-                    <button content="resstr(3008)" accdesc="resstr(12133)" bordercolor="windowtext" borderstyle="solid"/>
+                    <button content="resbmp(12216,2,-1,0,0,1,1)" accdesc="resstr(12133)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if keyfocused="true">
-                    <button background="resbmp(12293,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12293,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button background="resbmp(12294,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12294,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true" keyfocused="true" pressed="false">
-                    <button background="resbmp(12292,7,-1,0,0,1,1)" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12292,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
                     <button background="resbmp(12295,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                 </if>
             </if>
             <if id="atom(ShutdownOptions)">
-                <button width="20rp" height="28rp" foreground="white" contentalign="middlecenter" background="resbmp(12302,7,-1,0,0,1,1)" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" margin="rect(0,0,0,0)" bordercolor="gray" borderstyle="raised" content=">"/>
+                <button width="20rp" height="28rp" contentalign="middlecenter" content="resbmp(12217,2,-1,0,0,1,1)" background="resbmp(12302,7,-1,0,0,1,1)" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" margin="rect(0,0,0,0)" bordercolor="gray" borderstyle="raised"/>
                 <if keyfocused="true">
-                    <button background="resbmp(12299,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12299,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button background="resbmp(12300,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12300,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true" keyfocused="true" pressed="false">
-                    <button background="resbmp(12298,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12298,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
                     <button background="resbmp(12301,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
@@ -101,25 +98,28 @@
     </stylesheets>
 
 
-    <element resid="Main" layout="flowlayout(1,2,2,2)" sheet="LogonStyle">
-        <duiBackgroundWindow width="2560rp" height="1600rp" id="atom(InsideFrame)" layout="filllayout()">
+    <element resid="Main" sheet="LogonStyle" layout="verticalflowlayout(1,2,2,2)" id="atom(MainFrame)">
+        <duiBackgroundWindow layout="filllayout()" width="2560rp" height="1600rp" background="gradient(rgb(0,132,217), rgb(0,36,58), 1)" id="atom(InsideFrame)">
+            <element layout="flowlayout(0, 0, 0, 0)" padding="rect(5rp,5rp,5rp,5rp)" > <!--TODO: style this -->
+                <element id="atom(LanguageBarParent)" layout="filllayout()" visible="false"/>
+            </element>
             <!--This is the footer for the branding and the options buttons such as the shutdown,ease of access and power options-->
-            <element layout="borderlayout()" id="atom(Background)">
+            <element layout="borderlayout()">
                 <element id="atom(SoftKeyboardParent)" layout="borderlayout()" layoutpos="none" />
                 <element id="atom(Options)" layoutpos="bottom" visible="true" enabled="true" layout="filllayout()" background="argb(0,116,184,252)" height="96rp">
 
                     <element id="atom(OptionsButton)" layout="borderlayout()" padding="rect(34rp, 34rp, 34rp, 34rp)">
-                        <button id="atom(buttonEaseOfAccess)" tooltip="true" layoutpos="none"/>
+                        <button id="atom(buttonEaseOfAccess)" tooltip="true" layoutpos="left"/>
                         <button id="atom(ToggleTabletKeyboard)" tooltip="true" layoutpos="none"/>
-                        <element layout="flowlayout(0,1,2,2)" layoutpos="left">
+                        <element layout="flowlayout(0,1,2,2)" layoutpos="right">
                             <element id="atom(ShutDownFrame)" layout="flowlayout()">
                                 <button id="atom(ShutDown)" accname="resstr(12128)" tooltip="true"/>
-                                <button id="atom(ShutDownOptions)" accname="resstr(12131)" accdesc="resstr(12131)" tooltip="true"/>
+                                <button id="atom(ShutDownOptions)" accname="resstr(12131)" accdesc="resstr(12131)" tooltip="true" shortcut="115"/>
                             </element>
                         </element>
                     </element>
                     <element layout="flowlayout(0,2,2,2)">
-                        <element id="atom(BrandingImage)" class="branding" layoutpos="none"/>
+                        <element id="atom(BrandingImage)" class="branding" />
                     </element>
                 </element>
                 <element layoutpos="auto" visible="true" enabled="true" layout="filllayout()" background="argb(0,116,184,252)" height="1504rp">

diff --git a/ConsoleLogonUI/resources/messageview.xml b/ConsoleLogonUI/resources/messageview.xml
@@ -192,18 +192,18 @@
                 <element contentalign="wrapleft" padding="rect(0rp,10rp,0rp,0rp)"/>
             </if>
             <if id="atom(LockedMessage)">
-                <element font="18;normal;shadow;Tahoma" shadowintensity="75" padding="rect(34rp,0rp,34rp,0rp)" contentalign="wrapcenter" accessible="true" accrole="41"/>
+                <element font="18;normal;shadow;Segoe UI" shadowintensity="75" padding="rect(34rp,0rp,34rp,0rp)" contentalign="wrapcenter" accessible="true" accrole="41"/>
             </if>
             <if id="atom(LockedSubMessage)">
-                <element font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="wrapcenter" padding="rect(0rp,10rp,0rp,10rp)" accessible="true" accrole="41"/>
+                <element font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="wrapcenter" padding="rect(0rp,10rp,0rp,10rp)" accessible="true" accrole="41"/>
             </if>
             <if id="atom(SecurityOptions)">
                 <element contentalign="middlecenter"/>
             </if>
             <if id="atom(SecurityInformation)">
                 <element contentalign="wrapleft" padding="rect(0rp, 0rp, 0rp, 20rp)" accessible="true" accrole="41"/>
             </if>
-            <button foreground="white" font="11;normal;shadow;Tahoma" shadowintensity="75" fontface="Segoe UI" cursor="arrow" accessible="true" accrole="43"/>
+            <button foreground="white" font="11;normal;shadow;Segoe UI" shadowintensity="75" fontface="Segoe UI" cursor="arrow" accessible="true" accrole="43"/>
         </style>
 
     </stylesheets>
@@ -219,34 +219,34 @@
                             <element id="atom(LockedMessage)"/>
                             <element id="atom(LockedSubMessage)"/>
                         </element>
-                        <element id="atom(Window)" layout="borderlayout()" width="536rp" height="337rp" background="resbmp(12,7,-1,0,0,1,1)" borderthickness="rect(45rp, 140rp, 45rp, 45rp)" padding="rect(0rp, 0rp, 0rp, -40rp)" animation="rectanglev|s|fast">
-                            <element id="atom(InsideWindow)" layoutpos="client" layout="filllayout()" animation="rectanglev|s|fast">
+                        <element id="atom(Window)" layout="borderlayout()">
+                            <element id="atom(InsideWindow)" layoutpos="client" layout="filllayout()">
                                 <element id="atom(MessageFrame)" layout="filllayout()" visible="true">
                                     <element id="atom(FullMessageFrame)" layout="borderlayout()">
                                         <macro layoutpos="bottom" expand="hr" margin="rect(0,0,0,8rp)" id="atom(LowerDiv)"/>
                                         <StyledScrollviewer sheet="ScrollStyle" id="atom(MessageScrollviewer)" xscrollable="false" padding="rect(0rp,0rp,0rp,0rp)" layoutpos="bottom" width="600rp" height="300rp">
-                                            <element layoutpos="top" content="" sheet="MainFrameStyle" id="atom(Message)" width="600rp" font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="wrapleft" accessible="true" accrole="41"/>
+                                            <element layoutpos="top" content="" sheet="MainFrameStyle" id="atom(Message)" width="600rp" font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="wrapleft" accessible="true" accrole="41"/>
                                         </StyledScrollviewer>
                                         <macro expand="hr" layoutpos="bottom" id="atom(UpperDiv)" margin="rect(0rp, 5rp, 0rp, 0rp)"/>
                                         <element layoutpos="bottom" layout="flowlayout()">
                                             <element layout="flowlayout(0,2,1)" padding="rect(0rp,0rp,8rp,0rp)">
                                                 <element id="atom(FullIcon)" width="sysmetric(11)" height="sysmetric(12)"/>
                                             </element>
-                                            <element id="atom(MessageCaption)" content="" font="12;normal;shadow;Tahoma" shadowintensity="75" accessible="true" accrole="41"/>
+                                            <element id="atom(MessageCaption)" content="" font="12;normal;shadow;Segoe UI" shadowintensity="75" accessible="true" accrole="41"/>
                                         </element>
                                     </element>
                                     <element id="atom(ShortMessageFrame)" layout="borderlayout()" height="406rp" width="600rp" visible="true">
                                         <element layoutpos="bottom" layout="flowlayout(1,1,2,2)" padding="rect(0rp,0rp,0rp,0rp)">
                                             <StyledScrollviewer layoutpos="bottom" sheet="ScrollStyle" id="atom(ShortScrollviewer)" visible="true" xscrollable="false" margin="rect(8rp, 10rp, 0rp, 0rp)">
                                                 <element layout="flowlayout(0, 0, 0, 0)" padding="rect(4rp, 0rp, 4rp, 0rp)" visible="true">
                                                     <element id="atom(ShortIcon)" width="sysmetric(11)" height="sysmetric(12)"/>
-                                                    <element sheet="MainFrameStyle" id="atom(ShortMessage)" content="short Message abcdef" font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="wrapleft" accessible="true" visible="true" accrole="41" padding="rect(8rp, 10rp, 0rp, 0rp)"/>
+                                                    <element sheet="MainFrameStyle" id="atom(ShortMessage)" content="short Message abcdef" font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="wrapleft" accessible="true" visible="true" accrole="41" padding="rect(8rp, 10rp, 0rp, 0rp)"/>
                                                 </element>
                                             </StyledScrollviewer>
                                         </element>
                                     </element>
                                     <element id="atom(ConnectMessageFrame)" layout="verticalflowlayout(1,2,2,2)">
-                                        <element id="atom(ConnectMessage)" foreground="white" contentalign="wrapcenter" accessible="true" accrole="41" font="12;normal;shadow;Tahoma" shadowintensity="75"/>
+                                        <element id="atom(ConnectMessage)" foreground="white" contentalign="wrapcenter" accessible="true" accrole="41" font="12;normal;shadow;Segoe UI" shadowintensity="75"/>
                                     </element>
                                 </element>
                             </element>

diff --git a/ConsoleLogonUI/resources/resource.h b/ConsoleLogonUI/resources/resource.h
@@ -13,32 +13,32 @@
 #define IDB_SPINNER3 110
 #define IDB_SPINNER4 111
 #define IDB_SPINNER5 112
-#define IDB_BG 113
-
-#define IDB_1 1
-#define IDB_2 2
-#define IDB_3 3
-#define IDB_4 4
-#define IDB_5 5
-#define IDB_6 6
-#define IDB_7 7
-#define IDB_8 8
-#define IDB_9 9
-#define IDB_10 10
-#define IDB_11 11
-#define IDB_12 12
-#define IDB_13 13
-#define IDB_14 14
-#define IDB_15 15
-#define IDB_16 16
-#define IDB_17 17
-#define IDB_18 18
-#define IDB_19 19
-#define IDB_20 20
-#define IDB_21 21
-#define IDB_22 22
-#define IDB_23 23
-
+#define IDB_BG 5031
+#define IDB_BG2 5032
+#define IDB_BG3 5033
+#define IDB_BG4 5034
+#define IDB_BG5 5035
+#define IDB_BG6 5036
+#define IDB_BG7 5037
+#define IDB_BG8 5038
+#define IDB_BG9 5039
+#define IDB_BG10 5040
+#define IDB_BG11 5041
+#define IDB_BG12 5042
+#define IDB_BG13 5043
+#define IDB_BG14 5044
+#define IDB_BG15 5045
+#define IDB_BG16 5046
+#define IDB_BG17 5047
+#define IDB_BG18 5048
+#define IDB_BG19 5049
+#define IDB_BG20 5050
+#define IDB_BG21 5051
+#define IDB_BG22 5052
+#define IDB_BG23 5053
+#define IDB_BG24 5054
+#define IDB_BG25 5055
+#define IDB_BG26 5056
 
 #define IDB_EDITDISABLED 11000
 #define IDB_EDITACTIVE 11001