From 9c348268b3268db67fea16256597e9af9840adf0 Mon Sep 17 00:00:00 2001
From: Phillip Ball <phillip@phillipball.com>
Date: Wed, 6 Apr 2011 13:25:43 -0700
Subject: [PATCH] Major installer cleanup. Mostly cosmetic, but added some
 sanity checks, and some upgrade versions.

---
 install/images/hdrep.png          | Bin 0 -> 961 bytes
 install/images/info.png           | Bin 0 -> 4599 bytes
 install/images/logo.png           | Bin 0 -> 10763 bytes
 install/include/sanity.php        |  18 +-
 install/index.php                 |  90 ++++---
 install/pages/admin_user.php      |  12 +-
 install/pages/dbcheck.php         |  19 +-
 install/pages/dbconfig.php        |  38 ++-
 install/pages/final.php           |   2 +-
 install/pages/sanity.php          |  44 +++-
 install/pages/setlang.php         |  11 +-
 install/pages/upgrade.php         |   2 +-
 install/pages/upgrade_version.php |  27 +--
 install/pages/welcome.php         |  18 +-
 install/pop.css                   |   0
 install/popup.php                 |   4 +-
 install/style.css                 | 382 ++++++++++++++----------------
 17 files changed, 337 insertions(+), 330 deletions(-)
 create mode 100644 install/images/hdrep.png
 create mode 100644 install/images/info.png
 create mode 100644 install/images/logo.png
 create mode 100644 install/pop.css

