diff --git a/ConsoleLogonUI/resources/1.bmp b/ConsoleLogonUI/resources/1.bmp
deleted file mode 100644
index 8c70234..0000000
Binary files a/ConsoleLogonUI/resources/1.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/10.bmp b/ConsoleLogonUI/resources/10.bmp
deleted file mode 100644
index 0d9558e..0000000
Binary files a/ConsoleLogonUI/resources/10.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1000.bmp b/ConsoleLogonUI/resources/1000.bmp
deleted file mode 100644
index fdcff32..0000000
Binary files a/ConsoleLogonUI/resources/1000.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1001.bmp b/ConsoleLogonUI/resources/1001.bmp
deleted file mode 100644
index 0fa2708..0000000
Binary files a/ConsoleLogonUI/resources/1001.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1002.bmp b/ConsoleLogonUI/resources/1002.bmp
deleted file mode 100644
index dcd3db1..0000000
Binary files a/ConsoleLogonUI/resources/1002.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1003.bmp b/ConsoleLogonUI/resources/1003.bmp
deleted file mode 100644
index e8d4784..0000000
Binary files a/ConsoleLogonUI/resources/1003.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1004.bmp b/ConsoleLogonUI/resources/1004.bmp
deleted file mode 100644
index c369e0b..0000000
Binary files a/ConsoleLogonUI/resources/1004.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1005.bmp b/ConsoleLogonUI/resources/1005.bmp
deleted file mode 100644
index fdcff32..0000000
Binary files a/ConsoleLogonUI/resources/1005.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1006.bmp b/ConsoleLogonUI/resources/1006.bmp
deleted file mode 100644
index a3c5347..0000000
Binary files a/ConsoleLogonUI/resources/1006.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/1007.bmp b/ConsoleLogonUI/resources/1007.bmp
deleted file mode 100644
index f0a1411..0000000
Binary files a/ConsoleLogonUI/resources/1007.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/11.bmp b/ConsoleLogonUI/resources/11.bmp
deleted file mode 100644
index a0cce72..0000000
Binary files a/ConsoleLogonUI/resources/11.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/12.bmp b/ConsoleLogonUI/resources/12.bmp
deleted file mode 100644
index a125d93..0000000
Binary files a/ConsoleLogonUI/resources/12.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/12201.bmp b/ConsoleLogonUI/resources/12201.bmp
index 6fe6c6c..5ef8d75 100644
Binary files a/ConsoleLogonUI/resources/12201.bmp and b/ConsoleLogonUI/resources/12201.bmp differ
diff --git a/ConsoleLogonUI/resources/12202.bmp b/ConsoleLogonUI/resources/12202.bmp
index 6fe6c6c..f95ffe9 100644
Binary files a/ConsoleLogonUI/resources/12202.bmp and b/ConsoleLogonUI/resources/12202.bmp differ
diff --git a/ConsoleLogonUI/resources/12203.bmp b/ConsoleLogonUI/resources/12203.bmp
index 6fe6c6c..3dcdbfd 100644
Binary files a/ConsoleLogonUI/resources/12203.bmp and b/ConsoleLogonUI/resources/12203.bmp differ
diff --git a/ConsoleLogonUI/resources/12204.bmp b/ConsoleLogonUI/resources/12204.bmp
index ef364a6..afe529a 100644
Binary files a/ConsoleLogonUI/resources/12204.bmp and b/ConsoleLogonUI/resources/12204.bmp differ
diff --git a/ConsoleLogonUI/resources/12205.bmp b/ConsoleLogonUI/resources/12205.bmp
index ef364a6..29ab33c 100644
Binary files a/ConsoleLogonUI/resources/12205.bmp and b/ConsoleLogonUI/resources/12205.bmp differ
diff --git a/ConsoleLogonUI/resources/12206.bmp b/ConsoleLogonUI/resources/12206.bmp
index ef364a6..843dd74 100644
Binary files a/ConsoleLogonUI/resources/12206.bmp and b/ConsoleLogonUI/resources/12206.bmp differ
diff --git a/ConsoleLogonUI/resources/12207.bmp b/ConsoleLogonUI/resources/12207.bmp
index 1778e3b..6899567 100644
Binary files a/ConsoleLogonUI/resources/12207.bmp and b/ConsoleLogonUI/resources/12207.bmp differ
diff --git a/ConsoleLogonUI/resources/12208.bmp b/ConsoleLogonUI/resources/12208.bmp
index 1778e3b..da1f084 100644
Binary files a/ConsoleLogonUI/resources/12208.bmp and b/ConsoleLogonUI/resources/12208.bmp differ
diff --git a/ConsoleLogonUI/resources/12209.bmp b/ConsoleLogonUI/resources/12209.bmp
index 1778e3b..8864fbb 100644
Binary files a/ConsoleLogonUI/resources/12209.bmp and b/ConsoleLogonUI/resources/12209.bmp differ
diff --git a/ConsoleLogonUI/resources/12210.bmp b/ConsoleLogonUI/resources/12210.bmp
index fec0686..52e2e1d 100644
Binary files a/ConsoleLogonUI/resources/12210.bmp and b/ConsoleLogonUI/resources/12210.bmp differ
diff --git a/ConsoleLogonUI/resources/12211.bmp b/ConsoleLogonUI/resources/12211.bmp
index fec0686..c79138e 100644
Binary files a/ConsoleLogonUI/resources/12211.bmp and b/ConsoleLogonUI/resources/12211.bmp differ
diff --git a/ConsoleLogonUI/resources/12212.bmp b/ConsoleLogonUI/resources/12212.bmp
index fec0686..7546415 100644
Binary files a/ConsoleLogonUI/resources/12212.bmp and b/ConsoleLogonUI/resources/12212.bmp differ
diff --git a/ConsoleLogonUI/resources/12259.bmp b/ConsoleLogonUI/resources/12259.bmp
index 13f5ab1..42903c2 100644
Binary files a/ConsoleLogonUI/resources/12259.bmp and b/ConsoleLogonUI/resources/12259.bmp differ
diff --git a/ConsoleLogonUI/resources/12260.bmp b/ConsoleLogonUI/resources/12260.bmp
index 13f5ab1..85a22ac 100644
Binary files a/ConsoleLogonUI/resources/12260.bmp and b/ConsoleLogonUI/resources/12260.bmp differ
diff --git a/ConsoleLogonUI/resources/12261.bmp b/ConsoleLogonUI/resources/12261.bmp
index 13f5ab1..0cf1532 100644
Binary files a/ConsoleLogonUI/resources/12261.bmp and b/ConsoleLogonUI/resources/12261.bmp differ
diff --git a/ConsoleLogonUI/resources/12262.bmp b/ConsoleLogonUI/resources/12262.bmp
index 13f5ab1..5bf69d0 100644
Binary files a/ConsoleLogonUI/resources/12262.bmp and b/ConsoleLogonUI/resources/12262.bmp differ
diff --git a/ConsoleLogonUI/resources/12263.bmp b/ConsoleLogonUI/resources/12263.bmp
index 13f5ab1..07ef4cd 100644
Binary files a/ConsoleLogonUI/resources/12263.bmp and b/ConsoleLogonUI/resources/12263.bmp differ
diff --git a/ConsoleLogonUI/resources/12264.bmp b/ConsoleLogonUI/resources/12264.bmp
index 13f5ab1..f248492 100644
Binary files a/ConsoleLogonUI/resources/12264.bmp and b/ConsoleLogonUI/resources/12264.bmp differ
diff --git a/ConsoleLogonUI/resources/12265.bmp b/ConsoleLogonUI/resources/12265.bmp
index 13f5ab1..7c1cda3 100644
Binary files a/ConsoleLogonUI/resources/12265.bmp and b/ConsoleLogonUI/resources/12265.bmp differ
diff --git a/ConsoleLogonUI/resources/12266.bmp b/ConsoleLogonUI/resources/12266.bmp
index 13f5ab1..8a9415c 100644
Binary files a/ConsoleLogonUI/resources/12266.bmp and b/ConsoleLogonUI/resources/12266.bmp differ
diff --git a/ConsoleLogonUI/resources/12267.bmp b/ConsoleLogonUI/resources/12267.bmp
index 13f5ab1..3712727 100644
Binary files a/ConsoleLogonUI/resources/12267.bmp and b/ConsoleLogonUI/resources/12267.bmp differ
diff --git a/ConsoleLogonUI/resources/12268.bmp b/ConsoleLogonUI/resources/12268.bmp
index 13f5ab1..7b8a163 100644
Binary files a/ConsoleLogonUI/resources/12268.bmp and b/ConsoleLogonUI/resources/12268.bmp differ
diff --git a/ConsoleLogonUI/resources/12269.bmp b/ConsoleLogonUI/resources/12269.bmp
index 13f5ab1..2116821 100644
Binary files a/ConsoleLogonUI/resources/12269.bmp and b/ConsoleLogonUI/resources/12269.bmp differ
diff --git a/ConsoleLogonUI/resources/12270.bmp b/ConsoleLogonUI/resources/12270.bmp
index 13f5ab1..f8239e3 100644
Binary files a/ConsoleLogonUI/resources/12270.bmp and b/ConsoleLogonUI/resources/12270.bmp differ
diff --git a/ConsoleLogonUI/resources/12271.bmp b/ConsoleLogonUI/resources/12271.bmp
index 13f5ab1..673be25 100644
Binary files a/ConsoleLogonUI/resources/12271.bmp and b/ConsoleLogonUI/resources/12271.bmp differ
diff --git a/ConsoleLogonUI/resources/12272.bmp b/ConsoleLogonUI/resources/12272.bmp
index 13f5ab1..c498140 100644
Binary files a/ConsoleLogonUI/resources/12272.bmp and b/ConsoleLogonUI/resources/12272.bmp differ
diff --git a/ConsoleLogonUI/resources/12273.bmp b/ConsoleLogonUI/resources/12273.bmp
index 13f5ab1..868b11f 100644
Binary files a/ConsoleLogonUI/resources/12273.bmp and b/ConsoleLogonUI/resources/12273.bmp differ
diff --git a/ConsoleLogonUI/resources/12292.bmp b/ConsoleLogonUI/resources/12292.bmp
index 13f5ab1..0a9ec10 100644
Binary files a/ConsoleLogonUI/resources/12292.bmp and b/ConsoleLogonUI/resources/12292.bmp differ
diff --git a/ConsoleLogonUI/resources/12293.bmp b/ConsoleLogonUI/resources/12293.bmp
index 13f5ab1..12dbbd7 100644
Binary files a/ConsoleLogonUI/resources/12293.bmp and b/ConsoleLogonUI/resources/12293.bmp differ
diff --git a/ConsoleLogonUI/resources/12294.bmp b/ConsoleLogonUI/resources/12294.bmp
index 13f5ab1..4dc11ca 100644
Binary files a/ConsoleLogonUI/resources/12294.bmp and b/ConsoleLogonUI/resources/12294.bmp differ
diff --git a/ConsoleLogonUI/resources/12295.bmp b/ConsoleLogonUI/resources/12295.bmp
index 13f5ab1..6fb8f36 100644
Binary files a/ConsoleLogonUI/resources/12295.bmp and b/ConsoleLogonUI/resources/12295.bmp differ
diff --git a/ConsoleLogonUI/resources/12296.bmp b/ConsoleLogonUI/resources/12296.bmp
index 13f5ab1..0a6b7fa 100644
Binary files a/ConsoleLogonUI/resources/12296.bmp and b/ConsoleLogonUI/resources/12296.bmp differ
diff --git a/ConsoleLogonUI/resources/12298.bmp b/ConsoleLogonUI/resources/12298.bmp
index 13f5ab1..f8654b9 100644
Binary files a/ConsoleLogonUI/resources/12298.bmp and b/ConsoleLogonUI/resources/12298.bmp differ
diff --git a/ConsoleLogonUI/resources/12299.bmp b/ConsoleLogonUI/resources/12299.bmp
index 13f5ab1..26687b7 100644
Binary files a/ConsoleLogonUI/resources/12299.bmp and b/ConsoleLogonUI/resources/12299.bmp differ
diff --git a/ConsoleLogonUI/resources/12300.bmp b/ConsoleLogonUI/resources/12300.bmp
index 13f5ab1..2ec588c 100644
Binary files a/ConsoleLogonUI/resources/12300.bmp and b/ConsoleLogonUI/resources/12300.bmp differ
diff --git a/ConsoleLogonUI/resources/12301.bmp b/ConsoleLogonUI/resources/12301.bmp
index 13f5ab1..01074cf 100644
Binary files a/ConsoleLogonUI/resources/12301.bmp and b/ConsoleLogonUI/resources/12301.bmp differ
diff --git a/ConsoleLogonUI/resources/12302.bmp b/ConsoleLogonUI/resources/12302.bmp
index 13f5ab1..a1b145b 100644
Binary files a/ConsoleLogonUI/resources/12302.bmp and b/ConsoleLogonUI/resources/12302.bmp differ
diff --git a/ConsoleLogonUI/resources/12303.bmp b/ConsoleLogonUI/resources/12303.bmp
index 13f5ab1..22b1db2 100644
Binary files a/ConsoleLogonUI/resources/12303.bmp and b/ConsoleLogonUI/resources/12303.bmp differ
diff --git a/ConsoleLogonUI/resources/12304.bmp b/ConsoleLogonUI/resources/12304.bmp
index 13f5ab1..1274e75 100644
Binary files a/ConsoleLogonUI/resources/12304.bmp and b/ConsoleLogonUI/resources/12304.bmp differ
diff --git a/ConsoleLogonUI/resources/12305.bmp b/ConsoleLogonUI/resources/12305.bmp
index 13f5ab1..a10a004 100644
Binary files a/ConsoleLogonUI/resources/12305.bmp and b/ConsoleLogonUI/resources/12305.bmp differ
diff --git a/ConsoleLogonUI/resources/12306.bmp b/ConsoleLogonUI/resources/12306.bmp
index 13f5ab1..6caff22 100644
Binary files a/ConsoleLogonUI/resources/12306.bmp and b/ConsoleLogonUI/resources/12306.bmp differ
diff --git a/ConsoleLogonUI/resources/12307.bmp b/ConsoleLogonUI/resources/12307.bmp
index 13f5ab1..65ae6cb 100644
Binary files a/ConsoleLogonUI/resources/12307.bmp and b/ConsoleLogonUI/resources/12307.bmp differ
diff --git a/ConsoleLogonUI/resources/12309.bmp b/ConsoleLogonUI/resources/12309.bmp
index 13f5ab1..448c78e 100644
Binary files a/ConsoleLogonUI/resources/12309.bmp and b/ConsoleLogonUI/resources/12309.bmp differ
diff --git a/ConsoleLogonUI/resources/12310.bmp b/ConsoleLogonUI/resources/12310.bmp
index 13f5ab1..16ce8a4 100644
Binary files a/ConsoleLogonUI/resources/12310.bmp and b/ConsoleLogonUI/resources/12310.bmp differ
diff --git a/ConsoleLogonUI/resources/12311.bmp b/ConsoleLogonUI/resources/12311.bmp
index 13f5ab1..4c2eead 100644
Binary files a/ConsoleLogonUI/resources/12311.bmp and b/ConsoleLogonUI/resources/12311.bmp differ
diff --git a/ConsoleLogonUI/resources/12312.bmp b/ConsoleLogonUI/resources/12312.bmp
index 13f5ab1..01020db 100644
Binary files a/ConsoleLogonUI/resources/12312.bmp and b/ConsoleLogonUI/resources/12312.bmp differ
diff --git a/ConsoleLogonUI/resources/12313.bmp b/ConsoleLogonUI/resources/12313.bmp
index 13f5ab1..a73fafd 100644
Binary files a/ConsoleLogonUI/resources/12313.bmp and b/ConsoleLogonUI/resources/12313.bmp differ
diff --git a/ConsoleLogonUI/resources/12314.bmp b/ConsoleLogonUI/resources/12314.bmp
index 13f5ab1..71598fd 100644
Binary files a/ConsoleLogonUI/resources/12314.bmp and b/ConsoleLogonUI/resources/12314.bmp differ
diff --git a/ConsoleLogonUI/resources/12315.bmp b/ConsoleLogonUI/resources/12315.bmp
index 13f5ab1..366cdc2 100644
Binary files a/ConsoleLogonUI/resources/12315.bmp and b/ConsoleLogonUI/resources/12315.bmp differ
diff --git a/ConsoleLogonUI/resources/12316.bmp b/ConsoleLogonUI/resources/12316.bmp
index 13f5ab1..f4b1097 100644
Binary files a/ConsoleLogonUI/resources/12316.bmp and b/ConsoleLogonUI/resources/12316.bmp differ
diff --git a/ConsoleLogonUI/resources/12317.bmp b/ConsoleLogonUI/resources/12317.bmp
index 13f5ab1..e885b9a 100644
Binary files a/ConsoleLogonUI/resources/12317.bmp and b/ConsoleLogonUI/resources/12317.bmp differ
diff --git a/ConsoleLogonUI/resources/12318.bmp b/ConsoleLogonUI/resources/12318.bmp
index 13f5ab1..eed0cfe 100644
Binary files a/ConsoleLogonUI/resources/12318.bmp and b/ConsoleLogonUI/resources/12318.bmp differ
diff --git a/ConsoleLogonUI/resources/12320.bmp b/ConsoleLogonUI/resources/12320.bmp
index 13f5ab1..f0aec0c 100644
Binary files a/ConsoleLogonUI/resources/12320.bmp and b/ConsoleLogonUI/resources/12320.bmp differ
diff --git a/ConsoleLogonUI/resources/12321.bmp b/ConsoleLogonUI/resources/12321.bmp
index 13f5ab1..43ebf95 100644
Binary files a/ConsoleLogonUI/resources/12321.bmp and b/ConsoleLogonUI/resources/12321.bmp differ
diff --git a/ConsoleLogonUI/resources/12322.bmp b/ConsoleLogonUI/resources/12322.bmp
index 13f5ab1..0106567 100644
Binary files a/ConsoleLogonUI/resources/12322.bmp and b/ConsoleLogonUI/resources/12322.bmp differ
diff --git a/ConsoleLogonUI/resources/12323.bmp b/ConsoleLogonUI/resources/12323.bmp
index 13f5ab1..43c4b0c 100644
Binary files a/ConsoleLogonUI/resources/12323.bmp and b/ConsoleLogonUI/resources/12323.bmp differ
diff --git a/ConsoleLogonUI/resources/12324.bmp b/ConsoleLogonUI/resources/12324.bmp
index 13f5ab1..cd4f798 100644
Binary files a/ConsoleLogonUI/resources/12324.bmp and b/ConsoleLogonUI/resources/12324.bmp differ
diff --git a/ConsoleLogonUI/resources/13.bmp b/ConsoleLogonUI/resources/13.bmp
deleted file mode 100644
index 4bb097d..0000000
Binary files a/ConsoleLogonUI/resources/13.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/14.bmp b/ConsoleLogonUI/resources/14.bmp
deleted file mode 100644
index 3cee63d..0000000
Binary files a/ConsoleLogonUI/resources/14.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/15.bmp b/ConsoleLogonUI/resources/15.bmp
deleted file mode 100644
index 15823ca..0000000
Binary files a/ConsoleLogonUI/resources/15.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/16.bmp b/ConsoleLogonUI/resources/16.bmp
deleted file mode 100644
index e5c53c5..0000000
Binary files a/ConsoleLogonUI/resources/16.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/17.bmp b/ConsoleLogonUI/resources/17.bmp
deleted file mode 100644
index d3c5e6d..0000000
Binary files a/ConsoleLogonUI/resources/17.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/18.bmp b/ConsoleLogonUI/resources/18.bmp
deleted file mode 100644
index 4181ae0..0000000
Binary files a/ConsoleLogonUI/resources/18.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/19.bmp b/ConsoleLogonUI/resources/19.bmp
deleted file mode 100644
index cd9bd4e..0000000
Binary files a/ConsoleLogonUI/resources/19.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/2.bmp b/ConsoleLogonUI/resources/2.bmp
deleted file mode 100644
index b64a65c..0000000
Binary files a/ConsoleLogonUI/resources/2.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/20.bmp b/ConsoleLogonUI/resources/20.bmp
deleted file mode 100644
index 2fa9f1c..0000000
Binary files a/ConsoleLogonUI/resources/20.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/21.bmp b/ConsoleLogonUI/resources/21.bmp
deleted file mode 100644
index 1196c9f..0000000
Binary files a/ConsoleLogonUI/resources/21.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/22.bmp b/ConsoleLogonUI/resources/22.bmp
deleted file mode 100644
index 5ae9b2e..0000000
Binary files a/ConsoleLogonUI/resources/22.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/23.bmp b/ConsoleLogonUI/resources/23.bmp
deleted file mode 100644
index 21308f7..0000000
Binary files a/ConsoleLogonUI/resources/23.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/3.bmp b/ConsoleLogonUI/resources/3.bmp
deleted file mode 100644
index c979515..0000000
Binary files a/ConsoleLogonUI/resources/3.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/4.bmp b/ConsoleLogonUI/resources/4.bmp
deleted file mode 100644
index 420b048..0000000
Binary files a/ConsoleLogonUI/resources/4.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/5.bmp b/ConsoleLogonUI/resources/5.bmp
deleted file mode 100644
index 5c1bd62..0000000
Binary files a/ConsoleLogonUI/resources/5.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/5031.jpg b/ConsoleLogonUI/resources/5031.jpg
new file mode 100644
index 0000000..ae52de1
Binary files /dev/null and b/ConsoleLogonUI/resources/5031.jpg differ
diff --git a/ConsoleLogonUI/resources/5032.jpg b/ConsoleLogonUI/resources/5032.jpg
new file mode 100644
index 0000000..6fd73ba
Binary files /dev/null and b/ConsoleLogonUI/resources/5032.jpg differ
diff --git a/ConsoleLogonUI/resources/5033.jpg b/ConsoleLogonUI/resources/5033.jpg
new file mode 100644
index 0000000..80c60df
Binary files /dev/null and b/ConsoleLogonUI/resources/5033.jpg differ
diff --git a/ConsoleLogonUI/resources/5034.jpg b/ConsoleLogonUI/resources/5034.jpg
new file mode 100644
index 0000000..287ffa2
Binary files /dev/null and b/ConsoleLogonUI/resources/5034.jpg differ
diff --git a/ConsoleLogonUI/resources/5035.jpg b/ConsoleLogonUI/resources/5035.jpg
new file mode 100644
index 0000000..81d513a
Binary files /dev/null and b/ConsoleLogonUI/resources/5035.jpg differ
diff --git a/ConsoleLogonUI/resources/5036.jpg b/ConsoleLogonUI/resources/5036.jpg
new file mode 100644
index 0000000..9c5b52e
Binary files /dev/null and b/ConsoleLogonUI/resources/5036.jpg differ
diff --git a/ConsoleLogonUI/resources/5037.jpg b/ConsoleLogonUI/resources/5037.jpg
new file mode 100644
index 0000000..8d54fc0
Binary files /dev/null and b/ConsoleLogonUI/resources/5037.jpg differ
diff --git a/ConsoleLogonUI/resources/5038.jpg b/ConsoleLogonUI/resources/5038.jpg
new file mode 100644
index 0000000..5bcf84c
Binary files /dev/null and b/ConsoleLogonUI/resources/5038.jpg differ
diff --git a/ConsoleLogonUI/resources/5039.jpg b/ConsoleLogonUI/resources/5039.jpg
new file mode 100644
index 0000000..040b5e2
Binary files /dev/null and b/ConsoleLogonUI/resources/5039.jpg differ
diff --git a/ConsoleLogonUI/resources/5040.jpg b/ConsoleLogonUI/resources/5040.jpg
new file mode 100644
index 0000000..ae69abe
Binary files /dev/null and b/ConsoleLogonUI/resources/5040.jpg differ
diff --git a/ConsoleLogonUI/resources/5041.jpg b/ConsoleLogonUI/resources/5041.jpg
new file mode 100644
index 0000000..bf6cf61
Binary files /dev/null and b/ConsoleLogonUI/resources/5041.jpg differ
diff --git a/ConsoleLogonUI/resources/5042.jpg b/ConsoleLogonUI/resources/5042.jpg
new file mode 100644
index 0000000..30e2ee5
Binary files /dev/null and b/ConsoleLogonUI/resources/5042.jpg differ
diff --git a/ConsoleLogonUI/resources/5043.jpg b/ConsoleLogonUI/resources/5043.jpg
new file mode 100644
index 0000000..8c64324
Binary files /dev/null and b/ConsoleLogonUI/resources/5043.jpg differ
diff --git a/ConsoleLogonUI/resources/5044.jpg b/ConsoleLogonUI/resources/5044.jpg
new file mode 100644
index 0000000..34e9d97
Binary files /dev/null and b/ConsoleLogonUI/resources/5044.jpg differ
diff --git a/ConsoleLogonUI/resources/5045.jpg b/ConsoleLogonUI/resources/5045.jpg
new file mode 100644
index 0000000..d761cb5
Binary files /dev/null and b/ConsoleLogonUI/resources/5045.jpg differ
diff --git a/ConsoleLogonUI/resources/5046.jpg b/ConsoleLogonUI/resources/5046.jpg
new file mode 100644
index 0000000..b70d45e
Binary files /dev/null and b/ConsoleLogonUI/resources/5046.jpg differ
diff --git a/ConsoleLogonUI/resources/5047.jpg b/ConsoleLogonUI/resources/5047.jpg
new file mode 100644
index 0000000..ef3557b
Binary files /dev/null and b/ConsoleLogonUI/resources/5047.jpg differ
diff --git a/ConsoleLogonUI/resources/5048.jpg b/ConsoleLogonUI/resources/5048.jpg
new file mode 100644
index 0000000..715fa46
Binary files /dev/null and b/ConsoleLogonUI/resources/5048.jpg differ
diff --git a/ConsoleLogonUI/resources/5049.jpg b/ConsoleLogonUI/resources/5049.jpg
new file mode 100644
index 0000000..19509a3
Binary files /dev/null and b/ConsoleLogonUI/resources/5049.jpg differ
diff --git a/ConsoleLogonUI/resources/5050.jpg b/ConsoleLogonUI/resources/5050.jpg
new file mode 100644
index 0000000..e4e1bb4
Binary files /dev/null and b/ConsoleLogonUI/resources/5050.jpg differ
diff --git a/ConsoleLogonUI/resources/5051.jpg b/ConsoleLogonUI/resources/5051.jpg
new file mode 100644
index 0000000..bd5137c
Binary files /dev/null and b/ConsoleLogonUI/resources/5051.jpg differ
diff --git a/ConsoleLogonUI/resources/5052.jpg b/ConsoleLogonUI/resources/5052.jpg
new file mode 100644
index 0000000..0ccf6ed
Binary files /dev/null and b/ConsoleLogonUI/resources/5052.jpg differ
diff --git a/ConsoleLogonUI/resources/5053.jpg b/ConsoleLogonUI/resources/5053.jpg
new file mode 100644
index 0000000..0bb9602
Binary files /dev/null and b/ConsoleLogonUI/resources/5053.jpg differ
diff --git a/ConsoleLogonUI/resources/5054.jpg b/ConsoleLogonUI/resources/5054.jpg
new file mode 100644
index 0000000..3000e13
Binary files /dev/null and b/ConsoleLogonUI/resources/5054.jpg differ
diff --git a/ConsoleLogonUI/resources/5055.jpg b/ConsoleLogonUI/resources/5055.jpg
new file mode 100644
index 0000000..7e6be52
Binary files /dev/null and b/ConsoleLogonUI/resources/5055.jpg differ
diff --git a/ConsoleLogonUI/resources/5056.jpg b/ConsoleLogonUI/resources/5056.jpg
new file mode 100644
index 0000000..93a56f8
Binary files /dev/null and b/ConsoleLogonUI/resources/5056.jpg differ
diff --git a/ConsoleLogonUI/resources/6.bmp b/ConsoleLogonUI/resources/6.bmp
deleted file mode 100644
index c341d8a..0000000
Binary files a/ConsoleLogonUI/resources/6.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/7.bmp b/ConsoleLogonUI/resources/7.bmp
deleted file mode 100644
index 78ee2d1..0000000
Binary files a/ConsoleLogonUI/resources/7.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/8.bmp b/ConsoleLogonUI/resources/8.bmp
deleted file mode 100644
index fffa32b..0000000
Binary files a/ConsoleLogonUI/resources/8.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/9.bmp b/ConsoleLogonUI/resources/9.bmp
deleted file mode 100644
index 4d0ed23..0000000
Binary files a/ConsoleLogonUI/resources/9.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/ConsoleLogonUI.rc b/ConsoleLogonUI/resources/ConsoleLogonUI.rc
index 899be6d..80b20cc 100644
--- 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
deleted file mode 100644
index f6759ea..0000000
Binary files a/ConsoleLogonUI/resources/IMAGE5035.bmp and /dev/null differ
diff --git a/ConsoleLogonUI/resources/Main.xml b/ConsoleLogonUI/resources/Main.xml
index 2710d0e..0b833b1 100644
--- 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
index 6bf0ac0..361471c 100644
--- a/ConsoleLogonUI/resources/messageview.xml
+++ b/ConsoleLogonUI/resources/messageview.xml
@@ -192,10 +192,10 @@
                 <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"/>
