From cb188d89edec48c56c097123843a284f1319f496 Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com" <hewitt%netscape.com>
Date: Thu, 5 Oct 2000 21:31:43 +0000
Subject: [PATCH] #54105 - [Modern] focus/widget cleanup, r=andreww, a=ben

---
 themes/modern/communicator/button.css         |  27 +-
 .../modern/global/button-active-left-btm.gif  | Bin 0 -> 280 bytes
 .../modern/global/button-active-left-mid.gif  | Bin 0 -> 102 bytes
 .../modern/global/button-active-left-top.gif  | Bin 0 -> 170 bytes
 .../modern/global/button-active-mid-btm.gif   | Bin 0 -> 67 bytes
 .../modern/global/button-active-mid-mid.gif   | Bin 0 -> 158 bytes
 .../modern/global/button-active-mid-top.gif   | Bin 0 -> 62 bytes
 .../modern/global/button-active-right-btm.gif | Bin 0 -> 275 bytes
 .../modern/global/button-active-right-mid.gif | Bin 0 -> 89 bytes
 .../modern/global/button-active-right-top.gif | Bin 0 -> 275 bytes
 .../global/button-def-active-left-btm.gif     | Bin 0 -> 286 bytes
 .../global/button-def-active-left-mid.gif     | Bin 0 -> 108 bytes
 .../global/button-def-active-left-top.gif     | Bin 0 -> 175 bytes
 .../global/button-def-active-mid-btm.gif      | Bin 0 -> 70 bytes
 .../global/button-def-active-mid-mid.gif      | Bin 0 -> 158 bytes
 .../global/button-def-active-mid-top.gif      | Bin 0 -> 64 bytes
 .../global/button-def-active-right-btm.gif    | Bin 0 -> 140 bytes
 .../global/button-def-active-right-mid.gif    | Bin 0 -> 95 bytes
 .../global/button-def-active-right-top.gif    | Bin 0 -> 139 bytes
 themes/modern/global/button-def-left-btm.gif  | Bin 0 -> 293 bytes
 themes/modern/global/button-def-left-mid.gif  | Bin 0 -> 139 bytes
 themes/modern/global/button-def-left-top.gif  | Bin 0 -> 184 bytes
 themes/modern/global/button-def-mid-btm.gif   | Bin 0 -> 70 bytes
 themes/modern/global/button-def-mid-mid.gif   | Bin 0 -> 158 bytes
 themes/modern/global/button-def-mid-top.gif   | Bin 0 -> 54 bytes
 themes/modern/global/button-def-right-btm.gif | Bin 0 -> 279 bytes
 themes/modern/global/button-def-right-mid.gif | Bin 0 -> 103 bytes
 themes/modern/global/button-def-right-top.gif | Bin 0 -> 178 bytes
 themes/modern/global/button-dis-left-btm.gif  | Bin 0 -> 286 bytes
 themes/modern/global/button-dis-left-mid.gif  | Bin 0 -> 137 bytes
 themes/modern/global/button-dis-left-top.gif  | Bin 0 -> 177 bytes
 themes/modern/global/button-dis-mid-btm.gif   | Bin 0 -> 67 bytes
 themes/modern/global/button-dis-mid-mid.gif   | Bin 0 -> 158 bytes
 themes/modern/global/button-dis-mid-top.gif   | Bin 0 -> 53 bytes
 themes/modern/global/button-dis-right-btm.gif | Bin 0 -> 273 bytes
 themes/modern/global/button-dis-right-mid.gif | Bin 0 -> 97 bytes
 themes/modern/global/button-dis-right-top.gif | Bin 0 -> 173 bytes
 themes/modern/global/button-left-btm.gif      | Bin 0 -> 288 bytes
 themes/modern/global/button-left-mid.gif      | Bin 0 -> 137 bytes
 themes/modern/global/button-left-top.gif      | Bin 0 -> 159 bytes
 themes/modern/global/button-mid-btm.gif       | Bin 0 -> 67 bytes
 themes/modern/global/button-mid-mid.gif       | Bin 0 -> 158 bytes
 themes/modern/global/button-mid-top.gif       | Bin 0 -> 53 bytes
 themes/modern/global/button-right-btm.gif     | Bin 0 -> 276 bytes
 themes/modern/global/button-right-mid.gif     | Bin 0 -> 97 bytes
 themes/modern/global/button-right-top.gif     | Bin 0 -> 275 bytes
 themes/modern/global/button.css               | 558 ++++++++++++------
 themes/modern/global/checkbox.css             |  15 +-
 themes/modern/global/menubutton.css           |  65 +-
 .../global/menulist-active-left-btm.gif       | Bin 0 -> 11 bytes
 .../global/menulist-active-left-mid.gif       | Bin 0 -> 95 bytes
 .../global/menulist-active-left-top.gif       | Bin 0 -> 170 bytes
 .../modern/global/menulist-active-mid-btm.gif | Bin 0 -> 82 bytes
 .../modern/global/menulist-active-mid-mid.gif | Bin 0 -> 215 bytes
 .../modern/global/menulist-active-mid-top.gif | Bin 0 -> 62 bytes
 .../global/menulist-active-right-btm.gif      | Bin 0 -> 421 bytes
 .../global/menulist-active-right-mid.gif      | Bin 0 -> 200 bytes
 .../global/menulist-active-right-top.gif      | Bin 0 -> 460 bytes
 .../modern/global/menulist-dis-left-btm.gif   | Bin 0 -> 266 bytes
 .../modern/global/menulist-dis-left-mid.gif   | Bin 0 -> 103 bytes
 .../modern/global/menulist-dis-left-top.gif   | Bin 0 -> 11 bytes
 themes/modern/global/menulist-dis-mid-btm.gif | Bin 0 -> 82 bytes
 themes/modern/global/menulist-dis-mid-mid.gif | Bin 0 -> 216 bytes
 themes/modern/global/menulist-dis-mid-top.gif | Bin 0 -> 53 bytes
 .../modern/global/menulist-dis-right-btm.gif  | Bin 0 -> 288 bytes
 .../modern/global/menulist-dis-right-mid.gif  | Bin 0 -> 208 bytes
 .../modern/global/menulist-dis-right-top.gif  | Bin 0 -> 520 bytes
 themes/modern/global/menulist-left-btm.gif    | Bin 0 -> 266 bytes
 themes/modern/global/menulist-left-mid.gif    | Bin 0 -> 103 bytes
 themes/modern/global/menulist-left-top.gif    | Bin 0 -> 181 bytes
 themes/modern/global/menulist-mid-btm.gif     | Bin 0 -> 83 bytes
 themes/modern/global/menulist-mid-mid.gif     | Bin 0 -> 216 bytes
 themes/modern/global/menulist-mid-top.gif     | Bin 0 -> 53 bytes
 themes/modern/global/menulist-right-btm.gif   | Bin 0 -> 238 bytes
 themes/modern/global/menulist-right-mid.gif   | Bin 0 -> 208 bytes
 themes/modern/global/menulist-right-top.gif   | Bin 0 -> 460 bytes
 themes/modern/global/menulist.css             | 282 ++++++---
 themes/modern/global/radio.css                |  11 +-
 themes/modern/global/textfield.css            |  10 +-
 xpfe/global/resources/content/xul.css         |   4 +
 80 files changed, 641 insertions(+), 331 deletions(-)
 create mode 100644 themes/modern/global/button-active-left-btm.gif
 create mode 100644 themes/modern/global/button-active-left-mid.gif
 create mode 100644 themes/modern/global/button-active-left-top.gif
 create mode 100644 themes/modern/global/button-active-mid-btm.gif
 create mode 100644 themes/modern/global/button-active-mid-mid.gif
 create mode 100644 themes/modern/global/button-active-mid-top.gif
 create mode 100644 themes/modern/global/button-active-right-btm.gif
 create mode 100644 themes/modern/global/button-active-right-mid.gif
 create mode 100644 themes/modern/global/button-active-right-top.gif
 create mode 100644 themes/modern/global/button-def-active-left-btm.gif
 create mode 100644 themes/modern/global/button-def-active-left-mid.gif
 create mode 100644 themes/modern/global/button-def-active-left-top.gif
 create mode 100644 themes/modern/global/button-def-active-mid-btm.gif
 create mode 100644 themes/modern/global/button-def-active-mid-mid.gif
 create mode 100644 themes/modern/global/button-def-active-mid-top.gif
 create mode 100644 themes/modern/global/button-def-active-right-btm.gif
 create mode 100644 themes/modern/global/button-def-active-right-mid.gif
 create mode 100644 themes/modern/global/button-def-active-right-top.gif
 create mode 100644 themes/modern/global/button-def-left-btm.gif
 create mode 100644 themes/modern/global/button-def-left-mid.gif
 create mode 100644 themes/modern/global/button-def-left-top.gif
 create mode 100644 themes/modern/global/button-def-mid-btm.gif
 create mode 100644 themes/modern/global/button-def-mid-mid.gif
 create mode 100644 themes/modern/global/button-def-mid-top.gif
 create mode 100644 themes/modern/global/button-def-right-btm.gif
 create mode 100644 themes/modern/global/button-def-right-mid.gif
 create mode 100644 themes/modern/global/button-def-right-top.gif
 create mode 100644 themes/modern/global/button-dis-left-btm.gif
 create mode 100644 themes/modern/global/button-dis-left-mid.gif
 create mode 100644 themes/modern/global/button-dis-left-top.gif
 create mode 100644 themes/modern/global/button-dis-mid-btm.gif
 create mode 100644 themes/modern/global/button-dis-mid-mid.gif
 create mode 100644 themes/modern/global/button-dis-mid-top.gif
 create mode 100644 themes/modern/global/button-dis-right-btm.gif
 create mode 100644 themes/modern/global/button-dis-right-mid.gif
 create mode 100644 themes/modern/global/button-dis-right-top.gif
 create mode 100644 themes/modern/global/button-left-btm.gif
 create mode 100644 themes/modern/global/button-left-mid.gif
 create mode 100644 themes/modern/global/button-left-top.gif
 create mode 100644 themes/modern/global/button-mid-btm.gif
 create mode 100644 themes/modern/global/button-mid-mid.gif
 create mode 100644 themes/modern/global/button-mid-top.gif
 create mode 100644 themes/modern/global/button-right-btm.gif
 create mode 100644 themes/modern/global/button-right-mid.gif
 create mode 100644 themes/modern/global/button-right-top.gif
 create mode 100644 themes/modern/global/menulist-active-left-btm.gif
 create mode 100644 themes/modern/global/menulist-active-left-mid.gif
 create mode 100644 themes/modern/global/menulist-active-left-top.gif
 create mode 100644 themes/modern/global/menulist-active-mid-btm.gif
 create mode 100644 themes/modern/global/menulist-active-mid-mid.gif
 create mode 100644 themes/modern/global/menulist-active-mid-top.gif
 create mode 100644 themes/modern/global/menulist-active-right-btm.gif
 create mode 100644 themes/modern/global/menulist-active-right-mid.gif
 create mode 100644 themes/modern/global/menulist-active-right-top.gif
 create mode 100644 themes/modern/global/menulist-dis-left-btm.gif
 create mode 100644 themes/modern/global/menulist-dis-left-mid.gif
 create mode 100644 themes/modern/global/menulist-dis-left-top.gif
 create mode 100644 themes/modern/global/menulist-dis-mid-btm.gif
 create mode 100644 themes/modern/global/menulist-dis-mid-mid.gif
 create mode 100644 themes/modern/global/menulist-dis-mid-top.gif
 create mode 100644 themes/modern/global/menulist-dis-right-btm.gif
 create mode 100644 themes/modern/global/menulist-dis-right-mid.gif
 create mode 100644 themes/modern/global/menulist-dis-right-top.gif
 create mode 100644 themes/modern/global/menulist-left-btm.gif
 create mode 100644 themes/modern/global/menulist-left-mid.gif
 create mode 100644 themes/modern/global/menulist-left-top.gif
 create mode 100644 themes/modern/global/menulist-mid-btm.gif
 create mode 100644 themes/modern/global/menulist-mid-mid.gif
 create mode 100644 themes/modern/global/menulist-mid-top.gif
 create mode 100644 themes/modern/global/menulist-right-btm.gif
 create mode 100644 themes/modern/global/menulist-right-mid.gif
 create mode 100644 themes/modern/global/menulist-right-top.gif