diff --git a/install/images/hdrep.png b/install/images/hdrep.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23156bf249bd9251ce99615d14637e4b86c7c6a
GIT binary patch
literal 961
zcmV;y13vtTP)<h;3K|Lk000e1NJLTq000F5003nO0ssI23i-b10000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#V@X6oRCwBiRM}SBSP;BROO|0m@CLTQ
zEMZAz{{MplgaEd&v7JD)-l^(qGBZ!3C-v#7>gq)jlMX!}sjAW#BR)+-Q<wP?fw4wH
zXhOBY8zPtPdwtsmCe)4~>s+g2Ow*JbXRT!bR<Q<DY^!TR70R`-WC~!R*eHuY4?HCi
zWZe*I*=Dk?X=+F~2JIg7nqtLw*Y2ZilfS45D;8z*6;)uP-G`pvTG|;HQ<HC;bGrlj
z`}Km@d1M*{OX~SQ4w=arASW=}ye+M|@Vf(VeG(-I3{j7)A%gmC;f(XLH$tWQZON+g
zVHiSHzdoyi6*_-ipb%Wi-q2e~qd)mL!l1=Csxzp|`gM-T$^JMrRsCZ|SkgIWrJr+H
zFjx~f)sLCcvC00CcWK*l=1w}tU~T(NIuiql&D0^2bSKDEn<@L1&IFaJ^`njt{Q|b0
z(x29X-cDR^(me)HSk~GkvNlibH|d>HZ~er6)9#6Z^VMTqqA;^!hOF+1_d9z=4W@kn
z;g2wz^iH5xt{&jeC;hX?VjF4yl$BNwdKJ*Ck$H@IY46ng-Hx#l2v+H|tW{P~Ex!w9
z1ei)Za`EZl9OC8610}GlP?dmf&$)l<<wGxyEIl~?r(cR!1z6liYj9@jqFmmC<kG`W
z{61bDV8ME!zjFCq{h`*GmyZY0U+dr;EYU@&iz){Y9wa@yfb+-_z*uQ<uT!#|A2K%f
zdvNZP?pXbKva0R;ApXgab%*&$I=rOb;$F*+E;(7~@m}B$u;*_&Bnt_j_9yXPT3}U$
zMCUDZ1%HcsK~HS4DhibV?1B>W+xPua{F_b*tP3fg;oMti)nDOk{2dH0jk4&WHNFC?
zfD2@@(KSZKAkMF;@?v(Y+7>K<Sxy$>ql>1*{9+|^Rp#aM-S41?ESHTx<E)DL9p0^e
zA0>j{ELY5KcuBAX7uv7KCzp+`nlcBF9@<A=xJ6~T?C3L_hq&c!Vt#q960|hF5*5c^
z(6+|cuq5166o<drZ49pI@98V=C4)HiZr=BSNz89eY;k-o`Shzc@80#^GYG(<zwG!6
zS+g6$;IDxmSb7z_=VE%J$IV$tu9YZpL<y&VA+n5G(tc0=f?fnlHu<wDe?cNPVnYb#
jUyn2Yef}^0TYv!o&@lr@43xUm00000NkvXXu0mjf7i!XN

literal 0
HcmV?d00001

diff --git a/install/images/info.png b/install/images/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..50bad107a79d11c76db9cccb29b583b6e1ba05d9
GIT binary patch
literal 4599
zcmV<T5eV*yP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O$
zeEU(8000U_X+uL$Nkc;*P;zf(X>4Tx0C=38Q)g6D=@vcr-t<CCh=7z!Z&DQqAW}k$
zfK+Ls5|RL+gcuS)?1-qqh@v8b6&Vz9z|j$qu_B6vL9zD%c?c-u;3zg!-VfdyeY57h
zH*fZ@z4ke0o$s7|J^)5wutb`LssUt574nDxA3QcL9w&DL3RED01Asu7EenbCj{*ST
z`|<GXhyWk>0tDdAZ9o73ZrB8d;W+$%P#4PN3IHSw0H%w?*+KxM5CAfA6*2_?G713f
zq;#1A03`qbTOJ!14}fX`06S%pPXhpU(j@l+0JbPoDgr>G06-?n6o~-P4ggq}qZEq(
zuwVcv%8`h30kE3@V3MKClmKAw0Dzq-7Gwhu7yw|R5DQZQ2=)NLkVi%E00=VyD2$Y^
zc+yu~A<k0(0PwP8i{+A(R0VD!w8R};UAcImI5$JAP}qbCgy{mg2<K&G$^_EI0FyHV
z0DwkzM1T*@_v1M`xH>!AINCaVwW$9Z{ELW<i~pBDufhQV0EE-^Mf<b7tQr9B7y!2M
zi<Yz<pk)n!*8MM<$sPdJLV)J0U(Lhe`|<Epg+k_LXP29sYby~8ZH1{{_4%I(e*s_h
zv*r8o@ZZ;i`-+nV$_xb_5#WOhvof-jay(lm5Q=e|KOXVlF8uR%Op6dFi{)aeP>e@Q
z#JLh_3eL-tiX;k2mK2vr|C5P-v+NI;ylVhp)qV!{LR(O~$_DJ0E+DYzfF<k#0OWVy
zf~nCE1^_VzgOhg;05JKR{~c%<0HE2D6dVA67ZHUEmGYd)7y$r)2sBUyHfV!B7=s1a
zfFrnoJ9vQ~%!W{if;d<JLP&*7kV7skg;h`lC9n~;LKW<WTBwIcI07wj0?xt(xB}PU
z7CeAn7=Y(63U6Q>K@c*+L|BM6Vt|+;)`%m*MP?y>NH7wC#36}D3L-_6$WmlAQi7Bt
zRmfhX9{C<Qj+{j<Aw9@Fqz@TJenUQ>7|KA|s2*yD+M!(38x2CE(D`Tzx(Llj3(*Z|
zC0c_XLYvXE=oR!9+KWC%$1uR?7zZ=NY%ngy!$PrmEE$ty%dujt0;|Cqu{Nv|yMgs$
zBiMTaiNGS@1RH`oA&@YaAS5gzEGLu_st5-N&4doZ4MHDbl<=9zB<d2aiEczbF_xG@
z%q12PD~NT(W5n~sTf_n48xo1cA(@k0NP(m{QW|Lqsg$&n)I>T%>LK-$#>ix{Hrbl&
zK@KGg$O>{1c{}+K`84@Dd4T+mLZ=u|94Y>kc#4!#K&hY{q@1E$rwmfYscKYHsv9+w
zDxxl?mQib|ZPcsO0qQtSon}t+pheNrXsc+Iv_{%_+C$naI-PDrccq8ZCG?f_O8Q~?
zMS36oJwt<G#o#d#7)r(l#(u^b#y!R>CX;E#^kT*{70eCHdgeLiW9B;*mWr(kUqz&{
zLZw=zS>?LQ3stJBsj9c?0@Zxg3e}^kS5-&UsA^_vJT-yZa<yu;<7#)*#?)Er4(g%m
znd+tL2h}gB4{4A!%ryKoL>h$}`!vpJ^s_LQF^k6%vR1QdS?5^;Y!cg?&1a{vOW5DB
zyV;|f8k#dSqc!t1t2Iw*_Hr<e8Hdlw;FNKWaBg!xOwpU-Jw-fa{glQj*QdPInyTfc
zCDtm|YSOx;^+6lg_R~(+-lW~4{YZzPW2F<WldH2!=e*9yRQ6Q&slutnQ;$r&uZ!wh
z=|<=-(cP!pr8}mluNR;v)7!3hPH#k?qwl4kroTo1l>V>*%V3s)#9)iTX@h6DChm=A
z;FWj>K5D3I7-*<8+-ulvIBsNaG}oxWsLAM&G0m83oNT<sxZQZv#K0uPWT{Dm$$e9*
zDc3aBben0X>02{%vlz3rW-Vqz=33@_^L+CL^M@8p3r~wh7Bv<(ElHMK%XG_~me;IM
zD<`W|t7@yO)~L0!wZwX-b<Z^7G}md;X*JXC*f4CoZE|cHZ2D|Dw!yXqwk@_V>`d(9
z?KatU+I_Znvd^%uwSVBC;V|2wz@g3IH%BW+p<}h<&FReP{?k`XZ=L>fhV=~bj9oMC
zI<cHWoYp$EJAHC?ah5wbIuE;;xFovlaJj=}bHli$+>5S6S0C3Et|wgIyE(fl+>W^Y
z>Tctn?tajHXr}p0@yyzp{T@ah0*}2Oy|eIHiL>_1>h(1A6nNHnKJha45_#2m4SHL8
zr+FXpe&J*9BlkJx^OonvTgE%%i}?ol7W;PlY52|ctMYs7Z{(li-{3zQ;1sYV;7lMf
zFeq?S;2pjmU&ycLkIr_Py=-<z5F;ous4D15uvM@;xGe+?nH{n@<l!9CInp^Tp%BUs
z-5mNT%sgyS*pK0)@UZae@TU<D5lbUFBUzCPBM(NtiSmgmi+V8EVy<#-d$ekFLUeuf
z+Zf-N@|fOOyVzy1SK@TyByp|r<oM|Ly7;kqe)G1@8%S_UC`!0J-+X@F{7VaT7Gx|q
zxlnbXVByh3Vq#3<!NiY(P(h7gEQz1ABWYB~6K)ee7kP=ch=#=;;&Sm|vPW`x@=%IL
z%I1{eRL|6k)Da0!QYCqr7MQj>?QME!`u_BZjF^n3OiE^A=5eWpG+o+}rJt3T)g!Z(
z70G%Rxh>kdXjC2~uggZV=V!Mn*b14VOKG88qwLF>l~bMbE;l;&Xr6kWG_Py1)#CMw
z2lM^&zg<FDB3#nG)NtvlrG3l1m+f7SEKgeAzQTA#;fjHk0V@xzqOD3_^;3a;L3zRJ
z)iJBv3iS$C7WS_RSkq9XQY0_Bv(|m>?sbH9l6Bqdr?20>{&TUY_;QJTNkz%WQeo-k
zZydg<{AOZ9@`mm*=dxWJNgJgbZ*TJ4bf8?lJiokubI9iAE%=t=Ew8sO+<K{EM#b)J
zv~9|5y_Lb0t=mnuZ`}T|Dz)lXwNG`^4&5E=cf8#x+IfAK*RIChdb>+@f7m10b9ZmR
z-sT#!nu>j-eL4G{)<)NMe#`x~zD}pEr0&yx>HgjW5eGWzUFz!(>K-g>KpT_|!-o<M
zUHi`WyVgdV#=T9Prjo;OSb6x__le)%J`!}K{V4Zn;}51k>^R0cR@{s<FK!-fNp0zE
zjce^WKKpokn|s@_A8mi!f5PxY^-0Z>Wv6JT3QtX(&ObeNMs{Z8Y|7dG_J!>a&c&X)
z*%98+eLm>?#S8uy&UJcsp1$aD@x&#!OUEyBFSlHAzS7*~)OGA9r=N~>J9jr<b-CJl
z&GlMa&&-}v*FCSFz2SS~!cG3oE4Sv{>bX7l_T4)PcY5!N?hf6{xcBmY&i(NRD<2Xc
z7C%yZRPk8%am~+`KR5L{_nz$Y?dy6H`Q$;ru>bi#vj6dMpzta4X~m$yVEvHe(1~IH
z;cL(4JsWr~dp<r=^o#m0J6>44_~BQtU%N(QM+aWYUrzj1`bzuN{?{{Jw~vL5J${q<
zX8djOJMDJ|-gDn~eu()nIG+2F{IT+r<)^mKL7yK^WKK-{69bs@`~aU|`v3p{AY({U
zO#lFTB>(_=B>(^b0001bB>(^b0001bB>(^b0001bC2}$zU;qFB32;bRa{vGf6951U
z69E94oEQKA2OLR6K~z|U#g|)bRmT;EznQ)FxgY!Z3Wi`4t^uS17OlBNh0s7r)T&5r
zQdLPS(W0nQRHYG(`ckP<rK*jTKJ=j#AxbMAct}#IYO1y&f&zi0jR;9i;u63y7#m`2
zAKT}?Z!^<};|sPicJk7Z&dZ)z>;Ko9f2}n~@OjpzQyJ1~3AT&_V1$CoFsC2A37F5~
zN-X%~u2aiNiboT*kw-Fddu=LiH8<DV3CEIVtQ@LrA<PykVgG1BouyEDof8kg4Pst0
z^Ap&0YO&qqJhQqbesI&OhQ{_4Nfy=GBqLy3)g#70C4gK-)79s3{>rfKx=}h_81;U|
z-*%n-`~<#n_Q3ruv0psgzWBbK>yo77FjiEI6hm_5kU&)fltPe-Nir#$hLnwMNiOyU
zy#BA7s`Fa;XfW*ml+zClFPy+*#<Ds0n{DeFp84LcMKq)YJ-1zYhdfHIMrku;C<ICy
zLS?XIl}J;q!`dY=qK?JMt_rW5>FXT5<$Z?}J1@<IvhId&ZP<Hw|F)%1AK2AE(G56%
zwM1Xm!w*4-YQ$pvr;TAz#$jVy0x1RAVo1KM=*tEurRi9eU}<xD@uk7izH;V?H@SXv
z_}&EepZ(dMEsLJ}?t>Yw+^X>5jWT{{u!KO&$d}S^UqghSe0>RDUSGr3H7WXreQu8h
zARt=^`E=B$y)8y-OHKVpgT?J`-IK3!{ir+PLr(Mf$eG>kt5ZLJVn-bpdrNc=xL86U
z=TJ(hG+S4vXh_=tBqEaSYf{zh0G1RKDw=bb3#?mg@vR4!wOftOukZ9RMPT_KV-3yG
zUw(7PQu}7sqd)6o&4oN+ECqx4aN4)Qe26jTjx$j44DVhk(y=m1`-;>-_Pn)oHh~Q*
z_jjzV-&zyZT>aFY7aYL01pmHV<gXV-=^get-IeF$hdJa7TPdO7DtZSi?E7Mim29#P
zP3%pctbOvG<InD2xp%ZsAy-y&rhVoz29!3$A`&mqh<jX_0M@rAId*2id;f!>ZJgNi
zK{W#p{c~+=bF9M>YQf-28v<qU!)m$%WpJ$7-~uMan|BpmeI=Ue(oy1(y#V9t5u2Aa
z*VN`p!Tb>e5lgVFAwq4^rYUXHQWv4MF~a%oBF8)P*w#3x0bdzPo}%b#TwgPs4`|9H
z5D{y)f#<6PqShDEahsy6=Z#)zXk8Rx-=+*3mnWua<;~6<2!k<#qNk{Mnxd-+^;9Ob
z0XI-&l1|&`{y%3VKwZjNmW)aQrRU9nEunkB<E4{>4CSUOV63F*>Mv7tHT@$#1ET@C
zvO*h>f@wXZ;wj=WQHRx7Zv#YZnF_VRS*Y-Um?KHXri$o7Pl>Mn%H%Mf*|etF8-p-J
zBeort08vMVerOgnn}vW-8CJK%NXMrd={r~Q<5h5PaHtA4R3>bWi%<fnP-lx3HK*mo
z{TTyAS2LIoXl;s2?iXA|=k+oXOWxIfRsb5L5amQHR<;4OFdw^tVdikWQ^`elT*-l^
zCNAk%m6|+v@p^@!e2APM9|3p)7{S2C?3Do<z>)TQqxmAO^)-`8P`WCXLPb;d6<SxV
z1Ety6mZqu3nRI&olLB6-i8=E#Fn}8v94X#^?X}014RE6rUd*JdOTLopgbB%46eUmL
zD+7jU_bP>8+nTB9-N106r-UU1vvW9mX#+tJ5Ec9bCT790t@%)yzw`|I^o@9omO^}G
zrggCi<NB0M$Lc8p-2*OtS)WwYB5L0oUI_4&M2Ep;ZN%v*0zkg#zC1Ek95Kjh#CLHJ
zD#QAv@oDKldnu37@a-M-B%>C3o@b~VfYItm&yg*;X$1OT-rnu|`nM%tU|VxkgMiH|
zlGDBwUB$uOO>_@<4CaHm2ay0R9LnWN=a^Uf(!}>^s&N%B<O{`f3Wta-W<Br)%u4gq
zUtP>-S@G6?^Eh`QZm4#`sADsdEBT?%q2WI~P?*@C_9QD@I1<!u{{FeL7kn+9O4h|}
zGx_ozuSoi{0V@|raV*Ivw_Ses#sF{pXAH{{v#!k;aBM*$>Tr9^Ctvn|eC_a-S7rt^
zYqkCG{N|`F|J2%&S&?+YYDEMFA*y58u>|S3MZT=?LxVFTE5=kGA*q;!kQRM|C35BP
zxof}Q^1@84Ic2--skc|goXCp}b?L7(*H{P?6<-sChEP}gxfHV-mu(5+j>NGgc~5d{
zC_hy8!e@IAf9crWaPD0<Kl*#LO*Q@?X3IlObu}v*(iV=?7*o9(JuZ16z>xw=3N(_u
zD;UV;+)_myL#yX|Ufg<hE{Fxqza>w-*BG_L0mtI;WK3>IBogshL}HIi-WY=y8cJoC
zvKRKczB#Ew|H$<t+uohe_rm|20zCF=<o^1$bs^#b+mag)rXFL2L3mP`?f^dWMey<M
h!#f5)li&a6`X9S6JUy%Z53v9M002ovPDHLkV1nkG*U|t0

literal 0
HcmV?d00001

diff --git a/install/images/logo.png b/install/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d69a4aca957307a7160becf9d0d6b562befc646f
GIT binary patch
literal 10763
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
JPDHLkV1mxGIKlt`

literal 0
HcmV?d00001

diff --git a/install/include/sanity.php b/install/include/sanity.php
index 49dc71280e..b60b26ab19 100644
--- a/install/include/sanity.php
+++ b/install/include/sanity.php
@@ -109,14 +109,22 @@ function sanity_checkDirectory($dir,$flag) {
 function sanity_checkFiles() {
 	$status = array(
 		'conf/config.php'=>sanity_checkFile(BASE.'conf/config.php',1,SANITY_CREATEFILE),
-		'conf/profiles/'=>sanity_checkFile(BASE.'conf/profiles',0,SANITY_READWRITE),
-		'overrides.php'=>sanity_checkFile(BASE.'overrides.php',1,SANITY_READWRITE),
-		'install/'=>sanity_checkFile(BASE.'install',0,SANITY_READWRITE),
-		'modules/'=>sanity_checkFile(BASE.'modules',0,SANITY_READONLY),		
 		'extensionuploads/'=>sanity_checkFile(BASE.'extensionuploads',0,SANITY_READWRITE),
 		'files/'=>sanity_checkDirectory('files',SANITY_READWRITE),
+		'framework/modules/'=>sanity_checkDirectory('framework/modules',SANITY_READWRITE),
+		//'framework/datatypes/'=>sanity_checkDirectory('framework/datatypes',SANITY_READWRITE),
+		//'conf/profiles/'=>sanity_checkFile(BASE.'conf/profiles',0,SANITY_READWRITE),
+		//'overrides.php'=>sanity_checkFile(BASE.'overrides.php',1,SANITY_READWRITE),
+		'install/'=>sanity_checkFile(BASE.'install',0,SANITY_READWRITE),
+		'modules/'=>sanity_checkFile(BASE.'modules',0,SANITY_READONLY),		
 		'tmp/'=>sanity_checkDirectory('tmp',SANITY_READWRITE),
-		'tmp/views_c'=>sanity_checkDirectory('tmp/views_c',SANITY_READWRITE)
+		'tmp/views_c'=>sanity_checkDirectory('tmp/views_c',SANITY_READWRITE),
+		'tmp/cache'=>sanity_checkDirectory('tmp/cache',SANITY_READWRITE),
+		'tmp/minify'=>sanity_checkDirectory('tmp/minify',SANITY_READWRITE),
+		'tmp/pods'=>sanity_checkDirectory('tmp/pods',SANITY_READWRITE),
+		'tmp/rsscache'=>sanity_checkDirectory('tmp/rsscache',SANITY_READWRITE),
+		'tmp/mail'=>sanity_checkDirectory('tmp/mail',SANITY_READWRITE),
+		'tmp/img_cache'=>sanity_checkDirectory('tmp/img_cache',SANITY_READWRITE)
 	);
 	
 	return $status;
diff --git a/install/index.php b/install/index.php
index df6b712084..730e9a212e 100644
--- a/install/index.php
+++ b/install/index.php
@@ -88,9 +88,13 @@
 	case 'upgrade':
 		$page_image = 'system';
 		$page_text = $i18n['upgrade'];
+		break;
+	case 'final':
+
 		break;
 	default:
-		$page_image = '';
+		$page_image = 'welcome';
+		$page_text = $i18n['guide'];
 		break;
 }
 
@@ -101,62 +105,50 @@
 <head>
 	<title><?php echo $i18n['page_title']; ?></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
+	<link rel="stylesheet" href="<?php echo YUI3_PATH; ?>cssreset/reset.css" />
+	<link rel="stylesheet" href="<?php echo YUI3_PATH; ?>cssbase/base.css" />
+	<link rel="stylesheet" href="<?php echo YUI3_PATH; ?>cssfonts/fonts.css" />
+	<link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/forms.css" />
+	<link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/button.css" />
+	<link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/tables.css" />
 	<link rel="stylesheet" href="style.css" />
-	<script type="text/javascript">
-	
+
+	<script type="text/javascript" src="<?php echo YUI3_PATH; ?>/yui/yui-min.js"></script>
+    
+	<script type="text/javascript">	
 	function pop(page) {
-		url = "popup.php?page="+page;
-		window.open(url,"pop","height=400,width=600,title=no,titlebar=no,scrollbars=yes");
-		return false;
+    		var url = "popup.php?page="+page;
+    		window.open(url,"pop","height=400,width=600,title=no,titlebar=no,scrollbars=yes");
 	}
 	
 	</script>
-	<style type="text/css">
-		div#main2 {
-			background-image: url(images/mainbar_03.png);
-			background-repeat: repeat-y;
-			<?php if ($page_image != '') { ?>
-			padding-left: 95px;
-			<?php } else { ?>
-			padding-left: 15px;
-			<?php } ?>
-			padding-right: 15px;
-		}
-		
-		div#sidebar {
-			padding-top: 70px;
-			background-image: url(images/<?php echo $page_image; ?>.png);
-			background-repeat: no-repeat;
-		}
-	</style>
 </head>
 <body>
 	<div id="installer">
-		<?php if ($page_image != '') { ?>
-		<div id="side">
-			<div id="side1"><!-- Empty div for background-images on CSS-capable browsers --></div>
-			<div id="side2">
-				<div id="sidebar" class="bodytext">
-					<?php echo $page_text; ?>
-				</div>
-			</div>
-			<div id="side3"><!-- Empty div for background-images on CSS-capable browsers --></div>
-		</div>
-		<?php } ?>
-		<div id="main">
-			<div id="main1"><!-- Empty div for background-images on CSS-capable browsers --></div>
-			<div id="main2" class="bodytext">
-				<h1 id="maintitle"><span class="noncss"><?php echo $i18n['installer_title']; ?></span></h1>
-				<?php
-				if (file_exists('pages/'.$page.'.php')) {
-					include('pages/'.$page.'.php');
-				} else {
-					echo sprintf($i18n['unknown_page'],strip_tags($page));
-				}
-				?>
-				<br />
-			</div>
-			<div id="main3"><!-- Empty div for background-images on CSS-capable browsers --></div>
+	    <div id="hd">
+	       <h1 id="logo">
+	           <a href="http://www.exponentcms.org/" target="_blank">
+                   Exponent CMS
+               </a>
+	       </h1>
+	    </div>
+		<div id="bd">
+		    <div id="leftcol">
+    		<?php
+    		if (file_exists('pages/'.$page.'.php')) {
+    			include('pages/'.$page.'.php');
+    		} else {
+    			echo sprintf($i18n['unknown_page'],strip_tags($page));
+    		}
+    		?>
+    		</div>
+    		<?php if ($page_image != '') { ?>
+            <div id="rightcol">
+                <p>
+        		<?php echo $page_text; ?>
+        		</p>
+            </div>
+    		<?php } ?>
 		</div>
 	</div>
 </body>
diff --git a/install/pages/admin_user.php b/install/pages/admin_user.php
index 96673dfcdc..6ef45e46d4 100644
--- a/install/pages/admin_user.php
+++ b/install/pages/admin_user.php
@@ -42,14 +42,14 @@ function checkPassword(f){
 <input type="hidden" name="page" value="save_admin" />
 <div class="form_section">
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['username']; ?>: </span>
+		<span class="label"><?php echo $i18n['username']; ?>: </span>
 		<input class="text" type="text" name="username" value="<?php echo $i18n['username_default']; ?>" />
 		<div class="control_help">
 			<?php echo $i18n['username_desc']; ?>
 		</div>
 	</div>
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['password']; ?>: </span>
+		<span class="label"><?php echo $i18n['password']; ?>: </span>
 		<input class="text" type="password" name="password" value="" />
 <?php
 //FJD - this isn't working well and it's unnecessary
@@ -108,22 +108,22 @@ function checkPassword(f){
 		</div>
 	</div>
 		<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['password2']; ?>: </span>
+		<span class="label"><?php echo $i18n['password2']; ?>: </span>
 		<input class="text" type="password" name="password2" value="" />
 		<div class="control_help">
 			<?php echo $i18n['password_desc2']; ?>
 		</div>
 	</div>
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['firstname']; ?>: </span>
+		<span class="label"><?php echo $i18n['firstname']; ?>: </span>
 		<input class="text" type="text" name="firstname" value="<?php echo $i18n['firstname_default']; ?>" />
 	</div>
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['lastname']; ?>: </span>
+		<span class="label"><?php echo $i18n['lastname']; ?>: </span>
 		<input class="text" type="text" name="lastname" value="<?php echo $i18n['lastname_default']; ?>" />
 	</div>
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['email']; ?>: </span>
+		<span class="label"><?php echo $i18n['email']; ?>: </span>
 		<input class="text" type="text" name="email" value="" />
 	</div>
 </div>
diff --git a/install/pages/dbcheck.php b/install/pages/dbcheck.php
index 8f04e622cc..beb1f43941 100644
--- a/install/pages/dbcheck.php
+++ b/install/pages/dbcheck.php
@@ -23,8 +23,14 @@
 $i18n = exponent_lang_loadFile('install/pages/dbcheck.php');
 
 ?>
-<h2 id="subtitle"><?php echo $i18n['subtitle']; ?></h2>
-<table>
+<h1><?php echo $i18n['subtitle']; ?></h1>
+<table class="exp-skin-table">
+    <thead>
+        <tr>
+            <th colspan=2><?php echo expLang::gettext('Results'); ?></th>
+        <tr>
+    <thead>
+    <tbody>
 <?php
 
 function echoStart($msg) {
@@ -273,6 +279,7 @@ function isAllGood($str) {
 }
 
 ?>
+</tbody>
 </table>
 <?php
 
@@ -284,9 +291,9 @@ function isAllGood($str) {
 			$db->dropTable(str_replace($db->prefix,'',$t));
 		}
 	}
-	echo '<br /><br />';
+	echo '<p>';
 	echo $i18n['passed'];
-	echo '<br /><br />';
+	echo '</p>';
 
 	if (isset($_POST['install_default'])) {
 		if (!defined('SYS_BACKUP')) include_once(BASE.'subsystems/backup.php');
@@ -302,11 +309,11 @@ function isAllGood($str) {
 		}
 	}
 	?>
-	<br /><br /><a href='?page=admin_user'><?php echo $i18n['continue']; ?></a>.
+	<a class="awesome green large" href='?page=admin_user'><?php echo $i18n['continue']; ?></a>.
 	<?php
 } else {
 	?>
-	<br /><br /><a href="?page=dbconfig" onclick="history.go(-1); return false;"><?php echo $i18n['back']; ?></a>
+	<a class="awesome red large" href="?page=dbconfig" onclick="history.go(-1); return false;"><?php echo $i18n['back']; ?></a>
 	<?php
 }
 ?>
diff --git a/install/pages/dbconfig.php b/install/pages/dbconfig.php
index c4bd3477ed..f254fb40d8 100644
--- a/install/pages/dbconfig.php
+++ b/install/pages/dbconfig.php
@@ -55,15 +55,15 @@ function showOptions(engine) {
 		}
 	}
 </script>
-<h2 id="subtitle"><?php echo $i18n['subtitle']; ?></h2>
+<h2><?php echo $i18n['subtitle']; ?></h2>
 
 <form method="post" action="index.php">
 <input type="hidden" name="page" value="dbcheck" />
 
-<div class="form_section_header"><?php echo $i18n['server_info']; ?></div>
+<h2><?php echo $i18n['server_info']; ?></h2>
 <div class="form_section">
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['backend']; ?>: </span>
+		 <span class="label"><?php echo $i18n['backend']; ?>: </span>
 		<select name="c[db_engine]" onchange="showOptions(this.value);">
 		<?php
 		require_once(BASE.'subsystems/database.php');
@@ -85,7 +85,7 @@ function showOptions(engine) {
 
 
 	<div class="control" id="mysql_options">
-		&#0149; <span class="control_caption"><?php echo $i18n['DB_ENCODING']; ?>: </span>
+		 <span class="label"><?php echo $i18n['DB_ENCODING']; ?>: </span>
 		<select name="c[DB_ENCODING]" value="<?php echo $config['DB_ENCODING']; ?>" >
 <?PHP
 	if (!defined('SYS_CONFIG')) {
@@ -105,7 +105,7 @@ function showOptions(engine) {
 	</div>
 
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['address']; ?>: </span>
+		 <span class="label"><?php echo $i18n['address']; ?>: </span>
 		<input class="text" type="text" name="c[db_host]" value="<?php echo $config['db_host']; ?>" />
 		<div class="control_help">
 			<?php echo $i18n['address_desc']; ?>
@@ -115,7 +115,7 @@ function showOptions(engine) {
 	</div>
 
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['port'];?>: </span>
+		 <span class="label"><?php echo $i18n['port'];?>: </span>
 		<input class="text" type="text" name="c[db_port]" value="<?php echo $config['db_port']; ?>" size="5" />
 		<div class="control_help">
 			<?php echo $i18n['port_desc']; ?>
@@ -125,18 +125,16 @@ function showOptions(engine) {
 	</div>
 </div>
 
-<div class="form_section_header"><?php echo $i18n['database_info']; ?></div>
+<h2><?php echo $i18n['database_info']; ?></h2>
 <div class="form_section">
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['dbname']; ?>: </span>
+		 <span class="label"><?php echo $i18n['dbname']; ?>: </span>
 		<input class="text" type="text" name="c[db_name]" value="<?php echo $config['db_name']; ?>" />
-		<div class="control_help">
-			<?php echo $i18n['dbname']; ?>
-		</div>
+
 	</div>
 
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['username']; ?>: </span>
+		 <span class="label"><?php echo $i18n['username']; ?>: </span>
 		<input class="text" type="text" name="c[db_user]" value="<?php echo $config['db_user']; ?>" />
 		<div class="control_help">
 			<?php echo $i18n['username_desc']; ?>
@@ -145,7 +143,7 @@ function showOptions(engine) {
 		</div>
 	</div>
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['password']; ?>: </span>
+		 <span class="label"><?php echo $i18n['password']; ?>: </span>
 		<input class="text" type="password" name="c[db_pass]" value="<?php echo $config['db_pass']; ?>" />
 		<div class="control_help">
 			<?php echo $i18n['password_desc']; ?>
@@ -153,7 +151,7 @@ function showOptions(engine) {
 	</div>
 
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['prefix']; ?>: </span>
+		 <span class="label"><?php echo $i18n['prefix']; ?>: </span>
 		<input class="text" type="text" name="c[db_table_prefix]" value="<?php echo $config['db_table_prefix']; ?>" />
 		<div class="control_help">
 			<?php echo $i18n['prefix_desc']; ?>
@@ -163,10 +161,10 @@ function showOptions(engine) {
 	</div>
 </div>
 
-<!--div class="form_section_header"><?php echo $i18n['default_content']; ?></div>
+<!--h2><?php echo $i18n['default_content']; ?></h2>
 <div class="form_section">
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['install']; ?></span>
+		 <span class="label"><?php echo $i18n['install']; ?></span>
 		<input type="checkbox" name="install_default" checked="checked" />
 		<div class="control_help">
 		<?php echo $i18n['install_desc']; ?>
@@ -175,10 +173,10 @@ function showOptions(engine) {
 	</div>
 </div-->
 
-<div class="form_section_header"><?php echo $i18n['sef']; ?></div>
+<h2><?php echo $i18n['sef']; ?></h2>
 <div class="form_section">
 	<div class="control">
-		&#0149; <span class="control_caption"><?php echo $i18n['enable_sef']; ?></span>
+		 <span class="label"><?php echo $i18n['enable_sef']; ?></span>
 		<input type="checkbox" name="c[sef_urls]" checked="checked" />
 		<div class="control_help">
                 <?php echo $i18n['sef_desc']; ?>
@@ -187,14 +185,14 @@ function showOptions(engine) {
 	</div>
 </div>
 
-<div class="form_section_header"><?php echo $i18n['verify']; ?></div>
+<h2><?php echo $i18n['verify']; ?></h2>
 <div class="form_section">
 	<div class="control">
 		<div class="control_help">
 		<?php echo $i18n['verify_desc']; ?>
 		<br /><br />
 		</div>
-		<input type="submit" value="<?php echo $i18n['test_settings']; ?>" class="text" />
+		<button class="awesome large green"><?php echo $i18n['test_settings']; ?></button>
 	</div>
 </div>
 </form>
diff --git a/install/pages/final.php b/install/pages/final.php
index c832bd8051..42b59ff48a 100644
--- a/install/pages/final.php
+++ b/install/pages/final.php
@@ -52,5 +52,5 @@
 
 ?>
 <br /><br />
-<a href="<?php echo URL_FULL; ?>login.php">Now go log in and add some content!</a>
+<a class="awesome large green" href="<?php echo URL_FULL; ?>login.php">Now go log in and add some content!</a>
 <?php exponent_sessions_clearAllSessionData();?>
diff --git a/install/pages/sanity.php b/install/pages/sanity.php
index 89f0d515e9..69f1bd93ea 100644
--- a/install/pages/sanity.php
+++ b/install/pages/sanity.php
@@ -28,13 +28,20 @@
 $errcount = count($status);
 $warncount = 0; // No warnings with permissions
 ?>
-<h2 id="subtitle"><?php echo $i18n['subtitle']; ?></h2>
-<table cellspacing="0" cellpadding="3" rules="all" border="0" style="border:1px solid grey;" width="425">
-<tr><td colspan="2" style="background-color: lightgrey;"><b><?php echo $i18n['filedir_tests']; ?></b></td></tr>
+<h1><?php echo $i18n['subtitle']; ?></h1>
+<table cellspacing="0" cellpadding="0" rules="all" border="0" width="100%" class="exp-skin-table">
+    <thead>
+        <tr>
+            <th colspan="2">
+                <?php echo $i18n['filedir_tests']; ?>
+            </th>
+        </tr>
+    </thead>
+    <tbody>
 <?php
-
+$row = "even";
 foreach ($status as $file=>$stat) {
-	echo '<tr><td width="55%" class="bodytext">'.$file.'</td><td align="center" width="45%"';
+	echo '<tr class="'.$row.'"><td>'.$file.'</td><td';
 	if ($stat != SANITY_FINE) echo ' class="bodytext error">';
 	else echo ' class="bodytext success">';
 	switch ($stat) {
@@ -56,16 +63,27 @@
 			break;
 	}
 	echo '</td></tr>';
+	$row = ($row=="even") ? "odd" : "even";
 }
 ?>
-<tr><td colspan="2" style="background-color: lightgrey;"><b><?php echo $i18n['other_tests']; ?></b></td></tr>
+</tbody>
+<table cellspacing="0" cellpadding="0" rules="all" border="0" width="100%" class="exp-skin-table">
+    <thead>
+        <tr>
+            <th colspan="2">
+                <?php echo $i18n['other_tests']; ?>
+            </th>
+        </tr>
+    </thead>
+    <tbody>
 <?php
 
 $status = sanity_checkServer();
 $errcount += count($status);
 $warncount += count($status);
+$row = "even";
 foreach ($status as $test=>$stat) {
-	echo '<tr><td width="55%" class="bodytext">'.$test.'</td>';
+	echo '<tr class="'.$row.'"><td>'.$test.'</td>';
 	echo '<td align="center" width="45%" ';
 	if ($stat[0] == SANITY_FINE) {
 		$warncount--;
@@ -79,11 +97,13 @@
 		echo 'class="bodytext warning">';
 	}
 	echo $stat[1].'</td></tr>';
+	$row = ($row=="even") ? "odd" : "even";
 }
 
 ?>
+</tbody>
 </table>
-<br />
+
 <?php
 
 $write_file = 0;
@@ -127,11 +147,15 @@
 if ($errcount == 0) {
 	if (isset($_REQUEST['type']) && $_REQUEST['type'] == 'new'){
 		?>
-		<br /><a href="index.php?page=dbconfig"><?php echo $i18n['continue_new']; ?></a>.
+		<br />
+		<br />
+		<a class="awesome large green" href="index.php?page=dbconfig"><?php echo $i18n['continue_new']; ?></a>
 		<?php
 	} else {
 		?>
-		<br /><a href="index.php?page=upgrade_version"><?php echo $i18n['continue_upgrade']; ?></a>.
+		<br />
+		<br />
+		<a class="awesome large green" href="index.php?page=upgrade_version"><?php echo $i18n['continue_upgrade']; ?></a>
 		<?php
 	}
 }
diff --git a/install/pages/setlang.php b/install/pages/setlang.php
index 280a7202b6..23aad153c0 100644
--- a/install/pages/setlang.php
+++ b/install/pages/setlang.php
@@ -22,13 +22,15 @@
 $i18n = exponent_lang_loadFile('install/pages/setlang.php');
 
 ?>
-<h2 id="subtitle"><?php echo $i18n['title']; ?></h2>
+<h1 id="subtitle"><?php echo $i18n['title']; ?></h1>
+<p>
 <?php echo $i18n['guide']; ?>
-<br /><br />
+</p>
 
 <form method="post" action="index.php">
 	<!-- send us to the next page -->
 	<input type="hidden" name="page" value="welcome" />
+	<div class="control">
 	<select name="lang">
 		<?PHP foreach(exponent_lang_list() as $currid=>$currlang) {?>
 			<?php if ($currid == "eng_US") { ?>
@@ -37,6 +39,7 @@
 			<option value="<?PHP echo $currid?>"><?PHP echo $currlang?></option>
 			<?php } ?>
 		<?PHP }?>
-	</select>
-	<input type="submit" value="<?php echo $i18n['setlang']; ?>" class="text" />
+	</select> 
+	</div>
+	<button class="awesome large green" /><?php echo $i18n['setlang']; ?></button>
 </form>
\ No newline at end of file
diff --git a/install/pages/upgrade.php b/install/pages/upgrade.php
index 44554c19f3..84ec9b9f61 100644
--- a/install/pages/upgrade.php
+++ b/install/pages/upgrade.php
@@ -57,7 +57,7 @@
 	foreach ($errors as $e) echo $e . '<br />';
 } else {
 	echo $i18n['success'];;
-	echo '<br /><br /><a href="?page=final">'.$i18n['complete'].'</a>.';
+	echo '<br /><br /><a class="awesome large green" href="?page=final">'.$i18n['complete'].'</a>';
 }
 
 ?>
diff --git a/install/pages/upgrade_version.php b/install/pages/upgrade_version.php
index 9672ee7324..bbcb3621f9 100644
--- a/install/pages/upgrade_version.php
+++ b/install/pages/upgrade_version.php
@@ -20,20 +20,19 @@
 if (!defined('EXPONENT')) exit('');
 
 $versions = array(	
-	'1.99.0'=>'Origin',
-	'1.99.1'=>'Secondsies',
-	'1.99.2'=>'Hopscotch',
+	'2.0.0 Preview Release 2'=>'Gnarly Nebula',
+	'2.0.0 Beta 1'=>'Efficient Entropy',
+	'2.0.0 Beta 1.1'=>'Extremely Efficient Entropy',
 );
 
 $i18n = exponent_lang_loadFile('install/pages/upgrade_version.php');
 
 ?>
 
+<h1><?php echo $i18n['select_ver']; ?></h1>
+
 <form method="post" action="index.php">
 <input type="hidden" name="page" value="upgrade" />
-
-<div class="form_section_header"><?php echo $i18n['select_ver']; ?></div>
-<div class="form_section">
 	<div class="control">
 		<select name="from_version" value="<?php echo EXPONENT; ?>">
 		<?php
@@ -51,14 +50,12 @@
 			}
 		?>
 		</select>
-		<div class="control_help">
-			<?php echo $i18n['select_version']; ?>
-			<br /><br />
-			<div class="important_message">
-				<?php echo $i18n['choose_correct']; ?>
-			</div>
-		</div>
-		<input type="submit" value="<?php echo $i18n['upgrade']; ?>" class="text" />
 	</div>
-</div>
+	<p>
+		<?php echo $i18n['select_version']; ?>
+	</p>
+	<p>
+		<?php echo $i18n['choose_correct']; ?>
+	</p>
+	<button class="awesome large green"><?php echo $i18n['upgrade']; ?></button>
 </form>
diff --git a/install/pages/welcome.php b/install/pages/welcome.php
index f2b0d890e6..8e0bf90ea1 100644
--- a/install/pages/welcome.php
+++ b/install/pages/welcome.php
@@ -22,13 +22,11 @@
 $i18n = exponent_lang_loadFile('install/pages/welcome.php');
 
 ?>
-<h2 id="subtitle"><?php echo $i18n['title']; ?></h2>
-<?php echo $i18n['thanks']; ?>
-<br /><br />
-<?php echo $i18n['guide']; ?>
-<br /><br />
-
-<ul>
-	<li><a href="?page=sanity&type=new"><?php echo $i18n['new']; ?></a></li>
-	<li><a href="?page=sanity&type=upgrade"><?php echo $i18n['upgrade']; ?></a></li>
-</ul>
\ No newline at end of file
+<h1 id="subtitle"><?php echo $i18n['title']; ?></h1>
+<p>
+    <?php echo $i18n['thanks']; ?>
+</p>
+<p>
+    <a class="awesome large green" href="?page=sanity&type=new"><?php echo $i18n['new']; ?></a>
+    <a class="awesome large green" href="?page=sanity&type=upgrade"><?php echo $i18n['upgrade']; ?></a>
+</p>
\ No newline at end of file
diff --git a/install/pop.css b/install/pop.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/install/popup.php b/install/popup.php
index d3bbadfb8a..7699f5869f 100644
--- a/install/popup.php
+++ b/install/popup.php
@@ -26,10 +26,10 @@
 <html>
 <head>
 	<title><?php echo $i18n['title']; ?></title>
-	<link rel="stylesheet" title="exponent" href="style.css" />
 	<link rel="stylesheet" title="exponent" href="page.css" />
+	<link rel="stylesheet" href="<?php echo PATH_RELATIVE; ?>framework/core/assets/css/tables.css" />
 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-	<meta name="Generator" value="Exponent (formerly Exponent) Content Management System" />
+	<meta name="Generator" value="Exponent Content Management System" />
 </head>
 <body>
 	<div class="popup_content_area">
diff --git a/install/style.css b/install/style.css
index c192a4c161..2dbea17af6 100644
--- a/install/style.css
+++ b/install/style.css
@@ -1,208 +1,188 @@
-.bodytext {
-	font-size: 11pt;
-	font-family: Arial, Verdana, sans-serif;
-}
-
-.noncss {
-	display: none;
-}
-
-.warning {
-	color: yellow;
-	font-weight: bold;
-	font-size: 9pt;
-}
-
-.failed, .error {
-	color: red;
-	font-weight: bold;
-	font-size: 9pt;
-}
-
-.success {
-	color: green;
-	font-weight: bold;
-	font-size: 9pt;
-}
-
-.important_message {
-	font-weight: bold;
-	color: red;
-	font-size: 12pt;
-}
-
-td.error, td.warning {
-	background-color: #999;
-}
-
-tr.even_row {
-	background-color: #DDD;
-	font-size: 11pt;
-	font-family: Arial, Verdana, sans-serif;
-}
-
-tr.row:hover td, tr.row:hover td a {
-	background-color: #666;
-	color: #fff;
-	font-size: 11pt;
-	font-family: Arial, Verdana, sans-serif;
-}
-
-tr.odd_row {
-	font-size: 11pt;
-	font-family: Arial, Verdana, sans-serif;
-	
-}
-
-.administration_header {
-	font-size: 12pt;
-	font-family: Arial, Verdana, sans-serif;
-	font-weight: bold;
-}
-
-h1#maintitle {
-	height: 62px;
-	background-image: url(images/logo.jpg);
-	margin: 0px;
-	background-repeat: no-repeat;
-	background-position: 100% 0;
-}
-
-h2#subtitle {
-	background-image: url(images/glyph.png);
-	background-repeat: no-repeat;
-	padding-left: 50px;
-	height: 32px;
-}
-
-h2#subtitle span {
-	vertical-align: middle;
-}
-
-/* Container for entire Install Wizard */
-div#installer {
-	width: 662px;
-	margin-left: auto;
-	margin-right: auto;
-}
-
-/* Main 'window' part of installer. */
-div#main {
-	width: 562px;
-	position: absolute;
-	top: 10px;
-	margin-left: 100px;
-	z-index: 0;
-}
-
-	/* Contains top curve image */
-div#main1 {
-	height: 27px;
-	background-image: url(images/mainbar_01.png);
-	background-repeat: no-repeat;
-}
-
-
-	/* Contains bottom curve image */
-div#main3 {
-	height: 29px;
-	background-image: url(images/mainbar_05.png);
-	background-repeat: no-repeat;
-	margin-bottom: 20px;
-}
-
-/* Sidebar (for status messages, mostly) */
-div#side {
-	width: 180px;
-	position: absolute;
-	top: 50px;
-	z-index: 1;
-}
-
-	/* Contains top curve image */
-div#side1 {
-	height: 22px;
-	background-image: url(images/sidebar_01.png);
-	background-repeat: no-repeat;
-}
-
-div#side2 {
-	background-image: url(images/sidebar_03.png);
-	background-repeat: repeat-y;
-	padding-left: 15px;
-	padding-right: 15px;
-}
-
-	/* Contains bottom curve image */
-div#side3 {
-	height: 23px;
-	background-image: url(images/sidebar_05.png);
-	background-repeat: no-repeat;
+html {
+    background:url("images/hdrep.png") #0d3e5c repeat-x ;
+    text-align:left;
 }
 
 body {
-	background-color: #fff;
-	margin: 0;
-	padding: 10px;
+    font-size:15px;
+    text-align:center;
+    text-align:left;
+    font-family: "Trebuchet MS", sans-serif;
+    color:#333;
+    font-size:;
+}
+
+#installer {
+    width:900px;
+    margin:0px auto 20px auto;
+} 
+
+#hd, #bd, #ft {
+    position:relative;
+}
+
+#hd {
+    height:80px;
+    z-index:3;
+    text-indent:-999px;
+    overflow:hidden;
+} 
+
+#logo {
+    position:absolute;
+    top:10px;
+    left:0;
+    margin:0;
+    padding:0;
+}
+
+#logo a {
+    display:block;
+    width:240px;
+    height:62px;
+    background:url(images/logo.png);
+}
+
+#bd {
+    z-index:3;
+    border:3px solid #fff;
+    background:#FCFCEC;
+    padding:20px;
+       -moz-box-shadow: 0px 0px 10px #333; 
+    -webkit-box-shadow: 0px 0px 10px #333; 
+            box-shadow: 0px 0px 10px #333; 
+               -moz-border-radius: 12px; 
+            -webkit-border-radius: 12px; 
+                    border-radius: 12px; 
+}
+
+#leftcol, #rightcol {
+    display:inline-block;
+    *display:inline;
+    zoom:1;
+    vertical-align:top;
+    width:55%;
+    margin-left:20px;
+    padding-left:20px;
+    
+}
+
+#rightcol {
+    border:1px solid #2e5970;
+       -moz-box-shadow: 0px 0px 3px #000; 
+    -webkit-box-shadow: 0px 0px 3px #000; 
+            box-shadow: 0px 0px 3px #000; 
+               -moz-border-radius: 8px; 
+            -webkit-border-radius: 8px; 
+                    border-radius: 8px; 
+    width:30%;
+    position:absolute;
+    padding-left:60px;
+    background:url(images/info.png) no-repeat 13px 20px #ffffff;
+    top:30px;
+    right:-40px;
+}
+
+#ft {
+    z-index:3;
 }
 
-
 a {
-	color: #060;
-	border-bottom: 2px;
-}
-
-/** Form CSS **/
-
-div.form_section_header {
-	font-weight: bold;
-	font-size: 14px;
-	background-color: #333;
-	color: #FFF;
-	margin-bottom: 5px;
-	padding-left: 5px;
+    color:#1987C0;
+}
+
+
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.2.0
+build: 2676
+*/
+/* base.css, part of YUI's CSS Foundation */
+h1 {
+	/*18px via YUI Fonts CSS foundation*/
+	font-size:200%;  
+}
+h2 {
+	/*16px via YUI Fonts CSS foundation*/
+	font-size:170%; 
+}
+h3 {
+	/*14px via YUI Fonts CSS foundation*/
+	font-size:140%;  
+}
+h1,h2,h3 {
+	/* top & bottom margin based on font size */
+	margin:.5em 0 1em 0;
+}
+h1,h2,h3,h4,h5,h6,strong {
+	/*bringing boldness back to headers and the strong element*/
+	font-weight:bold; 
+}
+h1,h2,h3,h4,h5,h6 {
+    color:#e6975d;
+    font-weight:normal;
+	font-family: "Century Gothic", sans-serif; 
+}
+abbr,acronym {
+	/*indicating to users that more info is available */
+	border-bottom:1px dotted #000;
+	cursor:help;
+} 
+em {
+	/*bringing italics back to the em element*/
+	font-style:italic;
+}
+blockquote,ul,ol,dl {
+	/*giving blockquotes and lists room to breath*/
+	margin:1em;
+}
+ol,ul,dl {
+	/*bringing lists on to the page with breathing room */
+	margin-left:2em;
+}
+ol li {
+	/*giving OL's LIs generated numbers*/
+	list-style: decimal outside;	
+}
+ul li {
+	/*giving UL's LIs generated disc markers*/
+	list-style: disc outside;
+	font-size:120%;
+    
+}
+dl dd {
+	/*providing spacing for definition terms*/
+	margin-left:1em;
+}
+th,td {
+	/*borders and padding to make the table readable*/
+	border:1px solid #000;
+	padding:.5em;
+}
+th {
+	/*distinguishing table headers from data cells*/
+	font-weight:bold;
+	text-align:center;
+}
+caption {
+	/*coordinated margin to match cell's padding*/
+	margin-bottom:.5em;
+	/*centered so it doesn't blend in to other content*/
+	text-align:center;
+}
+p,fieldset,table,pre {
+	/*so things don't run into each other*/
+	margin-bottom:1em;
+}
+p {
+    font-size:120%;
+
+}
+#rightcol p {
+    font-size:110%;
+    font-style:italic;
+    margin:20px 0;
+    margin-right:40px;
 }
-
-div.control {
-	margin-bottom: 1em;
-	padding-left: 10px;
-}
-
-span.control_caption {
-	font-weight: bold;
-}
-
-div.control_help {
-	padding-left: 25px;
-	padding-right: 25px;
-}
-
-div.important_box {
-	border: 2px dashed #060;
-	padding: 4px;
-}
-
-  /* Controls */
-textarea, input.text {
-	border: 1px solid #060;
-	padding-left: 5px;
-}
-
-/* Sanity instructions page */
-div.sanity_req {
-	border: 2px solid black;
-	background-color: #FF6;
-	margin: 0px;
-	padding: 2px;
-}
-
-div.sanity_shell {
-	background-color: #DDD;
-	font-family: monospace;
-	padding-left: .75em;
-	font-size: smaller;
-}
-
-span.var {
-	color: #666;
-}
\ No newline at end of file