@@ -203,7 +203,7 @@
             <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,20 +219,20 @@
                             <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">
@@ -240,13 +240,13 @@
                                             <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
index c5b75da..9129012 100644
--- 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
diff --git a/ConsoleLogonUI/resources/securitycontrol.xml b/ConsoleLogonUI/resources/securitycontrol.xml
index e1eaa3a..fb5e835 100644
--- a/ConsoleLogonUI/resources/securitycontrol.xml
+++ b/ConsoleLogonUI/resources/securitycontrol.xml
@@ -22,28 +22,28 @@
 				</if>
 			</if>
 
-			<element background="argb(0, 0, 0, 0)" foreground="white" font="9;normal;shadow;Tahoma" shadowintensity="75"/>
-			<button foreground="white" font="11;normal;shadow;Tahoma" shadowintensity="75" contentalign="middlecenter" margin="rect(6rp, 0rp, 6rp, 0rp)" accessible="true" accrole="43"/>
+			<element background="argb(0, 0, 0, 0)" foreground="white" font="11;normal;shadow;Segoe UI" shadowintensity="75"/>
+			<button foreground="white" font="11;normal;shadow;Segoe UI" shadowintensity="75" contentalign="middlecenter" margin="rect(6rp, 0rp, 6rp, 0rp)" accessible="true" accrole="43"/>
 			<if class="GenericButton">
 				<button minsize="size(93rp,28rp)" padding="rect(10rp, 0rp, 10rp, 2rp)" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" background="resbmp(12263,7,-1,0,0,1,1)" bordercolor="gray" borderstyle="raised"/>
 				<if keyfocused="true">