diff --git a/themes/modern/communicator/button.css b/themes/modern/communicator/button.css
index a764a7f22bc0..7e1209ae6b94 100644
--- a/themes/modern/communicator/button.css
+++ b/themes/modern/communicator/button.css
@@ -232,17 +232,18 @@
  **/  
   button.button-toolbar-3 
     {
-	  -moz-binding			: url("chrome://global/skin/globalBindings.xml#three-slice-button");
+	  -moz-binding			: url("chrome://global/skin/globalBindings.xml#nine-slice-button");
       background-color : transparent;
       border				: 0px;
       margin				: 3px 7px 2px 0px;
-      font-family   : Arial, sans-serif;
       -moz-user-focus       : ignore !important;
     }
 
-  .button-toolbar-3 > box > box > .button-text-box {
+  .button-toolbar-3 > box > box > .button-text-mid
+    {
+      font-family   : Arial, sans-serif;
       font-weight           : bold;
-  }
+    }
 
   button.button-toolbar-3[disabled="true"], .button-toolbar-3[disabled="true"]:hover, .button-toolbar-3[disabled="true"]:hover:active
     {
@@ -331,4 +332,20 @@ menubutton.button-toolbar-4
   {
     border                : 0px !important;
     padding               : 0px !important;
-  }  
+  } 
+  
+  /* text wrapping frame (hack because <text> does not support alignment) */
+  .button-text-container {
+      text-align          : center;
+      vertical-align      : middle;
+    }
+
+/* text frame */
+  .button-text  {
+      padding             : 0px 2px 0px 2px;
+    }
+  
+  button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text {
+      padding             : 2px 2px 0px 2px;
+    }
+  
diff --git a/themes/modern/global/button-active-left-btm.gif b/themes/modern/global/button-active-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d60c72d2ded39a49f0824fb65f0227ac7e3fd564
GIT binary patch
literal 280
zcmZ?wbhEHb<YeGrxT?fpXz4L={^IbwyvmOL{yB?FTe^E^E$o@OptP-b%7Wz+<}PWT
zFn!MQwR4xREpO|s@14>$WB$^0Tc<Bt**a-v$F#W<=Pm7?xnSA)Z8H|HYU-ahYw4P4
z3s=lrv3~NrrBmiFTd-<lL*LXzt2h7u|DS<2K=CIFBLjmHgAT}eke?XXOdT2&1a{Pz
za5hblc<7<kma1^%h6djywqwp4IM^Hc4l*q4U}!#=GLg~N<@pxoK#c?E8*1!07_0$2
Cr&oFa

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-left-mid.gif b/themes/modern/global/button-active-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0cb73c37c2f5798e50dbca9c1c44e817f13e54e3
GIT binary patch
literal 102
zcmV-s0Ga<sNk%w1VF>^r0HOc@k)NZevACY7ucNKBS8i@GIY^kIs+6FoEC2ui00{sf
z0009sSOgFw<|yW%T<yh~Ew38}UX(_5Vd;tH*RrdcqUY$w^gY|~{>rsqt{24dfV!g3
IXi5M8J0g57od5s;

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-left-top.gif b/themes/modern/global/button-active-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4a274b979ce1c0856c7b72e136cd25327bae7086
GIT binary patch
literal 170
zcmZ?wbhEHb<YeGvI3mI@asJ})ygWlok2PC%Z`!ec+4^mZ)@)wBVf(Blt2b`nw`$YQ
zRhxHi*uHPs`mO7>?VY=P{o1X2R&Lrkf91waI}iN-|DS;nQ2fcl$iN`NpaW6}vXg;T
vT|t#A#gZ+<i&NvluAC41-q;Abyj9~fdC}AO=)whFCDvw_?H+aliVW5Ojrcu`

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-mid-btm.gif b/themes/modern/global/button-active-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cd791abd5b3c62f43a8c81fd75bd500989bb059e
GIT binary patch
literal 67
zcmZ?wbhEHbRA69Xn8?6T-#f+7(xZLqoRXGq#h)w;AfN*xK=KSsB2)TTc0b@>Jg4AB
R_vU*RKls}oafmTk0{~~+6j%TN

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-mid-mid.gif b/themes/modern/global/button-active-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9b9a7e8985fd284be83232232024a4562b687e88
GIT binary patch
literal 158
zcmZ?wbhEHbRAAs{IKsfNWZl+HJNB>HvU}qE#hugVbxfN(ZQ+XU8T0$+ES|e!eaG~9
z(-*DmoH2jiiuK(y7fhJDq<7ZBt{L+u&Rfbr98mnp0#>L4B0+XCu!cQQ=u63*m$G18
Z&g*?^6wa6A-ZxqBzUKY^J#I-JIsp90H^=}0

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-mid-top.gif b/themes/modern/global/button-active-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41a333322afc46ed48fa26d032c8a21924b95a9d
GIT binary patch
literal 62
zcmZ?wbhEHbRA69cn8?5oo|k86=`nHsVg?2V#h)xdl7T@7M1bTOnD~48S9U+(Upyz^
MM)&4>I~W+O0kpOdM*si-

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-right-btm.gif b/themes/modern/global/button-active-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3f88902a23c526666cc6d6a0da575fc160af9509
GIT binary patch
literal 275
zcmZ?wbhEHbWM|-DxT?%xXz9^DWp?kZg;N(SpE!3(&&&m#)91}!xuI*u{O%d^+o#T{
z?U_7z-cn;5?}omqi`Q;0Y3ZJ|WVMNvSLd|3hSr|b7Otr5=$|lWao_Akbv=`3FI`jI
z(miL{+DY@4*7r^^vh?boy{NdkYx<&<|NsAIpaD?)$->CMpv<5HG8^P41~vl+#zX;2
z8wQTV)?x+;A&EAR&xQ(I3(hTA$ibr4%6)Wlqy^I?L6t2V8Qhc`{_yfMF<1itx_M4w

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-right-mid.gif b/themes/modern/global/button-active-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2d34a3a3a79bd05f088981112e1429341f13d334
GIT binary patch
literal 89
zcmZ?wbhEHbWM@!dSj51vZ2h)L^Oi1NyLsxu6|<JCp0{GXnXM-S1A`6_Gl0}EFsn&8
tt0r_=?zq)G?Nqe-H`(o(H`S*pa`r8&TBk94+n1cv6>ARvnasdo4FH^bB98z7

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-active-right-top.gif b/themes/modern/global/button-active-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..edc4d43a9982c95dababd09ad14ef8b1f9f4de1d
GIT binary patch
literal 275
zcmZ?wbhEHbWM|-HxT?S~asFaMOONopyiGgyui3JD>&^q4b{;UZ^I5)e`<!KK7p&ei
zZ{>znn|H3<xO3^ct!uaL*|PJ%vJKnUZ`-?W+n)I=H*Vf}V9DC8i`Q;hw{_3z&AXPZ
z-@anwj*Z**nc8?6S$WM|yz2k|{|vMQia%Kx85k58bU>DX{KUX!aG=3}L5r)8Nr~e?
siqPz{2ND7rMYtFbIUh2VVB+&_ZkSmi#>L$<@nwzB6z`N`4kiX`0OlZ5YXATM

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-left-btm.gif b/themes/modern/global/button-def-active-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3fc06b623fc46c3bd187029de254683edba9a55a
GIT binary patch
literal 286
zcmZ?wbhEHb<YM4txT?fpXz4L={^IbwyvmOL{yB?FTe^E^E$o@OptP-b%7Wz+<}PWT
zFn!MQwR4xREpO|s@14>$WB$^0Tc<Bt**a-v$F#W<=Pm7?xnSA)Z8H|HYU-ahYw4P4
z3s=lrv3~NrrBmiFTd-<lL*LXzt2h7u|DS<2K=CIFBLjmHgAT}eke?XXtQ{B}1UO>s
zX0bSW@VHn^>S~PSF*NI9Hob75f<x??!UaVM1(Asb1~YVw7PME{7ASDBUW_@x{^Dz`
IlOuyQ0L4pI{{R30

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-left-mid.gif b/themes/modern/global/button-def-active-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7a6867e8e219f897926eaf346d9253e6c784b87c
GIT binary patch
literal 108
zcmV-y0F(bmNk%w1VF~~s0HOc@F*!()pQBf9ZkVE~sIj=7sIQ}~w3MKyEC2ui015yg
z0009y2p|z;WgNvEl(fA#m%d%KVV=chCMkmG7=CBzwya#QF|NXU`uemS?>DmvfyQ1@
ON4yP#N+*(;0029un=66<

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-left-top.gif b/themes/modern/global/button-def-active-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5f2b51e7b4baa08532fced57876564a6d9dee07d
GIT binary patch
literal 175
zcmZ?wbhEHb<YM4rI3mJeXz4L={^Ibwyfs^PFI&HD(~kX%)@)wBVf(Blt2gaDuxiuJ
zRhxHi*uHPs`mO7>?VY=P{o1X2R&Lrkf91xF+xPwd|DS;nQ2fcl$iN`NpaW6}vXg;T
zM?p2nA+sxuYr@h8`_@RGDb~JF(yi{g@Vqd4%7<hgk@jQx0*VqU`&&OZaxgMj0|4qt
BKpp@9

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-mid-btm.gif b/themes/modern/global/button-def-active-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6140f43645db18626c3d020ffd39968d0460c817
GIT binary patch
literal 70
zcmZ?wbhEHbRA69bn8?6jXz5YkJEf$hyM5{$#h)w;AfN*xK=KSs;&b{}c0c4_JSX5r
U_vU*NKls}oc}z=-WMHrc0H)Fvr2qf`

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-mid-mid.gif b/themes/modern/global/button-def-active-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9b9a7e8985fd284be83232232024a4562b687e88
GIT binary patch
literal 158
zcmZ?wbhEHbRAAs{IKsfNWZl+HJNB>HvU}qE#hugVbxfN(ZQ+XU8T0$+ES|e!eaG~9
z(-*DmoH2jiiuK(y7fhJDq<7ZBt{L+u&Rfbr98mnp0#>L4B0+XCu!cQQ=u63*m$G18
Z&g*?^6wa6A-ZxqBzUKY^J#I-JIsp90H^=}0

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-mid-top.gif b/themes/modern/global/button-def-active-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b5291963d096c3fb4740c43f43de9d2d28a63a52
GIT binary patch
literal 64
zcmZ?wbhEHbRA69Xn8?6jXz3B2mp5_#Vg?2V#h)xdl7T@7M1bTOm;_t;SDt<=yJ*gq
PTbi5h?fD(cz+epk-~JK&

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-right-btm.gif b/themes/modern/global/button-def-active-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..168a3d7b03ef70c6955c729d2da3f40b8209992c
GIT binary patch
literal 140
zcmV;70CWFGNk%w1VF&;T0K^{vF*!(wl$(l}pOKxUm7u4MnxTo8o}a0(jG3T|n4fcl
zileQwiI$yth>x76t(KvveT<Wmo~3kzi-3-mm!heTo1&YgtdN|ekDH=?jFW$jlyiiO
ulb)rAm7JQStN;K1A^8LW0018VEC2ui00;mH000FpU@;Khu>gP|KF)#7^Fbc~

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-right-mid.gif b/themes/modern/global/button-def-active-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3512679a4360f397a2f45a08115a090289adf8a2
GIT binary patch
literal 95
zcmZ?wbhEHb<X})>Sj50!Xz8(R{kC~4*3Vk9dg{Uzi`Q<RG;b*b1A`6_Gl0}EFzaNP
z1Ti`ovZq!T-d&YBZ^qNk#PBAWU%9U{mg#WrUUg^Q$LjMIbFW*?Hdx`!z+epkOHd?t

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-active-right-top.gif b/themes/modern/global/button-def-active-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..393d867f6f9c9c2387921b846b5eebd7491c0bbe
GIT binary patch
literal 139
zcmV;60CfLHNk%w1VF&;U0K^>tF*!()pQBf9ZnC()thBqexxliyz^k*mq^-54u(z|h
zz^=Bus<XMJuC<=2u&1%Nsj<1Qw!NRJv8b`Qqph@@rmd~Dyr8SHuC=_TueY(czO=c(
tnWL)z|Nj6000000A^8LW0012TEC2ui00;mI000FqARq!=*^Of<tU_eyL}vg1

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-left-btm.gif b/themes/modern/global/button-def-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28067f92fa85af748483e2cb5a5a7f0db564f7f5
GIT binary patch
literal 293
zcmZ?wbhEHb<YM4txN5{;Xz8)}@Zkr~pYJ<$s(ZnLgJ;jae*5<6t5@f4+*rGB--?|(
z=dWM??Dgx_yLaDv`gG%g1KW=syK?v5)w_4M96o&R=B;CwE<JzqX6NzadrqBNzkmO_
zefv&cxjKKthT|76zIyYff6<~F4<D}Hv*+CP>$e_0JaYcRoV9BgY}~lz$dO4)mtMPn
z|IGCpyN@5=eezV#qD8aUtT}Mz%!x~v7H{7C|Nnmm;(+2$7DfgJBL*Fia*&@G*qj^~
z4kQRJ2~i1ic#&wKG+SIn*@nYm%BcrS1p8DtA`(qKIb7!+RQ<rAnd0Q5oE9}Dra+PX
UYo;KFQKeHeLt|r$lOuyQ0Q%;TTL1t6

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-left-mid.gif b/themes/modern/global/button-def-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fdd0f219f8d29399b7e38db5f66374509d13d055
GIT binary patch
literal 139
zcmZ?wbhEHb<YG`@*v!CSXzB6d?c3caPhPll=j4^EHy=HE^X~1VmoE;UIm>_zDE?#t
z3+sSLkQodtHUbR7ev&Mlp1Rj!N>gvE)TNp?Epu<vTfOMRta<s_*SFj|Z@GZSyytGu
W9)*uPK5I@qmlS;BkM86k?I{4yi8P%6

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-left-top.gif b/themes/modern/global/button-def-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..cc1cea1e741d2f73af8ec4ecc74f37439c9305c9
GIT binary patch
literal 184
zcmV;p07w5vNk%w1VF~~W0K^;sF*!)=?(XjI@9FI9-{$7)?d|C8?dI$2=j`n2?CjOv
z-qzmV;OFPp;Na};?aS8J;_2zy<Kx@o<L&P5*5BXU<m1E6&(7M~$kWv2>gwd_>CoER
z|Ns900000000000A^8LW000~SEC2ui015yK000FwASZG_X^LhFkY(V$>?^mf5KKiu
m+lhf7E!*G#VGv5f3_;RRlnjXjA+p#!N{)f1Lb+fpApko-G-bg6

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-mid-btm.gif b/themes/modern/global/button-def-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d06f597e64635cd3588b837f601ecbdd1be9e0aa
GIT binary patch
literal 70
zcmZ?wbhEHbRA69bn8?6jXz4L)?b@yd3zqHNsrZwH0R(hF1W2BNNqkQK%I=5!i{}K~
U=-zx!;s<}*Badlmkqivh0N1$|pa1{>

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-mid-mid.gif b/themes/modern/global/button-def-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..461d2838faaac8599d4b1e98bcd2bae5210e593f
GIT binary patch
literal 158
zcmZ?wbhEHbRAAs{IKsfNa?hUUZ{A$Kd-vY6XRqJBU9o%ji7Qw3ojSE<@7~Ra53kz0
zck9uk`%j-fdFAT<GiTTD-@oO^k=1+ltlhVdfjFS}lLf3$2SkGGWMB<YQ0z;|oR_j-
aUC!%$Zxqg#<lf)1;C;>e|9jdJJ#+vhqCpe@

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-mid-top.gif b/themes/modern/global/button-def-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ff96834ad84b5efa33c89a889a69497d2a1eac44
GIT binary patch
literal 54
zcmZ?wbhEHbRA69XXkcJ?^X{FYrHA5A76uT|0TCb>1}5H~{*|ZS@-CXQ<yN<`9)mRi
DZ+Q;D

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-right-btm.gif b/themes/modern/global/button-def-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2bdbb8279b68d9c513384a72faca436e462d20f8
GIT binary patch
literal 279
zcmZ?wbhEHb<Y3@rxT?%xXz8(R`}R}Uu5CMdbltvvYxnNmdid~>^A|4OzP)<So*AoG
zuit-Q&ib_-3l<zccYfK<o%>FmTD@=I&f~{-96vsD)v8%**X}uW>iETrT?-Z*IDKa2
zo;?$nE!%wP(4Ld0HXb~<a_7!fyLWFmaG-PEy#N3IGtdAi{$ycfU{Gez0htZ*69b#c
zfeQy72`Df$oJeBW$uVJ8llvq~1xHS%^h=I*OpW{p8`cDf^e_~)2%4IC9MF)HKl}Py
Ipa6q4092r5zyJUM

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-right-mid.gif b/themes/modern/global/button-def-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f70cafd391040d5602641b88a06811c7ede8b7f6
GIT binary patch
literal 103
zcmZ?wbhEHb<X})>Sj50!Xz8){^ywYPj~_mF{^XUb*Y4lHc>6X31B2pE79h#MpaUX6
zY8jYyGz?Q%9Sqr1s|)Y0%A7ajX=h@1lgzK&*BQ%nICrnQGw);dd5gK%t!5jn@Md7J
F1_0rPC{F+Y

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-def-right-top.gif b/themes/modern/global/button-def-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2bddc66f8cf9214af32532ead57f4b7ec9f1b31e
GIT binary patch
literal 178
zcmV;j08Rf#Nk%w1VF&;U0K^>tF*!)=?(XaD?da|8=j`n5?(WOh*Wu{s=IiUl(b3o8
z;o|A&)ZO0T=jY_<>B`mC+2Z2g=H}k!=Gx-p+vMZT*xAwC-PYjX-R0!L&CS-|;OXq_
z(A(Vq|Nj6000000A^8LW0012TEC2ui00;mI000FqARq!=*^OfvtU=1IVkZc%ND!M)
g6k^mkh`~U_&`czUh3HYSC@2_FCSl-QAfgZeJ1CK4b^rhX

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-left-btm.gif b/themes/modern/global/button-dis-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f2ee9d0909c5b37f0a082638daf631111ad9c70b
GIT binary patch
literal 286
zcmZ?wbhEHb<YeGrxT?!gRNHs-?B$C$?k(TE>%@iY2Tq>fdHB@sqi1#;KDlwv;q|)?
z?ml{Y<L*PJFW<U$`{9+F56)b^dExrqlNWF7Id=Byt%t|XUER3n(7qGr51+ZT{m_a1
zC(my^aD4Z%GkcGpU9n~N=DkOjZ`pnB>g_AH9$dfuXy5U3XRqEqc<REcZF|=5I<WoV
zi4zyD9XfsS%#~aJ|Nmzo3n>0%VPs&?WzYfX2KkAB&D!BWhf;!|!F1*Wid`mJ%Q_i9
w2ux9FWMXIJaO7wd%{&;IYR&GPc9|(7Xg-T`W7bw(b^Z*44ci$T8XOs{0d#PK)&Kwi

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-left-mid.gif b/themes/modern/global/button-dis-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..eead42fc5b0f33bf08324dcbc66ce38526baf84e
GIT binary patch
literal 137
zcmZ?wbhEHb<YZ7_*v!Ci{m!GSw;!Indgs`=tCw!x-*@6%QElI;OE(Xly2yYHDE?#t
z3+sSLkQodtW)~V9j!3TX$l5sX>eSqY?q$jyb#qQk%gkQ&F7onbnZxh1p6|JTu3h?G
V$=>7*GgyQs9$I$sWfud3H2`YHH<$nb

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-left-top.gif b/themes/modern/global/button-dis-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..77e9d6492f2e247147073104b0f80d1e253b5987
GIT binary patch
literal 177
zcmZ?wbhEHb<YeGvI3mVy{m!GJ+P-VIAKtk0==$wP7q8#Ddi&v(TMw?@dU*2Ujq}&;
zoVk4K^3D5auG~6z?asv;_b%UjaQytWvsZ2(J$L2s=}VVx-v9sqKLc){_>+Z^fkBKx
z2c!gKCj+bA0#&vYOQwu0*38q3m>tgK>qu}My5;^=gi(6Qf(bfIYzG%Uh)_||VRXLe
K;iI9*U=0AVR!yP+

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-mid-btm.gif b/themes/modern/global/button-dis-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f6726cd23f9dfe7a0c8bd859037baa88248c2802
GIT binary patch
literal 67
zcmZ?wbhEHbRA69Xn8?7e<-oC`+P-C*cdgrXK=CIF0|@AV2#`DjlSoVd%I?Sfi{}K~
R=-zzK;s<}*BMvbJYXI4f7LWh{

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-mid-mid.gif b/themes/modern/global/button-dis-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..705091ede14507f99f3a53fabc743920c5b78930
GIT binary patch
literal 158
zcmZ?wbhEHbRAAs{IKsei`tr?f2TxqT{pjkghZnBj+j{W$?xSZ8oIJn%(8;X_PaHjW
z<-n;6+YX&LcJ9iK!zXthKDGPUnPca!?m2dL`=JvIL;%H~EMQeSAQEIJ18dj<g}#)`
ec~2Is%Xz&|NAY|~?tPO5?`z)w-_w!gp#uO5lS706

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-mid-top.gif b/themes/modern/global/button-dis-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6fde1f5d0b818e1397625295b54891c888bdcc31
GIT binary patch
literal 53
zcmZ?wbhEHbRA69cXkcKte&<n9ZJ**#76uT|0TCb>1}2`K{*~Pi_!rOFax02~!5RQ?
CeGYj5

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-right-btm.gif b/themes/modern/global/button-dis-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41c692e4c9c01a078a9ed164358b9a44509dd8df
GIT binary patch
literal 273
zcmZ?wbhEHbWM|-DxT?TVRNJ>@|FPreukAQ|a?i0ddyk*pcJRcmBd6ExI<R)<{-v9D
z9X)$_%YkD%51-m`=;WzOH};=Azx(Lv{U^?EKXhXK?t@3pT-tf$)Pa*g?#aWaFRj|P
z_u#1u%Qo#?wt3gK1IO3x-2eaoe+F6t#h)yU3=9ekIv`6xeqvzLbKqv2Bxu7hgYDra
q0S2Bv=fvPjKeiyw20@MrHbI6*lNYcsEZ}or=-A9qV6MTzU=0AUiCee;

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-right-mid.gif b/themes/modern/global/button-dis-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..883c78b10cc6ec32cb4362e98bd1cbc90d24e31f
GIT binary patch
literal 97
zcmZ?wbhEHbWM@!dSj51v|K$0-$Il)<ed*Y_t3|baXRh2jb?F8J1B2pE79h#MpaUX6
zY8jZ-BovZeyDWFy>YjEgTK${s_RO2=(-b-TmQ}6On7!>w&gqIZhyP4wV6X-NO{ga>

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-dis-right-top.gif b/themes/modern/global/button-dis-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8e38effe1270bab85e6512bbcb839d7bf502f056
GIT binary patch
literal 173
zcmZ?wbhEHbWM|-HI3me#{m!GJ+P>?zADy{!`|7QSr!L(*clFNI+Yc|@xPR&9{X?fO
zUbueu+U<vDuin0J{odu9_s?IubNu|ZW9P43ym9Z!tp_JAT)%kz-s#J?j-0*x|Nnmm
z450Xvg^__ll0gR~1G1BWRVzV(Es}E%!_0;1njAR}0%x>Yu6+qOE*Qhy%si39L#vf7
PMKB;isWm}?g~1vCxB5|o

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-left-btm.gif b/themes/modern/global/button-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d1405b27a4261c33085a7711daae3fc2d1bf1a70
GIT binary patch
literal 288
zcmZ?wbhEHb<YeGrxN5{;Xz8)}@Zkr~pYJ<$s(ZnLgJ;jae*5<6t5@f4+*rGB--?|(
z=dWM??Dgx_yLaDv`gG%g1KW=syK?v5)w_4M96o&R=B;CwE<JzqX6NzadrqBNzkmO_
zefv&cxjKKthT|76zIyYff6<~F4<D}Hv*+CP>$e_0JaYcRoV9BgY}~lz$dO4)mtMPn
z|IGCpyN@5=eezV#qD8aUtT}Mz%!x~v7H{7C|Nnmm;(+2$7DfgJBL*Fia*&@G*lZmd
z4k~%9^jO1i;BbM9nZ5^Gfk1=C)PtVP5}pDZ4rNVZ=&)+`ejpfhf?<Z+nJpSSQ}X#<
QT~-qKkk8Q6<j7zR0Em~8RsaA1

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-left-mid.gif b/themes/modern/global/button-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a07457e007b439aca35a1858f8fa8ce619b2ccbf
GIT binary patch
literal 137
zcmZ?wbhEHb<YZ7_*v!E2=H1&DZ{HePdR(}3XZOjIHy=HE^zy~YD_0MmIm>_zDE?#t
z3+sSLkQodtW&sTerz|==vNq1UIyHBpdzo@a-JBECGP75`i@dy9=J5Nh=X>s-YnQ%P
VvNw6d3>Kk@hn8J@*~P$M4FEzMH!c7G

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-left-top.gif b/themes/modern/global/button-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..eec269c191b004959042c4c70051ee2284b7fd30
GIT binary patch
literal 159
zcmZ?wbhEHb<YeGvI3mOF=G{9(OOJQ&-@knG=Kiy1uim_Q@%HVr*RP+ydGq@1+pG8P
zUAuSx!Sm<WA3S*T?(OMo*B`xndF%1x+m9c=efRF#{rh*GJU)Ex{JC4VPF%k7^wp~;
zFJE4`b?g8C{|qpo_>+Z^fkB2r2P6QplY!MxL7gqdk}2a9Yv$=iOa`harN!BrHhe5_
L;Bi_oUC{#oiws$?

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-mid-btm.gif b/themes/modern/global/button-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..411cf300c6134f0bf2f1f2ae58f3435939c89bd3
GIT binary patch
literal 67
zcmZ?wbhEHbRA69Xn8?5|YwcP?OOItccXlmUp!k!80R(hF1W2BNNn}d@%I*jJi{}*F
R=-zzK;s<}*BMvbJYXFxR6;l8J

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-mid-mid.gif b/themes/modern/global/button-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..461d2838faaac8599d4b1e98bcd2bae5210e593f
GIT binary patch
literal 158
zcmZ?wbhEHbRAAs{IKsfNa?hUUZ{A$Kd-vY6XRqJBU9o%ji7Qw3ojSE<@7~Ra53kz0
zck9uk`%j-fdFAT<GiTTD-@oO^k=1+ltlhVdfjFS}lLf3$2SkGGWMB<YQ0z;|oR_j-
aUC!%$Zxqg#<lf)1;C;>e|9jdJJ#+vhqCpe@

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-mid-top.gif b/themes/modern/global/button-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3422f58c350b9a64756c304227a13e65f2aacdfa
GIT binary patch
literal 53
zcmZ?wbhEHbRA69cXkcJ?^X{FYrHA5A76uT|0TCb>1}2`K{*~Pi_!rOFax02~!5RQt
C#0}v9

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-right-btm.gif b/themes/modern/global/button-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..32adae2ff922203739532076a92883b4cf4da6da
GIT binary patch
literal 276
zcmZ?wbhEHbWM|-DxT?-zXz8(R`}TGF_MN(RZQIeK7jNHQyLYdNmDh~btM{BbwR+#a
z_4^OZTD$hZ=`$M+9GJLl*~&e8b{;=IbJeQVd-fc^cyY(^<44Y4*n0Tz=0k_N7A!b?
z?)=7s2bb;KIcNRaeWy<CIeE&+(re|;ogE7ntlGWX(Au+e-aKO)@Bjb*Gf)XA{$ycf
zU{Gh!0htH#69b!}1H0lvNfCxF)`QNH3<_<&OA;A-)tG#qCO=|fQasptWP*ZK<6+HU
QAzOy!!U=r+?2HW70IH~CfB*mh

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-right-mid.gif b/themes/modern/global/button-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1f976eda0f4567a238b1839c75c4c22bd232f3f8
GIT binary patch
literal 97
zcmZ?wbhEHbWM@!dSj51v_w?x<$B!RAcmCv+t7f*I*Y4lHc>6X31B2pE79h#MpaUX6
zY8jZ-BovZeyDWFy>YjEgTK${s_RO2=(-b-TmQ}6On7!>w&gqIZhyP4wV6X-NA=M_7

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button-right-top.gif b/themes/modern/global/button-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca2a2cecf02fc405b4c08c0bba7866bd673bee8e
GIT binary patch
literal 275
zcmZ?wbhEHbWM|-HxT?VL=G{9(OOMxY-#&ly=Iy(8FW$a=^75srjn}pN5AHpCcKX`&
zn~xq{xP8aW&gbCSvk#s>zy0L#tw)bfUA^|`<%|2zo;`f=;>z87&tAX2c;~K>mDk;;
zPp&_Fc=Y1Mmv7!&d+^}wjhp}f|7V~jQ2fcl$iSe$paZf5<R=C;g98l)3|dTm3`!i8
sDqJjQ4kTO<6yRVyb+|xNgh|XrC2(eniu@V2MV1y8Ty5zWIhYu%0dZ_%9{>OV

literal 0
HcmV?d00001

diff --git a/themes/modern/global/button.css b/themes/modern/global/button.css
index 062ada4bbd35..b0a1db5783d7 100644
--- a/themes/modern/global/button.css
+++ b/themes/modern/global/button.css
@@ -1,4 +1,360 @@
-/* NEW WIDGET ANDING: <button> */
+/********************************/
+/* nine slice button - This is the default style used for all buttons.
+ * This style is fully scalable in 2 dimensions.  It supports normal and default buttons in 
+ * both active and disabled states, which includes 6 sets of sliced images.
+ ********************************/
+  
+  button {
+    -moz-binding			: url("chrome://global/skin/globalBindings.xml#nine-slice-button");
+    margin            : 2px;
+    border				    : 3px solid transparent;
+    min-width				  : 60px;
+    background-color  : transparent;
+    color					    : #1C1D1F;
+    -moz-user-focus   : normal !important;
+  }
+  
+  .button-text-mid {
+    font-family			    : charcoal, ms sans serif;
+    font-size 			    : 12px;
+    font-weight			    : normal;
+  }
+    
+  /* .......... focused state .......... */
+
+  button:focus {
+    border-color: #8C9EB5;
+    -moz-border-radius: 10px;
+  }
+    
+  /* .......... normal state .......... */
+  
+  .button-box-left {
+    width           : 9px;
+  }
+    
+  .button-left-top {
+    background			: url("chrome://global/skin/button-left-top.gif") no-repeat;
+    height          : 9px;
+  }
+
+  .button-left-mid {
+    background			: url("chrome://global/skin/button-left-mid.gif") repeat-y;
+  }
+
+  .button-left-btm {
+    background			  : url("chrome://global/skin/button-left-btm.gif") no-repeat;
+    height            : 8px;
+  }
+
+  .button-box-mid {
+    background-color  : #A5BABD;
+  }
+  
+  .button-mid-top {
+  	background			: url("chrome://global/skin/button-mid-top.gif") repeat-x;
+  	height          : 3px;
+    vertical-align  : top;
+  }
+
+  .button-mid-mid {
+  	background			  : url("chrome://global/skin/button-mid-mid.gif") repeat-x;
+    vertical-align    : middle;
+  	text-align        : center;
+  }
+
+  .button-mid-btm {
+    background			  : url("chrome://global/skin/button-mid-btm.gif") repeat-x;
+    height            : 4px;
+    vertical-align    : bottom;
+  }
+
+  .button-box-right {
+    width           : 7px;
+  }
+  
+  .button-right-top {
+  	background			: url("chrome://global/skin/button-right-top.gif") no-repeat;
+  	height          : 9px;
+  }
+
+  .button-right-mid {
+  	background			: url("chrome://global/skin/button-right-mid.gif") repeat-y;
+  }
+
+  .button-right-btm {
+    background			  : url("chrome://global/skin/button-right-btm.gif") no-repeat;
+    height            : 8px;
+  }
+  
+  /* .......... active state .......... */
+
+  button:hover:active > .button-box-left > .button-left-top {
+    background-image    : url("chrome://global/skin/button-active-left-top.gif");
+   }
+
+  button:hover:active > .button-box-left > .button-left-mid {
+    background-image    : url("chrome://global/skin/button-active-left-mid.gif");
+  }
+
+  button:hover:active > .button-box-left > .button-left-btm {
+    background-image    : url("chrome://global/skin/button-active-left-btm.gif");
+  }
+
+  button:hover:active > .button-box-mid {
+    background-color    : #84969C;
+  }
+  
+  button:hover:active > .button-box-mid > .button-mid-top {
+  	background-image    : url("chrome://global/skin/button-active-mid-top.gif");
+  }
+
+  button:hover:active > .button-box-mid > .button-mid-mid {
+  	background-image    : url("chrome://global/skin/button-active-mid-mid.gif");
+    color               : #ffffff;
+  }
+
+  button:hover:active > .button-box-mid > .button-mid-btm {
+    background-image    : url("chrome://global/skin/button-active-mid-btm.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-top {
+  	background-image    : url("chrome://global/skin/button-active-right-top.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-mid {
+  	background-image    : url("chrome://global/skin/button-active-right-mid.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-btm {
+    background-image    : url("chrome://global/skin/button-active-right-btm.gif");
+  }
+
+  /* .......... disabled state .......... */
+
+  button[disabled="true"], 
+  button[disabled="true"]:hover, 
+  button[disabled="true"]:hover:active {
+    color					: #595F61;
+  }
+
+  
+  button:hover:active > .button-box-left > .button-left-top[disabled="true"],
+  .button-left-top[disabled="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-top.gif");
+   }
+
+  button:hover:active > .button-box-left > .button-left-mid[disabled="true"],
+  .button-left-mid[disabled="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-mid.gif");
+  }
+
+  button:hover:active > .button-box-left > .button-left-btm[disabled="true"],
+  .button-left-btm[disabled="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-btm.gif");
+  }
+
+  button:hover:active > .button-box-mid[disabled="true"],
+  .button-box-mid[disabled="true"] {
+    background-color    : #ADBEC6;
+  }
+  
+  button:hover:active > .button-box-mid > .button-mid-top[disabled="true"],
+  .button-mid-top[disabled="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-mid-top.gif");
+  }
+
+  button:hover:active > .button-box-mid > .button-mid-mid[disabled="true"],
+  .button-mid-mid[disabled="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-mid-mid.gif");
+  }
+
+  button:hover:active > .button-box-mid > .button-mid-btm[disabled="true"],
+  .button-mid-btm[disabled="true"] {
+    background-image    : url("chrome://global/skin/button-dis-mid-btm.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-top[disabled="true"],
+  .button-right-top[disabled="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-right-top.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-mid[disabled="true"],
+  .button-right-mid[disabled="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-right-mid.gif");
+  }
+
+  button:hover:active > .button-box-right > .button-right-btm[disabled="true"],
+  .button-right-btm[disabled="true"] {
+    background-image    : url("chrome://global/skin/button-dis-right-btm.gif");
+  }
+  
+  /* .......... default normal state .......... */
+
+  .button-box-left[default="true"] {
+    width           : 10px;
+  }
+    
+  .button-left-top[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-left-top.gif");
+    height            : 10px;
+  }
+
+  .button-left-mid[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-left-mid.gif");
+  }
+
+  .button-left-btm[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-left-btm.gif");
+    height            : 9px;
+  }
+
+  .button-mid-top[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-mid-top.gif");
+  	height            : 4px;
+  }
+
+  .button-mid-mid[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-mid-mid.gif");
+  }
+
+  .button-mid-btm[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-mid-btm.gif");
+    height            : 5px;
+  }
+
+  .button-box-right[default="true"] {
+    width             : 8px;
+  }
+  
+  .button-right-top[default="true"] {
+  	background-image   : url("chrome://global/skin/button-def-right-top.gif");
+  	height             : 10px;
+  }
+
+  .button-right-mid[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-right-mid.gif");
+  }
+
+  .button-right-btm[default="true"] {
+    background-image   : url("chrome://global/skin/button-def-right-btm.gif");
+    height             : 9px;
+  }
+
+  /* .......... default active state .......... */
+
+  :hover:active > .button-box-left > .button-left-top[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-active-left-top.gif");
+  }
+
+  :hover:active > .button-box-left > .button-left-mid[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-active-left-mid.gif");
+  }
+
+  :hover:active > .button-box-left > .button-left-btm[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-active-left-btm.gif");
+  }
+
+  :hover:active > .button-box-mid > .button-mid-top[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-active-mid-top.gif");
+  }
+
+  :hover:active > .button-box-mid > .button-mid-mid[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-active-mid-mid.gif");
+  }
+
+  :hover:active > .button-box-mid > .button-mid-btm[default="true"] {
+    background-image  : url("chrome://global/skin/button-def-active-mid-btm.gif");
+  }
+
+  :hover:active > .button-box-right > .button-right-top[default="true"] {
+  	background-image   : url("chrome://global/skin/button-def-active-right-top.gif");
+  }
+
+  :hover:active > .button-box-right > .button-right-mid[default="true"] {
+  	background-image  : url("chrome://global/skin/button-def-active-right-mid.gif");
+  }
+
+  :hover:active > .button-box-right > .button-right-btm[default="true"] {
+    background-image   : url("chrome://global/skin/button-def-active-right-btm.gif");
+  }
+  
+  /* .......... default disabled state (the same as normal disabled) .......... */
+
+  button[default="true"][disabled="true"] {
+    margin-top          : 3px;
+    margin-bottom       : 3px;
+  }
+
+  :hover:active > .button-box-left > .button-left-top[disabled="true"][default="true"],
+  .button-left-top[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-top.gif");
+    height              : 9px;
+  }
+
+  .button-box-left[disabled="true"][default="true"] {
+    width               : 9px;
+  }
+
+  :hover:active > .button-box-left > .button-left-top[disabled="true"][default="true"],
+  .button-left-top[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-top.gif");
+    height              : 9px;
+  }
+
+  :hover:active > .button-box-left > .button-left-mid[disabled="true"][default="true"],
+  .button-left-mid[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-mid.gif");
+  }
+
+  :hover:active > .button-box-left > .button-left-btm[disabled="true"][default="true"],
+  .button-left-btm[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-left-btm.gif");
+    height              : 8px;
+  }
+
+  :hover:active > .button-box-mid[disabled="true"][default="true"],
+  .button-box-mid[disabled="true"][default="true"] {
+    background-color    : #ADBEC6;
+  }
+
+  :hover:active > .button-box-mid > .button-mid-top[disabled="true"][default="true"],
+  .button-mid-top[disabled="true"][default="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-mid-top.gif");
+    height              : 3px;
+  }
+
+  :hover:active > .button-box-mid > .button-mid-mid[disabled="true"][default="true"],
+  .button-mid-mid[disabled="true"][default="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-mid-mid.gif");
+  }
+
+  :hover:active > .button-box-mid > .button-mid-btm[disabled="true"][default="true"],
+  .button-mid-btm[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-mid-btm.gif");
+    height              : 4px;
+  }
+
+  .button-box-right[disabled="true"][default="true"] {
+    width               : 7px;
+  }
+
+  :hover:active > .button-box-right > .button-right-top[disabled="true"][default="true"],
+  .button-right-top[disabled="true"][default="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-right-top.gif");
+    height              : 9px;
+  }
+
+  :hover:active > .button-box-right > .button-right-mid[disabled="true"][default="true"],
+  .button-right-mid[disabled="true"][default="true"] {
+  	background-image    : url("chrome://global/skin/button-dis-right-mid.gif");
+  }
+
+  :hover:active > .button-box-right > .button-right-btm[disabled="true"][default="true"],
+  .button-right-btm[disabled="true"][default="true"] {
+    background-image    : url("chrome://global/skin/button-dis-right-btm.gif");
+    height              : 8px;
+  }
 
 /** plain (raw) buttons, class="plain" **/
   button.plain, button.plain:hover, button.plain:hover:active,
@@ -10,8 +366,7 @@
   button.plain > .button-internal-box > .button-text-container > .button-text, 
   button.plain > .button-internal-box > .button-text-container > .button.text:hover:active,
   button.plain > .button-internal-box > .button-icon, 
-  button.plain > .button-internal-box > .button.icon:hover:active
-    {
+  button.plain > .button-internal-box > .button.icon:hover:active {
       -moz-binding		  : url(chrome://global/content/xulBindings.xml#buttonleft);
       border              : 0px !important;
       margin              : 0px;
@@ -30,173 +385,6 @@
 
 button.plain-extended {}
 
-
-/** Default Button Styles (apply to usage of <button> without 
- *  any applied class).
- **/
-
-/* outer frame */
-  button 
-    {
-	  -moz-binding			: url("chrome://global/skin/globalBindings.xml#three-slice-button");
-      background-color      : transparent;
-      border				: 3px solid transparent;
-      margin        : 2px;
-      color					: #1C1D1F;
-      min-width				: 60px;
-      -moz-user-focus: normal !important;
-    }
-
-  button:focus 
-    {
-      border-color: #73869C;
-      -moz-border-radius: 10px;
-    }
-    
-  button[disabled="true"], button[disabled="true"]:hover, button[disabled="true"]:hover:active
-    {
-      border				: 0px;
-      color					: #595F61;
-    }
-
-  .button-image-left {
-	background			: url(chrome://global/skin/button-left.gif) no-repeat;
-	width				: 9px;
-	height				: 19px;
-  }
-
-  .button-image-middle {
-	background			: url(chrome://global/skin/button-middle.gif) repeat-x;
-  }
-
-  .button-text-box {
-	text-align          : center;
-    vertical-align      : middle;
-    padding				: 0px;
-    font-size 			: 12px;
-    font-family			: charcoal, ms sans serif;
-    font-weight			: normal;
-    margin-right		: 2px;
-    margin-bottom		: 2px;
-  }
-
-  .button-image-right {
-	background			: url(chrome://global/skin/button-right.gif) no-repeat;
-	width				: 7px;
-	height				: 19px;
-  }
-
-  .button-top-spring {
-	height				: 2px;
-  }
-
-  .button-bottom-spring {
-	height				: 1px;
-  }
-  
-  button:hover:active {
-  	color				: #1C1D1F;
-  }
-  
-  button:hover:active > .button-image-left {
-	background			: url(chrome://global/skin/button-clicked-left.gif) no-repeat;
-  }
-
-  button:hover:active > .button-image-middle {
-	background			: url(chrome://global/skin/button-clicked-middle.gif) repeat-x;
-  }
-
-  button:hover:active > .button-image-right {
-	background			: url(chrome://global/skin/button-clicked-right.gif) no-repeat;
-  }
-
-  button[disabled="true"] > .button-image-left,
-  button[disabled="true"]:hover:active > .button-image-left {
-	background			: url(chrome://global/skin/button-disabled-left.gif) no-repeat;
-  }
-
-  button[disabled="true"] > .button-image-middle,
-  button[disabled="true"]:hover:active > .button-image-middle {
-	background			: url(chrome://global/skin/button-disabled-middle.gif) repeat-x;
-  }
-
-  button[disabled="true"] > .button-image-right,
-  button[disabled="true"]:hover:active > .button-image-right {
-	background			: url(chrome://global/skin/button-disabled-right.gif) no-repeat;
-  }
-
-
-/* Default Button States */
-
-  button[default="true"] {
-    margin        : 1px;
-  }
-
-  button[default="true"]:focus {
-    -moz-border-radius: 12px;
-  }
-
-  .button-image-left[default="true"] {
-	background	: url(chrome://global/skin/button-def-left.gif) no-repeat;
-	width: 10px;
-	height: 21px;
-  }
-
-  .button-image-middle[default="true"] {
-	background	: url(chrome://global/skin/button-def-middle.gif) repeat-x;
-  }
-
-  .button-image-right[default="true"] {
-	background	: url(chrome://global/skin/button-def-right.gif) no-repeat;
-	width: 8px;
-	height: 21px;
-  }
-
-  button:hover:active > .button-image-left[default="true"] {
-	background	: url(chrome://global/skin/button-def-clicked-left.gif) no-repeat;
-  }
-
-  button:hover:active > .button-image-middle[default="true"] {
-	background	: url(chrome://global/skin/button-def-clicked-middle.gif) repeat-x;
-  }
-
-  button:hover:active > .button-image-right[default="true"] {
-	background	: url(chrome://global/skin/button-def-clicked-right.gif) no-repeat;
-  }
-
-  .button-image-left[default="true"][disabled="true"],
-  button[default="true"][disabled="true"]:hover:active > .button-image-left {
-	background	: url(chrome://global/skin/button-def-disabled-left.gif) no-repeat;
-  }
-
-  .button-image-middle[default="true"][disabled="true"],
-  button[default="true"][disabled="true"]:hover:active > .button-image-middle {
-	background	: url(chrome://global/skin/button-def-disabled-mid.gif) repeat-x;
-  }
-
-  .button-image-right[default="true"][disabled="true"],
-  button[default="true"][disabled="true"]:hover:active > .button-image-right {
-	background	: url(chrome://global/skin/button-def-disabled-right.gif) no-repeat;
-  }
-  
-/* text wrapping frame (hack because <text> does not support alignment) */
-  .button-text-container
-    {
-      text-align          : center;
-      vertical-align      : middle;
-    }
-
-/* text frame */
-  .button-text 
-    {
-      padding             : 0px 2px 0px 2px;
-    }
-  
-  button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text
-    {
-      padding             : 2px 2px 0px 2px;
-    }
-  
 /** Styles for 'dialog' buttons (usually any command button in a dialog)
  *  This class gives buttons 10px of padding on each side to increase the
  *  strike area and make buttons with small amounts of text (e.g. 'OK') 
@@ -205,13 +393,11 @@ button.plain-extended {}
 
 /* internal frame */
   .button-dialog > .button-internal-box,
-  .button-dialog:hover > .button-internal-box
-    {
+  .button-dialog:hover > .button-internal-box {
       padding             : 2px 10px 2px 10px;
     }
   
-  .button-dialog:hover:hover:active > .button-internal-box 
-    {
+  .button-dialog:hover:hover:active > .button-internal-box  {
       padding             : 3px 9px 1px 11px;
     }
 
@@ -219,28 +405,23 @@ button.plain-extended {}
  *  editor's formatting toolbar or toolbars wanting a button similar to a command
  *  button but without an initial outset frame.
  **/ 
-  .button-borderless 
-    {
+  .button-borderless  {
       border              : 1px solid #CCCCCC;
     }
   
-  .button-borderless:hover
-    {
+  .button-borderless:hover {
       border              : 1px solid #000000;
     }
     
-  .button-borderless > .button-internal-box 
-    {
+  .button-borderless > .button-internal-box  {
       border              : 1px solid #CCCCCC;
     }
   
-  .button-borderless:hover > .button-internal-box 
-    {
+  .button-borderless:hover > .button-internal-box  {
       border              : 1px outset #CCCCCC;
     }
   
-  .button-borderless:hover:active > .button-internal-box 
-    {
+  .button-borderless:hover:active > .button-internal-box  {
       border              : 1px inset #CCCCCC;
     }
 
@@ -258,21 +439,18 @@ button.plain-extended {}
  * Reorder buttons 
  **/
    
-  .reorder-up
-    {
+  .reorder-up {
       min-width           : 0px;
       list-style-image    : url("chrome://global/skin/simple-arrow-up.gif");
     }    
     
-  .reorder-down
-    {
+  .reorder-down {
       min-width           : 0px;
       list-style-image    : url("chrome://global/skin/simple-arrow-down.gif");
     }    
     
   .reorder-up > .button-internal-box > .button-icon,
-  .reorder-down > .button-internal-box > .button-icon
-    {
+  .reorder-down > .button-internal-box > .button-icon {
       margin              : 0;
       padding             : 0;
     }
diff --git a/themes/modern/global/checkbox.css b/themes/modern/global/checkbox.css
index ecf4f5ef20b8..0a3cc3eab0a8 100644
--- a/themes/modern/global/checkbox.css
+++ b/themes/modern/global/checkbox.css
@@ -7,8 +7,8 @@
     {
       border        : 2px solid transparent;
       margin			  : 0px 2px 0px 2px;
-      padding-left: 1px;
-      padding-right: 1px;
+      padding-left  : 1px;
+      padding-right : 1px;
     }
 
   checkbox > .internal-box
@@ -34,7 +34,8 @@
       list-style-image: url(chrome://global/skin/check-cb-check.gif);
     }
     
-  checkbox[checked="true"][disabled="true"] > .internal-box > .checkmark-box > .checkbox-check
+  checkbox[checked="true"][disabled="true"] > .internal-box > .checkmark-box > .checkbox-check,
+  checkbox[checked="true"][disabled="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-check
     {
       list-style-image: url(chrome://global/skin/check-cb-check-disabled.gif);
     }  
@@ -44,7 +45,8 @@
       list-style-image: url(chrome://global/skin/check-cb-pressed.gif);  
     }
   
-  checkbox[disabled="true"] > .internal-box > .checkmark-box > .checkbox-check
+  checkbox[disabled="true"] > .internal-box > .checkmark-box > .checkbox-check,
+  checkbox[disabled="true"]:hover:active > .internal-box > .checkmark-box > .checkbox-check
     {
   	  list-style-image: url(chrome://global/skin/check-cb-disabled.gif);  
     }
@@ -66,13 +68,14 @@
       padding: 1px;
     }
 
-  checkbox[disabled="true"][value] > .internal-box > html 
+  checkbox[disabled="true"][value] > .internal-box > html,
+  checkbox[disabled="true"][value]:hover:active > .internal-box > html
     {
       color: #999999;
     }
     
   checkbox:focus
     {
-      border-color: #73869C;
+      border-color        : #8C9EB5;
       -moz-border-radius  : 4px 5px 4px 5px;
     }
diff --git a/themes/modern/global/menubutton.css b/themes/modern/global/menubutton.css
index ba41f6238053..2c30c08c46f7 100644
--- a/themes/modern/global/menubutton.css
+++ b/themes/modern/global/menubutton.css
@@ -1,5 +1,8 @@
-
-/* outermost frame */
+/*********************************
+ * Regular menubutton
+ *   Shows a caption and brings up a popup menu which executes a command.
+ *********************************/    
+   
   menubutton
     {
       border              : 1px solid #000000;
@@ -20,66 +23,42 @@
       vertical-align      : middle;
     }
     
-  menubutton:active > .menubutton-internal-box,
-  menubutton[open="true"] > .menubutton-internal-box
-    {
-      /*border              : 1px inset #CCCCCC;*/
-      padding             : 2px 1px 0px 3px;
-    }
-
   .menubutton-single-icon
     {
       margin-left		  : 3px;
     }
-    
-/** "Dual Functionality" menubutton
- *  Has a popup spawning button and a command invoking button, e.g. back/forward
- *  class="menubutton-dual"
- **/    
+
+/*********************************
+ * "Dual Functionality" menubutton
+ *   Has a popup spawning button and a command invoking button, e.g. back/forward
+ *   class="menubutton-dual"
+ *********************************/    
   
-/* inner button */
-  menubutton.menubutton-dual > .menubutton-dual-button,
-  menubutton.menubutton-dual:hover > .menubutton-dual-button,
-  menubutton.menubutton-dual:active > .menubutton-dual-button
+  .menubutton-dual,
+  .menubutton-dual > .menubutton-internal-box,
+  .menubutton-dual:hover > .menubutton-dual-button,
+  .menubutton-dual:active > .menubutton-dual-button
     {
       border              : none;
       margin              : 0px;
       -moz-border-radius  : 0px;
     }
 
-  menubutton.menubutton-dual[open="true"] > .menubutton-dual-button > .button-internal-box
+  .menubutton-dual-dropmarker-box
     {
-      border              : 1px inset #CCCCCC;
-      padding             : 3px 1px 1px 3px;  
-    }
-    
-/* inner dropmarker */
-  menubutton.menubutton-dual > .menubutton-dropmarker
-    {
-      border              : 1px outset #CCCCCC;
       list-style-image    : url("chrome://global/skin/simple-arrow-down.gif");
-      padding             : 0px 2px 0px 2px;
     }
     
-  menubutton.menubutton-dual[disabled="true"] > .menubutton-dropmarker
-    {
-      list-style-image    : url("chrome://global/skin/simple-arrow-down-disabled.gif");
-    }
-
-  menubutton.menubutton-dual[open="true"] > .menubutton-dropmarker
-    {
-      border              : 1px inset #CCCCCC;
-      padding             : 1px 1px 0 3px; /* negatives not allowed -LDB */
-    }
-
-  menubutton.menubutton-dual > menupopup
+  .menubutton-dual > menupopup
     {
       min-width           : 0px;
     }
     
-/** Icon only menubutton.menubutton-duals
- *  class="menubutton.menubutton-dual-icon"
- **/
+/**************
+ * Icon only menubutton.menubutton-duals
+ * class="menubutton.menubutton-dual-icon"
+ ***************/
+ 
   .menubutton.menubutton-dual-icon 
     {
       border              : 1px solid #000000;
diff --git a/themes/modern/global/menulist-active-left-btm.gif b/themes/modern/global/menulist-active-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9f29806c3713585fe881e6ff5ceeedef6cf84409
GIT binary patch
literal 11
ScmZ?wbhEHb<X~WDI066;{sMde

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-left-mid.gif b/themes/modern/global/menulist-active-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8ae69bb6d46a383a8890b31d6d93111acc6b632
GIT binary patch
literal 95
zcmZ?wbhEHb<X})>Sj50EasJ|2OIA)^urxd`&(P9i`T8vjR;_1XV9)_#29O#CW*raa
y05K;+_SEXayQ?zi&3M|G7~UlFEBAHAG9Av{tM1JESbg4N?sco#1}nT77_0#g5F=y&

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-left-top.gif b/themes/modern/global/menulist-active-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ea0047aea42017ca793ab9ded27f1982f05953f1
GIT binary patch
literal 170
zcmZ?wbhEHb<Y3@pI3mh0asJ})ygWlokLByPtlG4F?UtSEx9{GvbKmOC+t+Q~xpDiR
z%{%ulTC-u(jy-diubI1I?eYy<R&Lt1XziwjYc|YSwEX}7{|tD6;!hSv1_n_E9gr%J
yoeZq%394KwmTVePoEi_9az5;OQ=_x>wuI+85f%?Vi-acv&7I2P6KymU8LR;k(mhH5

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-mid-btm.gif b/themes/modern/global/menulist-active-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..376ac8c867e0edef576652a727a50402a38e83be
GIT binary patch
literal 82
zcmZ?wbhEHbRA69XSj50!Xz5Yd+}=86W=+q8+V1|gDKi<sK=CIFnAQQ2Ahit4;t`wf
c{F^Y*arIt{>j!rKPk6zYk~uFUOO3%A0LKIw)&Kwi

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-mid-mid.gif b/themes/modern/global/menulist-active-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8d15aab93415a2883eb87070baf1a6e5cc9053df
GIT binary patch
literal 215
zcmZ?wbhEHbRAAs{IKsftK5h2I`HMI2+}k&M!I~{Qm#*71cg32{>2unq&6>7gY5Vj!
zT{Gr%&zw7R@rq^ZH&0u%ynpV(xhvML-LiA?f+Zc(X3t-_jsY)F{K*2A*8!0rI~iC*
z5)}GUGUqK>urBBIzBMjqN^<X8ycMZ=|NlV3dLcuJ{u4`zGIMN%F03f=TI-}fp|R}r
r+p7K1#}a+?W}kmy*vyo%`~HU=d-et>y!)}I?)?7i&l?)^6d9}m*q>XC

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-mid-top.gif b/themes/modern/global/menulist-active-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..41a333322afc46ed48fa26d032c8a21924b95a9d
GIT binary patch
literal 62
zcmZ?wbhEHbRA69cn8?5oo|k86=`nHsVg?2V#h)xdl7T@7M1bTOnD~48S9U+(Upyz^
MM)&4>I~W+O0kpOdM*si-

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-right-btm.gif b/themes/modern/global/menulist-active-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c6f39c8b4611233338fc194ad4097f3ae813a679
GIT binary patch
literal 421
zcmZ?wbhEHb6k}j#c;?JtXz9_jV8Ocm`&aJTwRGFI8LL*W-Me?@s@1D@?J8^TC~NLq
zwr$(Gy?b{ZJzm)}Vdc)98}{v6ylKn2efxGCKDv7M?hX6*?>lw6fBu54hmUMLc<9jC
z^ZQSq*>dpEoVDwwE?u@}_wKF*3z{cQX`MQ~wtwRKefwsvUbExa@yW}Uwa=cjcF&&m
z`}Z&2vUS>ul{*d}*?r>VvhCaZ7A$C(G`Xy+uXoX+=_^+)*s!T@{(|YtS1j4GC8xf5
z?wWNK-TfIAb!}6p`@|=2Ja8bcq+;`dgY!3T{Qv(y!w>|DKUo+V7@Qe&KyC-c2?Kjc
I10N?Z0QR(sC;$Ke

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-right-mid.gif b/themes/modern/global/menulist-active-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a24bbc0b520110b7672f51ad8197a9897a4f0e4
GIT binary patch
literal 200
zcmV;(05|_fNk%w1VHN-&0J8u9u)x5>&d<2V$id9bw8F!&zrdZXu6Bcox5LG|$H{z+
zk+Z_XF*!)Fz`=!>nE(I)EC2ui02Tls000DiP@NQpSRm`%2r7odNR)+bTK9$HR9$H5
zfg<^yu}Zfk90NL*&GZA#gf8MQSWEhH$7T<QV)AZ9>+o5PUX{?56ub0psT-{mEfasa
zY4bWOpVHmu`z~L`&-;6SVS#plNQHxkWQk*7U4Dp<go~1jj&YEbn3I=noN%5j5db^K
Ce_*x%

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-active-right-top.gif b/themes/modern/global/menulist-active-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3bacf5f4874b5549dfa1335722b0cbe950986fb2
GIT binary patch
literal 460
zcmci9$u0w70KoBYL?R(^aBy;QuUJl&yX6Itn2Q(aSp*SGBD9K#Rw<=z>`IKSmKL+<
z%+!4SX8)$^H1Q5jmA-`k3;YiMp^?GfzR6b52!2Rlmz?gt;oGOzm$bk^n6+&BlMz%^
zHcdg*@=j&rAR=no%a@Sk)5yYK2-#&PS9Z1zV=RPp>iwDJp@pGgqy#B`p9r0tA=6BX
znY5yK0(+b+XEEN2#^ybnQTmRN<tfUe<qJlkIKAwZbmN|3$J}meeOpwO_1&;y+dM+5
zg&$Z>FBWg!-jbpeI=zItE@?U|W^$DZ2eY5DoRYq0SA0(#FDU4d;j-Ays46s#nPp$(
zB7Tubtc3O%8LoxHdM^L?!SG1IB}dS-S3$(Z(%kCC@imQbE^;1U*z^~iid8BfonLta
zd(~<c{8#P2^#lMUaMi%t6VMQtCl(f$D2gOqopm1Xn$Js+O%px9AJ_@D^w$wh9c|;m
LsDGfVd6f7AUnAq}

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-left-btm.gif b/themes/modern/global/menulist-dis-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..48ba137914e064086e99afe6059f3ec436ebf19b
GIT binary patch
literal 266
zcmZ?wbhEHb<X~WDxT?xfRNJ@b*y&wIP98aPY3YV-oA(_#a`w{tUHg}B-m!MazT@Yw
z9yoRW%;lSl*Kav=`r?tZm-ik&bL!&tHQV=W-gkKIj=eh$9p8TF_`03@4xT)B>Bik{
z2aX*)b$-X;6T6R`JbUHVh3j`NT)(?y!?qLWukJg3=H$ie|NsAIpej)O$->CMpvs^F
zG8N<}1~vl+2eu;t779!UjyqTBFv&Q$q}=GS5<S2mED&MRDx_dw8KW_2l0~CJ3jlc~
BXd?gs

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-left-mid.gif b/themes/modern/global/menulist-dis-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..99d990ebe68061ce5521b6a601a682c303f3f9b8
GIT binary patch
literal 103
zcmZ?wbhEHb<X})>Sj50^`NqA&XD;nOac<Ai(?zv?CoWt&d*#-}8+R3dvM_*v4u}A$
zWnk9vC<s$@He^q&F1))cbKZ=nor&R1GQV<PXDrj<+`a0~ypPrAE#_Xgnr*Pcn}NX^
E0Pnpk{r~^~

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-left-top.gif b/themes/modern/global/menulist-dis-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3146f719a3a0d84f99d7c73bce00f8faa4015a62
GIT binary patch
literal 11
ScmZ?wbhEHb<Y3@pI066<2LgWp

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-mid-btm.gif b/themes/modern/global/menulist-dis-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..90ee60e83d727112430d0b452b5dc724c6235372
GIT binary patch
literal 82
zcmZ?wbhEHbRA69XSj50kRNJ?B{g&0+_iWsIXw%+9tGDf800YIJEMQs(M1s^ZFpGO^
dzVmN_sN?Fr7S|8#{-5xIF(q?eMwS|bH2{hJ9H{^R

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-mid-mid.gif b/themes/modern/global/menulist-dis-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4b4223c680163cbd28b93cbe1c29293f54507989
GIT binary patch
literal 216
zcmZ?wbhEHbRAAs{IKsfNY4737H||}$arexXo5#;z-G1o!o@1xC>_2kw^o33P4sYIn
zWb1*WCoWt)d-c}V{YMX<xwLuTkuCd=?muyM=iw8FPG8)6{LJp7rx<Vp#h)x-NgWUg
zvXg-|G(n*+C3D`A1?zHN@5?bhQ<8h%;;cZ;`~L?L-a9%<^q*K#lsP4Y=fa8-ueDCP
xlbgy;zpdJT`)Hz%-t6-)J~A<7?7shD$DX$VD(`;msXM>lU8K0NDNm8X8UQK^Xbb=V

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-mid-top.gif b/themes/modern/global/menulist-dis-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9b317543f67e4fd0738fcf58529d5c9b2f6091bc
GIT binary patch
literal 53
zcmZ?wbhEHbRA69cXkcKteDhvWZJ**#76uT|0TCb>1}2`K{*~Pi_!rOFax02~!5RQ=
C&<<_@

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-right-btm.gif b/themes/modern/global/menulist-dis-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a0e6f52e4d556f1a0c5af59fb421370692a5d684
GIT binary patch
literal 288
zcmZ?wbhEHb6k}j#xT?ocRNJ>?!?qoVj_){pV)eE?+Yg`Evj6DL!zb2k-@E(hsXfO|
zZ{2_N;HmS6&s^Gh<mBq@dsc4Sy?o>LWgE8dJ$7c<rtRx??%%ZcQ0KJS+YTPvbM*B3
z-3L}|-MwYsk!ed-t=X}6*O8NRSFT&JdFQ4*hZe8jGJn<j&3g~eS+Q>ZstwCFZd<T+
z)AB95R&L(8|Kz#(t2g}r|DS<$p!k!8k%2*vK?kH2<R=EU6o-zKO9>h>%}b0be`p9z
z6-zMIk>kFhQ&!-?A*aBgGAVI`5PM_QUOO2tkp^#3!3Bog&2{+^Iu=UW>P4DrVgUEd
Be9Qm<

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-right-mid.gif b/themes/modern/global/menulist-dis-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..13f79a1d839633b96bd30cce4ea0e7ded5121c1f
GIT binary patch
literal 208
zcmZ?wbhEHb6k||e*v!DN>*%R{C(iCYerD0S%}35&I&}Kt?xUxQYWsE{JH7At+2tFz
zZ{B-&|A}*}x9wp71I3>#U|I)6g3MrGsok*B#mhnAbq)*n=>m@_t+`R(TOWtSX1r=t
z`Z;f-*LGDIW~*suzc8O`(R-vH;r*-Vcp86u(x*Jv*B>H#<ECDiDzf`a-b(4U!n(rs
zJ2O99Y0tlO_xW$V_+#gPSJx*tmNj^^Hn*pACMU$!b@aD%PwMI`oG@j^<mtI{3g+nu
HGFSru)I(xA

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-dis-right-top.gif b/themes/modern/global/menulist-dis-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3da57252018d31474764ffad117441843b1a8858
GIT binary patch
literal 520
zcmd7P$u0w70KoBYv`MR$P-`M02ob~yX~h<?_AR`EyF@Gp2iw(haG<EIO|><qX1Yvg
z>wMpQvsV{R-odHjE&QM0m;6`OmVN&9cHjZu0iYK?H#QG7y8_LkfUS34&dRD*sO0qm
zwn{OYm5mPpo5(7K6Eq7oQMIsLmNXliB@XG5YUQBLD+V%(jEHWd<U>5k2=FnUq<NS~
zb1c-;d7KhpDEgMktIr8KOfp$nQ>;>2!mO-{*vd%wiDWXOl0ycEjGM@7T2ijUF=Q51
zt9&0z##1>?F&JLvk-^HEYL}^;Bw~~1^5IvS%nE{H(gM7Tk`yaSs-5Ct=!FVK64h!I
z{O@{yoCE*?F#5;*djebsTg3Lx?%rM?P}{Ry0}hXlk6aT|#J;EP;N%Rr#>X0omciN6
z^J7=t%B7=g;W~KH?CzT<>L)v<YpCQq)!g9q4-mbpt(`*+4jCecyJ@bQnCTyO*Lg>r
NmCrAyZ)uV6`~u?Q(FFhi

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-left-btm.gif b/themes/modern/global/menulist-left-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..43741328ecd2d3fd0c6e5711ffbce9f4ad597f57
GIT binary patch
literal 266
zcmZ?wbhEHb<X~WDxT?-zXz8)<)TzarH=n$6_0^j<8xI^faOTXp>(}RR*zoN2>+Q#m
zZ8>t}+>IOE3l_{@zkcWO;|I^4-E#Qwt%ncqJ$*W7?b;KUF7+>3G->J5&4&*!*tqe*
z^XEN_7VSB8>glUj=WgEGef;>1hYyckx^(>F#nroaU%7j4^`1Rf@813Y|33qjfZ|UU
zMg|6T1|5)jAU`p%88|Q~8Y=Sga5=a$e`;akZa8veg@c{o0Y{OF1g@pR4aPz#GE*i?
I6mHA`0C@6jod5s;

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-left-mid.gif b/themes/modern/global/menulist-left-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fc987a1f024b7609e123bdb0b07f585717c0b817
GIT binary patch
literal 103
zcmZ?wbhEHb<X})>Sj52a`t4goOOFT7pI^Iw|H%0ZXRhDaee%@vH*XYwvM_*v4u}A$
zWnk8kC@^w$Gh|P#F1))cbKZ=nor&R1GQV<PXDrj<+`a0~ypPrAE#_Xgnr*Pcn}NX^
E0P3SF{r~^~

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-left-top.gif b/themes/modern/global/menulist-left-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db00808db758812b56ed0d954f2734d34e77d2df
GIT binary patch
literal 181
zcmV;m080NyNk%w1VF&;U0K^^u?C$O{IY{pB@9FI9=<V(7?(OF5>+0<6-{$7+?(V_N
z&D`YU$<)=>-{0r#?AhYt+vDTl=jX`N)Z*#r*52RZ>FLng+R)tG&f41K>FL+t;N|M-
z>+S8@<KzGT{{R30A^8LW0015UEC2ui00;mI000FtpeF_-IRYr^1!>Bn0+4WTd=L&B
j4@MOQyA1-O2@nnjM2BJt6b6|^10!(~CXWk45dr`^(9B^>

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-mid-btm.gif b/themes/modern/global/menulist-mid-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d9f51571898f22c078ea0ed5f3953db999697a82
GIT binary patch
literal 83
zcmZ?wbhEHbRA69XSj50!Xz9_lV8N`lYnScZIeX2T?ga~0?A*z~z@Ye(1xPY5=zs{2
kS_Wo`jLmocO%QZkz1QNp(60Xp8dVON^D<V=<7BV~0F!wft^fc4

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-mid-mid.gif b/themes/modern/global/menulist-mid-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d02137d919c616fde5b28791f85f76c684b4f0b
GIT binary patch
literal 216
zcmZ?wbhEHbRAAs{IKsfNa?hUEZ{I$D^XBs1yPFRmzW40eiru?UT)DDl@7{f<POaLz
zcm4kTYxnKD|LobxD_6H3J-Tk+zN`1{oxXPc@VWD=_w3n!=Irj1CmC=9#h)x-NgWUg
zvXg-|G(n*+C3D`A1?zHN@5>23Q<8h%LYBAY{r>|A{*Npq`cEt=%A6A-bYVq_*IFlC
w{-(0iZ>#p-W=-<Zn|=Pp$0nwX-S<E2*uxtr@$Sc-y7T*uMT#4n@)Q}Y0dF>Dp#T5?

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-mid-top.gif b/themes/modern/global/menulist-mid-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3422f58c350b9a64756c304227a13e65f2aacdfa
GIT binary patch
literal 53
zcmZ?wbhEHbRA69cXkcJ?^X{FYrHA5A76uT|0TCb>1}2`K{*~Pi_!rOFax02~!5RQt
C#0}v9

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-right-btm.gif b/themes/modern/global/menulist-right-btm.gif
new file mode 100644
index 0000000000000000000000000000000000000000..fbd03fad26a91a9f97ffd757b8fc93c392fa564c
GIT binary patch
literal 238
zcmV<K01^L3Nk%w1VHN-f0M$AGF*!($qN23J!?eZ4v&6)kuCA@VzOKH$$J5iCuCBJl
z#lXwVmaVP2$jFkRqmiJZwZz1|$;wx5ZnVV2wZp@<$H&Xo*NUK^mZqn}(9pfg%eTeF
zov^Tgla!RGsG6;<m8`6TmX@r%yr{Uievy;A$;pJ9o1?X~oUgBuqocjc%aEa=p|Y}r
zl$E*1$F;`BvBANDla#y2$eXRL%+}Ycxw>$Ri@eLrskyk4s;dA0{{R300000000000
o00000A^8LW0024wEC2ui02TlT000JOK*nQ1L#Qf)q%x^+X(IuHG5`Po

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-right-mid.gif b/themes/modern/global/menulist-right-mid.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6168a90762890c6fa34f13f479855cbab063588d
GIT binary patch
literal 208
zcmZ?wbhEHb6k||e*v!DN<HU)B=gytGabwr1Q@c){T(xW0taa-QEj><My?Xfkg^oFM
zCM{fi@a(yLXU;Hyf#OdVFs%b3L1r+p)Lzh03y@HF?Gwe-TI4aMH8<*e>*J8vj8~0H
zKj&@q+O8_YY&Grd7v^&<dXMxYynhuPPvdV-`jqGT`a@)I+|&zGMRtG5TPeL(SXa1y
zXXa-s?fIAPKL4#3f9(A4>iWdSvIdXV=Ju4%<b>F|j{cVJNnL$~6Q<0VJUw?#!8{#7
G25SJmbzo)y

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist-right-top.gif b/themes/modern/global/menulist-right-top.gif
new file mode 100644
index 0000000000000000000000000000000000000000..21293e072a73c6364b7e45cb78c03259c50d1b59
GIT binary patch
literal 460
zcmchU%}c^y0Egc}Abmimx>wMtLqbqOL8m@$9rM_K5|xJzX+=<25r*LUGE)+Q63m#G
z+2(R{@4kB9oZEai=ed*BKhf{>93FTMzs2Q+nZVjG=mTaDv^yPtVCl=YNxLl}{4Pn)
zEbII-#&jxUxvt}RHX+!yV>e0H^XR(_E6bdsJe5kNS`F%Y%XKsPd>x^82^LxIL(>l8
ziN|tTZ5pXuE|E&>mWeFWYPF6puZtX)$lOZ^y$M3$SC-|oo7>at<asu05TY9f@w{xI
zpc=*zeUZ-P_TzC;RU5V)j>Q_5#j9FP*A;|Xj>GW$3s+S!u4~!@!<0nvRS;MRMOlf`
zSA|N2li{anLW~X*GzTS!G5o^iD$gql!?I<uu9?jyAq-b-IK=IAy4^1L_l<n_PyhtM
z#9#UE6X4rjr#3dXLZM)Az(4N;;mB@eaBhLxo|@g+I|lvJE4|d%_)zpDvN}2X14XRv
AG5`Po

literal 0
HcmV?d00001

diff --git a/themes/modern/global/menulist.css b/themes/modern/global/menulist.css
index 08acb4e9eb77..dd4fd69f9d0f 100644
--- a/themes/modern/global/menulist.css
+++ b/themes/modern/global/menulist.css
@@ -1,80 +1,208 @@
+/********************************/
+/* nine slice menulist - This is the default style used for all menulists.
+ * This style is fully scalable in 2 dimensions.  It supports menulists in
+ * both active and disabled states, which includes 3 sets of sliced images.
+ ********************************/
 
-/**
- * XXX - The style rules in this file are very old and very bad.
- *       They need to be given a similar upgrade as classic-win has had.
- **/
- 
-/* NEW WIDGET LANDING: <menulist> popup */
+  menulist {
+    -moz-binding		  : url(chrome://global/skin/globalBindings.xml#nine-slice-menulist);
+    margin			      : 0px 1px 0px 1px;
+    border            : 3px solid transparent;
+    padding           : 0px;
+  }
 
-/* outer frame */
-  menulist 
-    {
-      -moz-binding		  : url(chrome://global/skin/globalBindings.xml#menulist);
-      padding             : 0px;
-      margin			  : 3px 4px 3px 4px;
-      font-size 		  : 10px;
-      font-family		  : geneva, arial;
-    }
+  .menulist-text-mid {
+    font-family		    : charcoal, ms sans serif;
+    font-size 		    : 12px;
+    color             : #000000;
+    padding-right     : 2px;
+  }
 
-  .menulist-text-box
-    {
-   	  margin-top		  : 2px;
-   	  margin-right		  : 2px;
-    }
+  .menulist-dropmarker {
+    list-style-image  : url("chrome://global/skin/menulist-arrow.gif");
+    width				      : 9px;
+    height			      : 6px;
+  }
 
-  .menulist-spring-left 
-  	{
-  	  background		  : url(chrome://global/skin/menulist-leftcap.gif) no-repeat;	
-	  height			  : 18px;
-	  width				  : 8px;
-  	}
+  /* .......... focused state .......... */
 
-  .menulist-box-middle
-    {
-      background		  : url(chrome://global/skin/menulist-middle.gif) repeat-x;
-      height			  : 18px;
-    }
+  menulist:focus {
+    border-color        : #8C9EB5;
+    -moz-border-radius  : 10px 7px 11px 10px;
+  }
+
+  /* .......... normal state .......... */
+
+  .menulist-box-left {
+    width           : 8px;
+  }
+    
+  .menulist-left-top {
+    background			: url("chrome://global/skin/menulist-left-top.gif") no-repeat;
+    height          : 10px;
+  }
+
+  .menulist-left-mid {
+    background			: url("chrome://global/skin/menulist-left-mid.gif") repeat-y;
+  }
+
+  .menulist-left-btm {
+    background			  : url("chrome://global/skin/menulist-left-btm.gif") no-repeat;
+    height            : 7px;
+  }
+
+  .menulist-box-mid {
+    background-color  : #A5BABD;
+  }
   
-  .menulist-dropmarker-right
-    {
-      background		  : url(chrome://global/skin/menulist-rightcap.gif) no-repeat;
-      height			  : 18px;
-      width				  : 22px;
-    }
+  .menulist-mid-top {
+  	background			: url("chrome://global/skin/menulist-mid-top.gif") repeat-x;
+  	height          : 3px;
+    vertical-align  : top;
+  }
 
-/* Clicked States */
+  .menulist-mid-mid {
+  	background			  : url("chrome://global/skin/menulist-mid-mid.gif") repeat-x;
+  	text-align        : center;
+    vertical-align    : middle;
+  }
 
-  menulist:hover:active > .menulist-spring-left, menulist[open="true"]> .menulist-spring-left
-  	{
-  	  background		  : url(chrome://global/skin/menulist-clicked-leftcap.gif) no-repeat;	
-  	}
+  .menulist-mid-btm {
+    background			  : url("chrome://global/skin/menulist-mid-btm.gif") repeat-x;
+    height            : 4px;
+    vertical-align    : bottom;
+  }
 
-  menulist:hover:active > .menulist-box-middle, menulist[open="true"]> .menulist-box-middle
-    {
-      background		  : url(chrome://global/skin/menulist-clicked-middle.gif) repeat-x;
-    }
+  .menulist-box-right {
+    width           : 22px;
+  }
   
-  menulist:hover:active > .menulist-dropmarker-right, menulist[open="true"] > .menulist-dropmarker-right
-    {
-      background		  : url(chrome://global/skin/menulist-clicked-rightcap.gif) no-repeat;
-    }
+  .menulist-right-mid {
+  	background			: url("chrome://global/skin/menulist-right-mid.gif") repeat-y;
+  }
 
-/* Disabled States */
+  .menulist-right-mid2 {
+  	background			: url("chrome://global/skin/menulist-right-top.gif") no-repeat;
+    padding-left    : 3px;
+    padding-right   : 2px;
+    padding-top     : 6px;
+    text-align      : center;
+    vertical-align  : middle;
+  }
 
-  .menulist-spring-left[disabled="true"], menulist:hover:active > .menulist-spring-left[disabled="true"]
-  	{
-  	  background		  : url(chrome://global/skin/menulist-disabled-leftcap.gif) no-repeat;	
-  	}
+  .menulist-right-btm {
+    background			  : url("chrome://global/skin/menulist-right-btm.gif") no-repeat;
+    height            : 7px;
+  }
 
-  .menulist-box-middle[disabled="true"], menulist:hover:active > .menulist-box-middle[disabled="true"]
-    {
-      background		  : url(chrome://global/skin/menulist-disabled-middle.gif) repeat-x;
-    }
+  /* .......... active state .......... */
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-top,
+  menulist[open="true"] > .menulist-box-left > .menulist-left-top {
+    background-image   : url("chrome://global/skin/menulist-active-left-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-mid,
+  menulist[open="true"] > .menulist-box-left > .menulist-left-mid {
+    background-image   : url("chrome://global/skin/menulist-active-left-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-btm,
+  menulist[open="true"] > .menulist-box-left > .menulist-left-btm {
+    background-image   : url("chrome://global/skin/menulist-active-left-btm.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid,
+  menulist[open="true"] > .menulist-box-mid {
+    background-color  : #84969C;
+  }
   
-  .menulist-dropmarker-right[disabled="true"], menulist:hover:active > .menulist-dropmarker-right[disabled="true"]
-    {
-      background		  : url(chrome://global/skin/menulist-disabled-rightcap.gif) no-repeat;
-    }
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-top,
+  menulist[open="true"] > .menulist-box-mid > .menulist-mid-top {
+  	background-image  : url("chrome://global/skin/menulist-active-mid-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-mid,
+  menulist[open="true"] > .menulist-box-mid > .menulist-mid-mid {
+  	background-image  : url("chrome://global/skin/menulist-active-mid-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-mid > .menulist-text-mid,
+  menulist[open="true"] > .menulist-box-mid > .menulist-mid-mid > .menulist-text-mid {
+    color: #ffffff;
+  }
+
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-btm,
+  menulist[open="true"] > .menulist-box-mid > .menulist-mid-btm {
+    background-image  : url("chrome://global/skin/menulist-active-mid-btm.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-mid,
+  menulist[open="true"] > .menulist-box-right > .menulist-right-mid {
+  	background-image  : url("chrome://global/skin/menulist-active-right-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-mid > .menulist-right-mid2,
+  menulist[open="true"] > .menulist-box-right > .menulist-right-mid > .menulist-right-mid2 {
+  	background-image  : url("chrome://global/skin/menulist-active-right-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-btm,
+  menulist[open="true"] > .menulist-box-right > .menulist-right-btm {
+    background-image  : url("chrome://global/skin/menulist-active-right-btm.gif");
+  }
+
+  /* .......... disabled state .......... */
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-top[disabled="true"],
+  .menulist-left-top[disabled="true"] {
+    background-image   : url("chrome://global/skin/menulist-dis-left-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-mid[disabled="true"],
+  .menulist-left-mid[disabled="true"] {
+    background-image   : url("chrome://global/skin/menulist-dis-left-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-left > .menulist-left-btm[disabled="true"],
+  .menulist-left-btm[disabled="true"] {
+    background-image   : url("chrome://global/skin/menulist-dis-left-btm.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid[disabled="true"],
+  .menulist-box-mid[disabled="true"] {
+    background-color  : #84969C;
+  }
+  
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-top[disabled="true"],
+  .menulist-mid-top[disabled="true"] {
+  	background-image  : url("chrome://global/skin/menulist-dis-mid-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-mid[disabled="true"],
+  .menulist-mid-mid[disabled="true"] {
+  	background-image  : url("chrome://global/skin/menulist-dis-mid-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-mid > .menulist-mid-btm[disabled="true"],
+  .menulist-mid-btm[disabled="true"] {
+    background-image  : url("chrome://global/skin/menulist-dis-mid-btm.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-mid[disabled="true"],
+  .menulist-right-mid[disabled="true"] {
+  	background-image  : url("chrome://global/skin/menulist-dis-right-mid.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-mid > .menulist-right-mid2[disabled="true"],
+  .menulist-right-mid2[disabled="true"] {
+  	background-image  : url("chrome://global/skin/menulist-dis-right-top.gif");
+  }
+
+  menulist:hover:active > .menulist-box-right > .menulist-right-btm[disabled="true"],
+  .menulist-right-btm[disabled="true"] {
+    background-image  : url("chrome://global/skin/menulist-dis-right-btm.gif");
+  }
 
 /** rules for EDITABLE menulists (aka 'comboboxes'). 
  **/
@@ -119,13 +247,14 @@
     }
 
 /* rules for popups and separators associated with menulists */
-  menulist > menupopup 
-    {
-      border			  : 1px solid #313948;
-      min-width           : 0px;
-      padding             : 0px;
-      background-color	  : #C2D0D0;
-    }
+  menulist > menupopup {
+    border              : 1px solid #313948;
+    padding             : 0px;
+    min-width           : 0px;
+    background-color	  : #C2D0D0;
+    font-family		      : charcoal, ms sans serif;
+    font-size 		      : 12px;
+  }
     
   menulist > menupopup > .popup-internal-box
     {
@@ -140,10 +269,12 @@
 
   menulist > menupopup > menuitem 
     {
-      padding             : 0px;
+      padding-right       : 12px;
+      padding-top         : 1px;
+      padding-bottom      : 1px;
       min-width           : 0px;
       max-width           : none;
-      color				  : #000000;
+      color				        : #000000;
     }
 
   menulist > menupopup > menuitem[menuactive="true"]
@@ -162,10 +293,3 @@
       list-style-image    : url(chrome://global/skin/menu-check-hover.gif);
     }
   
- menulist:focus
-   {
-      border              : 3px solid #73869C;
-      margin			  : 0px 1px 0px 1px;
-      -moz-border-radius  : 10px 9px 11px 10px;
-   }
-  
diff --git a/themes/modern/global/radio.css b/themes/modern/global/radio.css
index dda7cf9f9efe..dccf3be2c731 100644
--- a/themes/modern/global/radio.css
+++ b/themes/modern/global/radio.css
@@ -6,15 +6,17 @@
     {
       border: 2px solid transparent;
       margin: 0px 3px 0px 3px;
+      -moz-user-focus: normal !important;
     }
 
   radio > .internal-box
     {
+      -moz-user-focus: ignore;
     }
 
-  #radio:focus 
+  radio:focus 
     {
-      border-color: #73869C;
+      border-color: #8C9EB5;
       -moz-border-radius  : 4px 5px 4px 5px;
     }
     
@@ -87,3 +89,8 @@
       color: #999999;
     }
   
+    radiogroup 
+    {
+      -moz-user-focus : ignore;
+    }
+  
\ No newline at end of file
diff --git a/themes/modern/global/textfield.css b/themes/modern/global/textfield.css
index e6e0eb9cf8dc..910478bd9e7f 100644
--- a/themes/modern/global/textfield.css
+++ b/themes/modern/global/textfield.css
@@ -7,10 +7,9 @@
 /* outer frame */
   textfield
     {
+      margin              : 1px;
+      border              : 3px solid transparent;
       padding             : 0px;
-      border              : 0px;
-      margin              : 4px;
-      background-color    : #FFFFFF;
       font                : inherit;
       color               : #000000;
       cursor              : text;
@@ -23,8 +22,7 @@
   
   textfield[focused="true"]
     {
-      border              : 3px solid #73869C;
-      margin              : 1px;
+      border-color        : #8C9EB5;
       -moz-border-radius  : 6px;
     }
    
@@ -45,7 +43,7 @@
       border              : 1px inset #B4C3D4;
       padding             : 1px 2px 1px 2px;
       cursor              : text;
-      background-color    : inherit;
+      background-color    : #FFFFFF;
       color               : inherit;
     }
   
diff --git a/xpfe/global/resources/content/xul.css b/xpfe/global/resources/content/xul.css
index 77d14bc1a1b0..2446ad62560b 100644
--- a/xpfe/global/resources/content/xul.css
+++ b/xpfe/global/resources/content/xul.css
@@ -16,6 +16,10 @@
   display: block;
 }
 
+*, *[disabled="true"] {
+  -moz-user-focus: ignore;
+}
+
 /**
  * Hide the content, but don't destroy the frames. 
  * DO NOT USE "_collapsed" IN YOUR XUL!