-					<button background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+					<button background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
 				</if>
 				<if mousefocused="true">
-					<button background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" fontstyle="underline" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+					<button background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
 				</if>
 				<if mousefocused="true" keyfocused="true" pressed="false">
-					<button background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" fontstyle="underline" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+					<button background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
 				</if>
 				<if pressed="true">
 					<button background="resbmp(12262,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
 				</if>
 			</if>
 		</style>
-
+		
         <style resid="CommandLinks">
             <button layoutpos="top" contentalign="bottomleft" content="resbmp(12227,2,-1,0,0,1,1)" padding="rect(6,5,11,5)" accessible="true" accrole="43" minsize="size(190rp,26rp)" bordercolor="gray" borderstyle="raised"/>
-            <element font="11;normal;shadow;Tahoma" shadowintensity="75" contentalign="middleleft" padding="rect(20rp,0rp,0rp,1rp)" background="argb(0,0,0,0)"/>
+            <element font="11;normal;shadow;Segoe UI" foreground="argb(255,255,255,255)" shadowintensity="75" contentalign="middleleft" padding="rect(20rp,0rp,0rp,1rp)" background="argb(0,0,0,0)"/>
             <if keyfocused="true">
                 <button content="resbmp(12224,2,-1,0,0,1,1)" background="resbmp(12228,7,-1,0,0,1,1)" borderthickness="rect(5,5,5,4)" padding="rect(1,0,6,1)" bordercolor="gray" borderstyle="solid"/>
             </if>
@@ -56,7 +56,7 @@
         </style>
     </stylesheets>
 
-    <button resid="securityoptionid" layoutpos="auto" layout="flowlayout()" class="SecurityCommandLink" margin="rect(0rp, 0rp, 0rp, 0rp)" sheet="CommandLinks">
+    <button resid="securityoptionid" layoutpos="auto" layout="flowlayout()" class="SecurityCommandLink" margin="rect(0rp, 0rp, 0rp, 6rp)" sheet="CommandLinks">
         <element id="atom(atomid)" content="Lock this computer"/>
     </button>
 
@@ -64,20 +64,20 @@
 
     <element resid="Main" layout="filllayout()" accessible="true"  sheet="SecurityMenu" background="argb(0,0,0,0)">
         <duiSecurityControl id="atom(SecurityOptionsFrame)" layout="filllayout()">
-            <element layout="borderlayout()" padding="rect(0rp,96rp,0rp,0rp)">
+            <element layout="borderlayout()" padding="rect(0rp,248rp,0rp,0rp)">
                 <element layoutpos="client" layout="verticalflowlayout(1,2,2,2)">
                     <element layout="filllayout()">
                         <element id="atom(Locked)" visible="false" layout="verticalflowlayout(1,2,2,2)">
                             <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(LogonUserList)" visible="false" layout="filllayout()" animation="rectanglev|s|fast" />
+                        <element id="atom(Window)" layout="borderlayout()">
+                            <element id="atom(InsideWindow)" layoutpos="client" layout="filllayout()">
+                                <element id="atom(LogonUserList)" visible="false" layout="filllayout()"/>
                                 <element id="atom(PLAPUserList)" visible="false" layout="filllayout()"/>
                                 <element id="atom(SecurityOptions)" layout="verticalflowlayout(1,2,2,4)" visible="true">
-                                    <element class="SecurityOptions" layout="verticalflowlayout(0,0,0,1)" sheet="CommandLinks" padding="rect(0rp, 2rp, 0rp, 2rp)" id="atom(SecurityOptionsContainer)">
-                                        <button id="atom(PLACEHOLDER)" layout="filllayout()" margin="rect(0rp, 0rp, 0rp, 0rp)" sheet="CommandLinks"/>
+                                    <element class="SecurityOptions" layout="verticalflowlayout(0,0,0,1)" sheet="CommandLinks" padding="rect(0rp, 9rp, 0rp, 9rp)" id="atom(SecurityOptionsContainer)">
+                                        <button id="atom(PLACEHOLDER)" layout="filllayout()" margin="rect(0rp, 0rp, 0rp, 6rp)" sheet="CommandLinks"/>
 
                                     </element>
                                 </element>
diff --git a/ConsoleLogonUI/resources/selectedcredentialview.xml b/ConsoleLogonUI/resources/selectedcredentialview.xml
index d962d1a..1dc6052 100644
--- a/ConsoleLogonUI/resources/selectedcredentialview.xml
+++ b/ConsoleLogonUI/resources/selectedcredentialview.xml
@@ -1,18 +1,18 @@
 <duixml>
     <stylesheets>
         <style resid="credviewsheet">
-            <element background="argb(0, 0, 0, 0)" foreground="white" font="9;normal;shadow;Tahoma" shadowintensity="75"/>
-            <button foreground="white" font="11;normal;shadow;Tahoma" shadowintensity="75" contentalign="middlecenter" margin="rect(6rp, 0rp, 6rp, 0rp)" accessible="true" accrole="43"/>
+            <element background="argb(0, 0, 0, 0)" foreground="white" font="11;normal;shadow;Segoe UI" shadowintensity="75"/>
+            <button foreground="white" font="11;normal;shadow;Segoe UI" shadowintensity="75" contentalign="middlecenter" margin="rect(6rp, 0rp, 6rp, 0rp)" accessible="true" accrole="43"/>
             <if class="GenericButton">
                 <button minsize="size(93rp,28rp)" padding="rect(10rp, 0rp, 10rp, 2rp)" borderthickness="rect(4rp, 3rp, 4rp, 3rp)" background="resbmp(12263,7,-1,0,0,1,1)" bordercolor="gray" borderstyle="raised"/>
                 <if keyfocused="true">
-                    <button background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12259,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true">
-                    <button background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" fontstyle="underline" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12260,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if mousefocused="true" keyfocused="true" pressed="false">
-                    <button background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid" font="11;normal;underline|shadow;Tahoma" shadowintensity="75"/>
+                    <button background="resbmp(12261,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                 </if>
                 <if pressed="true">
                     <button background="resbmp(12262,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
@@ -37,22 +37,22 @@
                 </if>
             </if>
             <if id="atom(PictureContainer)">
-                <element width="72rp" height="86rp"/>
+                <element width="190rp" height="190rp"/>
             </if>
             <if id="atom(PicturePadding)">
-                <element padding="rect(3rp, 3rp, 3rp, 17rp)"/>
+                <element padding="rect(32rp, 32rp, 32rp, 32rp)"/>
             </if>
             <if id="atom(Overlay)">
-                <element width="86rp" height="86rp" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" background="resbmp(1,7,-1,0,0,1,1)"/>
+                <element width="190rp" height="190rp" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" background="resbmp(12223,7,-1,0,0,1,1)"/>
                 <if HighDPI="true">
-                    <element background="resbmp(1, 7,-1,0,0,1,1)"/>
+                    <element background="resbmp(12238, 7,-1,0,0,1,1)"/>
                 </if>
             </if>
             <if id="atom(Picture)">
-                <element width="67rp" height="67rp" accessible="true" accrole="40" accname="User Picture"/>
+                <element width="126rp" height="126rp" accessible="true" accrole="40" accname="User Picture"/>
             </if>
             <if class="Link">
-                <button font="9;normal;shadow|underline;Tahoma" shadowintensity="75" cursor="hand" contentalign="middlecenter"/>
+                <button font="9;normal;shadow|underline;Segoe UI" shadowintensity="75" cursor="hand" contentalign="middlecenter"/>
                 <if keyfocused="true">
                     <button contentalign="middlecenter|focusrect"/>
                 </if>
@@ -61,21 +61,21 @@
                 </if>
             </if>
             <if class="SmallText">
-                <element font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="topcenter | endellipsis" cursor="arrow"/>
+                <element font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="topcenter | endellipsis" cursor="arrow"/>
             </if>
             <if class="LargeText">
-                <element cursor="arrow" font="12;normal;shadow;Tahoma" shadowintensity="75" contentalign="topcenter | endellipsis"/>
+                <element cursor="arrow" font="18;normal;shadow;Segoe UI" shadowintensity="75" contentalign="topcenter | endellipsis"/>
             </if>
             <if class="RestrictedEdit">
-                <TouchEditInner width="225rp" height="22rp" font="9;normal;shadow;Tahoma" shadowintensity="75" margin="rect(1rp, 1rp, 0rp, 1rp)" padding="rect(3rp, 0rp, 0rp, 0rp)" borderthickness="rect(1rp, 4rp, 0rp, 1rp)" bordercolor="gray" accessible="true" accrole="42" background="resbmp(2, 7,-1,0,0,1,1)"/>
+                <TouchEditInner width="225rp" height="25rp" font="9;normal;Segoe UI" margin="rect(0rp, 3rp, 0rp, 3rp)" padding="rect(3rp, 1rp, 0rp, 0rp)" borderthickness="rect(4, 4, 4, 4)" bordercolor="gray" accessible="true" accrole="42" background="resbmp(11003, 7,-1,0,0,1,1)"/>
                 <if mousefocused="true">
-                    <TouchEditInner background="resbmp(2, 7,-1,0,0,1,1)" bordercolor="windowtext" />
+                    <TouchEditInner background="resbmp(11002, 7,-1,0,0,1,1)" bordercolor="windowtext" />
                 </if>
                 <if keyfocused="true">
-                    <TouchEditInner background="resbmp(2, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
+                    <TouchEditInner background="resbmp(11001, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
                 </if>
                 <if enabled="false">
-                    <TouchEditInner background="resbmp(2, 7,-1,0,0,1,1)"/>
+                    <TouchEditInner background="resbmp(11000, 7,-1,0,0,1,1)"/>
                 </if>
                 <if accstate="0x20000000">
                     <TouchEditInner PasswordCharacter="9679"/>
@@ -90,29 +90,29 @@
                 </if>
             </if>
             <if class="DUIComboBox">
-                <Combobox width="225rp" height="42rp" font="9;normal;shadow;Tahoma" shadowintensity="75" margin="rect(0rp, 4rp, 0rp, 0rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" accessible="true"/>
+                <Combobox width="225rp" height="24rp" font="9;normal;shadow;Segoe UI" shadowintensity="75" margin="rect(0rp, 4rp, 0rp, 0rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" accessible="true"/>
             </if>
             <if id="atom(Submit)">
-                <Button background="resbmp(4,7,-1,0,0,1,1)" margin="rect(0rp, 0rp, 0rp, 0rp)" visible="false" enabled="false" borderthickness="rect(0rp, 0rp, 0rp, 0rp)" bordercolor="gray" borderstyle="raised"/>
+                <Button background="resbmp(12288,7,-1,0,0,1,1)" margin="rect(4rp, 0rp, 0rp, 0rp)" visible="false" enabled="false" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" bordercolor="gray" borderstyle="raised"/>
                 <if HighDPI="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                    <Button background="resbmp(12291,7,-1,0,0,1,1)"/>
                 </if>
                 <if keyfocused="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
+                    <Button background="resbmp(12286,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12289,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if mousefocused="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
+                    <Button background="resbmp(12286,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12289,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if pressed="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
+                    <Button background="resbmp(12287,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12290,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
             </if>
@@ -141,7 +141,7 @@
             <if id="atom(pageup)">
                 <RepeatButton accessible="true" accname="Page up" accrole="43"/>
             </if>
-            <Thumb borderthickness="rect(1, 10, 1, 10)" background="resbmp(12201, 7,-1,0,0,1,1)" content="resbmp(12212,2,-1,0,0,1,1)" contentalign="middlecenter" accessible="true" accname="Position" accrole="39"/>
+            <Thumb borderthickness="rect(1, 10, 1, 10)" background="resbmp(12201, 7,-1,0,0,1,1)" contentalign="middlecenter" accessible="true" accname="Position" accrole="39"/>
             <if pressed="true">
                 <Thumb background="resbmp(12203, 7,-1,0,0,1,1)" content="resbmp(12212,2,-1,0,0,1,1)"/>
             </if>
@@ -189,14 +189,14 @@
             <element id="atom(FieldParent)" layout="filllayout()">
                 
             </element>
-            <Button id="atom(Submit)" width="42rp" height="43rp" accessible="true" accrole="43" layout="flowlayout(0,2,0,2)" class="SubmitButton"/>
+            <Button id="atom(Submit)" width="30rp" height="30rp" accessible="true" accrole="43" layout="flowlayout(0,2,0,2)" class="SubmitButton"/>
         </element>
     </element>
 
-    <Button resid="UserTileTemplate" class="UserTile" margin="rect(0rp,10rp,0rp,10rp)" layout="flowlayout(0,2,0,2)" sheet="UsersStyle">
+    <Button resid="UserTileTemplate" class="UserTile" margin="rect(0rp,10rp,0rp,10rp)" layout="verticalflowlayout(0,2,2)" sheet="UsersStyle">
         <element id="atom(PictureContainer)" layout="filllayout()">
             <element layoutpos="client" layout="borderlayout()" id="atom(PicturePadding)">
-                <element id="atom(Picture)" layoutpos="top"/>
+                <element id="atom(Picture)" layoutpos="client"/>
             </element>
             <element id="atom(Overlay)" layoutpos="client"/>
         </element>
@@ -227,9 +227,9 @@
                             <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(LogonUserList)" visible="true" layout="filllayout()" animation="rectanglev|s|fast">
+                        <element id="atom(Window)" layout="borderlayout()">
+                            <element id="atom(InsideWindow)" layoutpos="client" layout="filllayout()">
+                                <element id="atom(LogonUserList)" visible="true" layout="filllayout()">
                                     <element id="atom(UserListTemplate)" height="475rp" sheet="UsersStyle" layoutpos="client" layout="filllayout()">
                                         <styledscrollviewer id="atom(UserListFrame)" sheet="ScrollStyle" xscrollable="false">
                                             <selector id="atom(UserList)" sheet="UsersStyle" layout="flowlayout(1,1,0,0)" padding="rect(12rp, 0, 0, 0)">
diff --git a/ConsoleLogonUI/resources/statusview.xml b/ConsoleLogonUI/resources/statusview.xml
index 31a85ba..002406e 100644
--- a/ConsoleLogonUI/resources/statusview.xml
+++ b/ConsoleLogonUI/resources/statusview.xml
@@ -2,7 +2,7 @@
     <stylesheets>
         <style resid="statusViewSheet">
             <if id="atom(StatusText)">
-                <element foreground="white" contentalign="wrapcenter" font="18;normal;shadow;Tahoma" shadowintensity="75" accessible="true" accrole="41"/>
+                <element foreground="white" contentalign="wrapcenter" font="18;normal;shadow;Segoe UI" shadowintensity="75" accessible="true" accrole="41"/>
             </if>
         </style>
     </stylesheets>
@@ -14,9 +14,9 @@
                     <element layout="filllayout()">
                         
                     </element>
-                    <element id="atom(Status)" visible="true" Enabled="true" layout="flowlayout(1,2,2,2)" animation="rectanglev|s|fast" minsize="size(75rp,75rp)">
-                        <AnimationStrip id="atom(WaitAnimation)" content="resbmp(110)" visible="true" play="true" framewidth="20rp" frameduration="33" frameindex="0" width="0rp" height="0rp" margin="rect(0rp,0rp,5rp,0rp)"/>
-                        <element content="STATUS VIEW" id="atom(StatusText)" width="600rp" background="resbmp(13,7,-1,0,0,1,1)" borderthickness="rect(0rp, 65rp, 0rp, 0rp)" padding="rect(0rp, 0rp, 0rp, 0rp)"/>
+                    <element id="atom(Status)" visible="true" Enabled="true" layout="flowlayout(0,0,2,2)" minsize="size(0rp,36rp)">
+                        <AnimationStrip id="atom(WaitAnimation)" content="resbmp(110)" visible="true" play="true" framewidth="20rp" frameduration="33" frameindex="0" width="20rp" height="20rp" margin="rect(0rp,0rp,5rp,0rp)"/>
+                        <element content="STATUS VIEW" id="atom(StatusText)"/>
                     </element>
                 </element>
             </element>
diff --git a/ConsoleLogonUI/resources/userselect.xml b/ConsoleLogonUI/resources/userselect.xml
index 4b7e95a..fa65bd0 100644
--- a/ConsoleLogonUI/resources/userselect.xml
+++ b/ConsoleLogonUI/resources/userselect.xml
@@ -32,46 +32,46 @@
                 <element height="0rp" width="80rp"/>
             </if>
             <if class="UserTile">
-                <button accessible="true" accrole="34" accstate="0" height="80rp"/>
+                <button accessible="true" accrole="34" accstate="0" height="123rp"/>
                 <if selected="true">
                     <button accstate="2"/>
                 </if>
             </if>
             <if id="atom(PictureContainer)">
-                <element width="72rp" height="86rp"/>
+                <element width="80rp" height="80rp"/>
             </if>
             <if id="atom(PicturePadding)">
-                <element padding="rect(3rp, 3rp, 3rp, 17rp)"/>
+                <element padding="rect(16rp, 16rp, 16rp, 16rp)"/>
             </if>
             <if id="atom(Overlay)">
-                <element width="86rp" height="86rp" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" background="resbmp(1,7,-1,0,0,1,1)"/>
+                <element width="80rp" height="80rp" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" background="resbmp(12222,7,-1,0,0,1,1)"/>
                 <if HighDPI="true">
-                    <element background="resbmp(1, 7,-1,0,0,1,1)"/>
+                    <element background="resbmp(12237, 7,-1,0,0,1,1)"/>
                 </if>
                 <if selected="true">
-                    <element background="resbmp(1,7,-1,0,0,1,1)"/>
+                    <element background="resbmp(12219,7,-1,0,0,1,1)"/>
                     <if HighDPI="true">
-                        <element background="resbmp(1, 7,-1,0,0,1,1)"/>
+                        <element background="resbmp(12234, 7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if mousefocused="true">
-                    <element background="resbmp(1,7,-1,0,0,1,1)"/>
+                    <element background="resbmp(12218,7,-1,0,0,1,1)"/>
                     <if HighDPI="true">
-                        <element background="resbmp(1, 7,-1,0,0,1,1)"/>
+                        <element background="resbmp(12233, 7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if selected="true" mousefocused="true">
-                    <element background="resbmp(1,7,-1,0,0,1,1)"/>
+                    <element background="resbmp(12220,7,-1,0,0,1,1)"/>
                     <if HighDPI="true">
-                        <element background="resbmp(1, 7,-1,0,0,1,1)"/>
+                        <element background="resbmp(12235, 7,-1,0,0,1,1)"/>
                     </if>
                 </if>
             </if>
             <if id="atom(Picture)">
-                <element width="67rp" height="67rp" accessible="true" accrole="40" accname="User Picture"/>
+                <element width="48rp" height="48rp" accessible="true" accrole="40" accname="User Picture"/>
             </if>
             <if class="Link">
-                <button font="9;normal;shadow|underline;Tahoma" shadowintensity="75" cursor="hand" contentalign="middlecenter"/>
+                <button font="9;normal;shadow|underline;Segoe UI" shadowintensity="75" cursor="hand" contentalign="middlecenter"/>
                 <if keyfocused="true">
                     <button contentalign="middlecenter|focusrect"/>
                 </if>
@@ -80,47 +80,47 @@
                 </if>
             </if>
             <if class="SmallText">
-                <element font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="topcenter | endellipsis"/>
+                <element font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="topcenter | endellipsis"/>
             </if>
             <if class="LargeText">
-                <element font="9;normal;shadow;Tahoma" shadowintensity="75" contentalign="topcenter | endellipsis"/>
+                <element font="9;normal;shadow;Segoe UI" shadowintensity="75" contentalign="topcenter | endellipsis"/>
             </if>
             <if class="RestrictedEdit">
-                <Edit width="225rp" height="22rp" font="9;normal;shadow;Tahoma" shadowintensity="75" margin="rect(1rp, 1rp, 0rp, 1rp)" padding="rect(0rp, 0rp, 0rp, 0rp)" borderthickness="rect(1rp, 4rp, 0rp, 1rp)" bordercolor="gray" accessible="true" accrole="42" background="resbmp(2, 7,-1,0,0,1,1)"/>
+                <Edit width="225rp" height="25rp" font="9;normal;shadow;Segoe UI" 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)"/>
                 <if mousefocused="true">
-                    <Edit background="resbmp(2, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
+                    <Edit background="resbmp(11002, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
                 </if>
                 <if keyfocused="true">
-                    <Edit background="resbmp(2, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
+                    <Edit background="resbmp(11001, 7,-1,0,0,1,1)" bordercolor="windowtext"/>
                 </if>
                 <if enabled="false">
-                    <Edit background="resbmp(2, 7,-1,0,0,1,1)"/>
+                    <Edit background="resbmp(11000, 7,-1,0,0,1,1)"/>
                 </if>
             </if>
             <if class="DUIComboBox">
-                <Combobox width="225rp" height="42rp" font="9;normal;shadow;Tahoma" shadowintensity="75" margin="rect(0rp, 4rp, 0rp, 0rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" accessible="true"/>
+                <Combobox width="225rp" height="24rp" font="9;normal;shadow;Segoe UI" shadowintensity="75" margin="rect(0rp, 4rp, 0rp, 0rp)" padding="rect(0rp, 1rp, 0rp, 0rp)" accessible="true"/>
             </if>
             <if id="atom(Submit)">
-                <Button background="resbmp(4,7,-1,0,0,1,1)" margin="rect(0rp, 0rp, 0rp, 0rp)" visible="false" enabled="false" borderthickness="rect(0rp, 0rp, 0rp, 0rp)" bordercolor="gray" borderstyle="raised"/>
+                <Button background="resbmp(12288,7,-1,0,0,1,1)" margin="rect(4rp, 0rp, 0rp, 0rp)" visible="false" enabled="false" borderthickness="rect(1rp, 1rp, 1rp, 1rp)" bordercolor="gray" borderstyle="raised"/>
                 <if HighDPI="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                    <Button background="resbmp(12291,7,-1,0,0,1,1)"/>
                 </if>
                 <if keyfocused="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
+                    <Button background="resbmp(12286,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12289,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if mousefocused="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
+                    <Button background="resbmp(12286,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="solid"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12289,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
                 <if pressed="true">
-                    <Button background="resbmp(4,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
+                    <Button background="resbmp(12287,7,-1,0,0,1,1)" bordercolor="windowtext" borderstyle="sunken"/>
                     <if HighDPI="true">
-                        <Button background="resbmp(4,7,-1,0,0,1,1)"/>
+                        <Button background="resbmp(12290,7,-1,0,0,1,1)"/>
                     </if>
                 </if>
             </if>
@@ -149,7 +149,7 @@
             <if id="atom(pageup)">
                 <RepeatButton accessible="true" accname="Page up" accrole="43"/>
             </if>
-            <Thumb borderthickness="rect(1, 10, 1, 10)" background="resbmp(12201, 7,-1,0,0,1,1)" content="resbmp(12212,2,-1,0,0,1,1)" contentalign="middlecenter" accessible="true" accname="Position" accrole="39"/>
+            <Thumb borderthickness="rect(1, 10, 1, 10)" background="resbmp(12201, 7,-1,0,0,1,1)" contentalign="middlecenter" accessible="true" accname="Position" accrole="39"/>
             <if pressed="true">
                 <Thumb background="resbmp(12203, 7,-1,0,0,1,1)" content="resbmp(12212,2,-1,0,0,1,1)"/>
             </if>
@@ -173,10 +173,10 @@
 
     </stylesheets>
 
-    <Button resid="UserTileTemplate" class="UserTile" margin="rect(0rp,10rp,0rp,10rp)" layout="flowlayout(0,2,0,2)" sheet="UsersStyle">
+    <Button resid="UserTileTemplate" class="UserTile" margin="rect(0rp,10rp,0rp,10rp)" layout="verticalflowlayout(0,2,2)" sheet="UsersStyle">
         <element id="atom(PictureContainer)" layout="filllayout()">
             <element layoutpos="client" layout="borderlayout()" id="atom(PicturePadding)">
-                <element id="atom(Picture)" layoutpos="top"/>
+                <element id="atom(Picture)" layoutpos="client"/>
             </element>
             <element id="atom(Overlay)" layoutpos="client"/>
         </element>
@@ -206,11 +206,11 @@
                             <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(LogonUserList)" visible="true" layout="filllayout()" animation="rectanglev|s|fast">
-                                    <element id="atom(UserListTemplate)" width="400rp" height="262rp" sheet="UsersStyle" layoutpos="client" layout="filllayout()">
-                                        <styledscrollviewer id="atom(UserListFrame)" animation="rectanglev|s|fast" sheet="ScrollStyle" xscrollable="false">
+                        <element id="atom(Window)" layout="borderlayout()">
+                            <element id="atom(InsideWindow)" layoutpos="client" layout="filllayout()">
+                                <element id="atom(LogonUserList)" visible="true" layout="filllayout()">
+                                    <element id="atom(UserListTemplate)" height="475rp" sheet="UsersStyle" layoutpos="client" layout="filllayout()">
+                                        <styledscrollviewer id="atom(UserListFrame)" sheet="ScrollStyle" xscrollable="false">
                                             <selector id="atom(UserList)" sheet="UsersStyle" layout="flowlayout(1,1,0,0)" padding="rect(12rp, 0, 0, 0)">
                                             </selector>
                                         </styledscrollviewer>