Merge branch 'master' of ssh://dump.fm/pichat/repo

29 files changed, 1168 insertions, 879 deletions

diff --git a/docs/feeds.csv b/docs/feeds.csv
index d7bd6a6..cd47256 100644
--- a/docs/feeds.csv
+++ b/docs/feeds.csv
@@ -28,7 +28,6 @@ art,,http://artinconnu.blogspot.com/feeds/posts/default,,
 art,,http://feeds2.feedburner.com/lowfi_webjam,,

 art,,http://feeds.feedburner.com/DoodlersAnonymous,,

 art,,http://youmakemesohappy.blogspot.com/feeds/posts/default,,

-art,,http://artpixie.tumblr.com/rss,,

 art,,http://hotchicksatartopenings.tumblr.com/rss,,

 art,,http://deliciousghost.com/feed/,,

 art,,feed://http//theworldsbestever.com/feed/,,

@@ -55,18 +54,11 @@ gif,,http://gifazine.com/rss,,
 gif,,http://gifsofpopularrappers.tumblr.com/rss,,

 gif,,http://lovegifs.tumblr.com/rss,,

 gif,,http://threeframes.net/rss,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

-,,,,

+gif,,http://warnerchild.tumblr.com/rss,,

+ebay,,http://shop.ebay.com/i.html?_nkw=rolex&_adv=1&_dmd=1&_fsct=&_in_kw=1&_ipg=50&_oexkw=&_okw=rolex&_rss=1&_sop=10&_udhi=&_udlo=,,

+bust,,,,

+gawker,,http://gawker.com/index.xml,,

+vice,,http://www.viceland.com/blogs/en/feed/,,

 design,,http://feeds.mocoloco.com/mocoloco/KGTY?format=xml,,

 design,,http://www.oberholtzer-creative.com/visualculture/feed/,,

 design,,http://feeds.feedburner.com/ucllc/brandnew,,

@@ -107,4 +99,95 @@ design,,,,
 design,,,,

 design,,,,

 design,,,,

-design,,,,
\ No newline at end of file
+design,,,,

+fashion,,http://shoelust.tumblr.com/rss,,

+fashion,,http://luluandyourmom.blogspot.com/feeds/posts/default,,

+fashion,,http://seaofshoes.typepad.com/sea_of_shoes/atom.xml,,

+fashion,,http://yourboyhood.blogspot.com/feeds/posts/default,,

+fashion,,"http://stylefromtokyo.blogspot.com/feeds/posts/default
+",,

+fashion,,http://feeds.feedburner.com/zemotion,,

+fashion,,http://www.monoxious.com/feed/,,

+fashion,,http://www.misspandora.fr/comments/feed/,,feedback@refinery29.com

+fashion,,http://blog.fuct.com/?feed=rss2,,gala@galadarling.com

+fashion,,http://feelslikewhitelightning.blogspot.com/feeds/posts/default,,contact.thecherryblossomgirl@gmail.com

+fashion,,http://www.garancedore.fr/en/tag/photo/feed/,,hellojoannagoddard@gmail.com

+fashion,,http://www.purple-diary.com/rss,,stylebubble@gmail.com

+fashion,,"http://dethjunkie.tumblr.com/rss
+",,nfo@bordersandfrontiers.com

+fashion,,http://istanton.tumblr.com/rss,,askchrisbenz@fashionista.com

+fashion,,http://feeds.feedburner.com/TheSartorialist,,thesartorialist@mac.com

+fashion,,http://hypebeast.com/feed/,,info@ hypebeast.com

+fashion,,http://feeds.feedburner.com/highsnobiety/rss/,,info@titelmedia.com

+fashion,,http://feeds.feedburner.com/yvanthefacehunter,,yvan@facehunter.org

+fashion,,feed:http://www.garancedore.fr/en/feed/,,studio@garancedore.fr

+fashion,,http://feeds.feedburner.com/Slamxhype,,info@slamxhype.com

+fashion,,http://feeds.fashionista.com/fashionistacom/,,lauren@fashionista.com

+fashion,,http://www.thestylerookie.com/feeds/posts/default,,stylerookie@gmail.com

+fashion,,http://www.fashiontoast.com/feeds/posts/default,,rumilenora@gmail.com

+fashion,,http://peacelovechanel.tumblr.com/rss,,plchanel@live.com

+fashion,,http://www.thecherryblossomgirl.com/feed/,,contact.thecherryblossomgirl@gmail.com

+fashion,,http://seaofshoes.typepad.com/sea_of_shoes/atom.xml,,jane@seaofshoes.com

+fashion,,http://www.nymag.com/newyork/rss/,,contactus@nymag.com

+fashion,,http://jakandjil.com/blog/?feed=rss2,,"APARK@THECOLLECTIVESHIFT.COM,TOMMY.TON@JAKANDJIL.COM"

+fashion,,,,mail@copenhagenstreetstyle.dk

+fashion,,http://feeds2.feedburner.com/coveted,,hello@thecoveted.net

+fashion,,http://dailydrop.com/feed/,,

+fashion,,,,"knighttcat@gmail.com
+"

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+fashion,,,,

+rhizome,,http://feeds2.feedburner.com/rhizome-fp,,

+rhizome,,http://feeds2.feedburner.com/rhizome-art,,

+etsy,,http://etsymentors.blogspot.com/feeds/posts/default,,

+etsy,,http://feeds.feedburner.com/Cuteable,,

+news,,http://rss.cnn.com/rss/cnn_world.rss,,

+news,,http://rss.cnn.com/rss/cnn_topstories.rss,,

+news,,http://rss.cnn.com/rss/cnn_us.rss,,

+news,,http://news.cnet.com/2547-1_3-0-20.xml,,

+news,,http://www.usnews.com/rss/news/index.rss,,

+news,,http://feeds.huffingtonpost.com/huffingtonpost/LatestNews,,

+news,,http://us.lrd.yahoo.com/_ylt=AugWo4c0lDiv.dPf8Y4Epz5A4gEA;_ylu=X3oDMTE3bzFkM2sxBHBvcwMyBHNlYwN5bl9wcm9tb3NfZnJlZV9odG1sBHNsawNpbWFnZQ--/SIG=11dus0oj2/**http%3A//rss.news.yahoo.com/rss/topstories,,

+news,,http://us.lrd.yahoo.com/_ylt=AhbvJuQgJFKj1iF4zpNnHKpA4gEA;_ylu=X3oDMTE4NzBwaXRlBHBvcwMyNgRzZWMDeW5fcHJvbW9zX2ZyZWVfaHRtbARzbGsDaW1hZ2U-/SIG=1170ssrhu/**http%3A//rss.news.yahoo.com/rss/asia,,

+news,,http://topnews.us/rss.xml,,

+news,,http://content.usatoday.com/marketing/rss/rsstrans.aspx?feedId=news1,,

+news,,http://feeds.foxnews.com/foxnews/latest,,

+news,,http://www.topnews.in/rss.xml,,

+news,,http://www.newsday.com/cmlink/1.1250333,,

+news,,http://hosted.ap.org/lineups/TOPHEADS-rss_2.0.xml?SITE=RANDOM&SECTION=HOME,,

+gossip,,http://img.perezhilton.com/?feed=rss2,,perez@perezhilton.com

+gossip,,http://dlisted.com/rss.xml,,michaelk@dlisted.com

+gossip,,http://feedproxy.google.com/thesuperficial/SNxk,,

+gossip,,http://feeds.feedburner.com/anythinghollywood,,anythinghollywood@yahoo.com

+gossip,,http://feeds2.feedburner.com/celebuzz/gabby,,gabbybabble@gmail.com

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,

+gossip,,,,
\ No newline at end of file
diff --git a/static/bg-btn-blue.png b/static/bg-btn-blue.png
deleted file mode 100755
index 2f5da4c..0000000
--- a/static/bg-btn-blue.png
+++ /dev/null
diff --git a/static/css/dump.css b/static/css/dump.css
index 965f145..c6cd068 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -73,12 +73,26 @@ font-size:15;
 color:#000;
 
 }
+#tinychat-wrapper{
+z-index:55;
+width:700px;
+right:30px;
+height:654px;
+display:none;
+padding-bottom:40px;
+position:absolute;
+bottom:190;
+margin-bottom:-154px;
+}
+#tinychat-wrapper object{
+padding-top:310px;
+}
 #footerc
 {
 	text-align:center;
 	position:fixed;
 	width:100%;
-	bottom:0px;
+	bottom:-8px;
 line-height:3.1;
 	font-size:11px;
 word-spacing:6px;
@@ -104,7 +118,7 @@ color:000;
 
 
 #messagePane {
-top:40px;
+top:50px;
 bottom:65px;
 	position:fixed;
 	width: 99.6%;
@@ -113,6 +127,11 @@ left:0.2%;
 	z-index:5;
 }
 
+#messagePane a:hover {
+ text-decoration: none;
+ color: #00F;
+}
+
 #messageList {
     height: 100%;
     width: 100%;
@@ -157,6 +176,7 @@ font-size:20px;
 }
 #msginputrapper{
 margin-right:374;
+height:0px;
 
 }
 #msgSubmit {		
@@ -358,15 +378,15 @@ border:1px solid blue;
 #userList {
 	overflow-x: hidden;
 	overflow-y:auto;
-	max-height: 55%;
+	max-height: 70%;
 	margin: 0px;
 	position: absolute;
 	padding: 5px;
-	top:70px;
-	min-width: 200px;
+	top:25px;
+	min-width: 210px;
 	width:11%;
 	float:right;
-	right: 6.2%;
+	right: 4.5%;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 14px;
 	font-weight:420;
@@ -395,6 +415,7 @@ opacity:0.87;
 	z-index:18;
 	text-align: left;
 }
+#userList a:hover{color:#000;}
 .username{height:30px;
 margin-top:6px;
 line-height:20px;
@@ -407,7 +428,7 @@ overflow:hidden;
 .username a { 
 display:block; 
 width:100%; 
-height:100%; 
+height:100%; color:#000;
 text-decoration:none; 
 }  
 .username a:hover { 
@@ -416,7 +437,7 @@ width:100%;
 height:100%;
 background-image:url(/static/img/moverc.png);
 background-repeat:repeat-x;
-color:#fff;
+color:#000;
 text-decoration:none;
 background-color:#f3f3f3;
 	border-top-right-radius:5px;
@@ -524,491 +545,7 @@ left:0;
             display: block;
 width:60px;
 position:absolute;
-        }/* pichat.css */
-
-body {
-	
-background-color:#fff;
-	margin:0;
-
-	background-repeat:repeat-x;
-	background-position:top;
-overflow:hidden;
-	
-}
-
-a {
- font-size: 12px;
- color: #000;
-}
-a:link {
- text-decoration: none;
-}
-a:visited {
- text-decoration: none;
- color: #000;
-}
-a:hover {
- text-decoration: none;
- color: #00F;
-}
-a:active {
- text-decoration: none;
- color: #000;
-}
-.white a:link {
- text-decoration: none;
- font-size:14px;
- 
- color: #fff;
-}
-.white a:visited {
- text-decoration: none;
- font-size:14px;
- color: #fff;
-}
-#content{
-    z-index: 3;
-    overflow: auto;
-	min-width:600px;
-}
-
-#chatboxx {
-    position: fixed;
-    top:80px;
-}
-
-#rapper {
-    top: 0px;
-}
-#trophy{
-position:fixed;
-right:2;
-bottom:30;
-
-}
-#effects-msg{
-position:fixed;
-bottom:65;
-z-index:1111;
-right:35;
-font-size:15;
-color:#000;
-
-}
-#footerc
-{
-	text-align:center;
-	position:fixed;
-	width:100%;
-	bottom:0px;
-line-height:3.1;
-	font-size:11px;
-word-spacing:6px;
-height:28px;
-	color: #000;
-
-}
-#footerc a {
-	font-size: 11px;
-	color: #000;
-}
-#footerc a:link {
-	text-decoration: none;
-	font-size: 11px;
-color:000;
-}
-
-#footerc a:hover {
-	text-decoration:none;
-	font-size: 11px;
-	color: #f0e;
-}
-
-
-#messagePane {
-top:40px;
-bottom:65px;
-	position:fixed;
-	width: 99.6%;
-	background-color:#FFF;
-left:0.2%;
-	z-index:5;
-}
-
-#messageList {
-    height: 100%;
-    width: 100%;
-    overflow-y: auto;
-    overflow-x: hidden;
-}
-#messageList a:hover{ color: #00F;}
-#messagetabs {
-    height: 40px;
-    padding: 5px;
-    position: fixed;
-    width: 80%;
-    max-width:1500px;
-    overflow-y: hidden;
-    overflow-x: hidden;
-    top:48px;
-    left:0px;
-    z-index:1;
-}
-
-
-#msgInput {
-	z-index:100;
-    margin-top: 15px;
-	left:-3px;border:1px solid #000;
-    position:relative;border-right:0px;
-height:35px;
-font-size:20px;
-    min-width:500px;padding-right:38px;padding-left:1px;
-}
-.msgInput {
-    min-width:500px;width:100%;
-	z-index:100;
-}
-#msginputrapper{
-margin-right:374;
-
-}
-#msgSubmit {		
-	position:absolute;
-	display:inline-block;
-	width:120px;
-height:35px;
-right:285px;
-font-size:20px;
-top:15px;
-	text-align:center;
-	z-index:100;
-border:1px solid #000;
-border-right:0px;
-	cursor:pointer;
-	font-size:12px;
-	color:#000;
-}
-#webcam-button-upload{
-		border-top-right-radius:10px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomright:5px;
-	position:absolute;
-	display:inline-block;
-	width:120px;
-height:35px;
-background-position:center;
-right:5px;
-border:1px solid #000;
-top:15px;
-padding-bottom:1;
-	text-align:center;
-	z-index:100;
-	cursor:pointer;
-background-color:#fff;
-	font-size:12px;
-	color:#000;
-}
-#webcam-button-snap{
-		border-top-right-radius:10px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomright:5px;
-	position:absolute;
-	display:inline-block;
-	width:120px;
-height:35px;
-background-position:center;
-right:5px;
-top:15px;
-padding-bottom:4;
-	text-align:center;
-	z-index:100;
-	cursor:pointer;
-background-color:#ccc;
-	font-size:17px;
-	color:#fff;
-border:1px solid #000;
-}
-#webcam-button-snap.blink{
-  color:#4f4;
-}
-
-
-#webcam-button-close { /* 16 x 14 */
-  position: fixed;
-  bottom: 330px; /* 240 + 68 - (16 / 2) */
-  right: 335px; /* 320 - (14 / 2) */
-  z-index: 5001;
-border:1px solid #000;
-		box-shadow: 3px 4px 4px #c8cbce;
--webkit-box-shadow: 3px 4px 4px #c8cbce;
--moz-box-shadow: 3px 4px 4px #c8cbce;
-  cursor: pointer;
-}
-
-#webcam-preview {
-  position:fixed;
-  bottom: 82;
-opacity:0.9;
-  right:30;
-		box-shadow: 3px 4px 4px #c8cbce;
--webkit-box-shadow: 3px 4px 4px #c8cbce;
--moz-box-shadow: 3px 3px 4px #c8cbce;
-	border-top-right-radius:5px;
-	background-color:#FFF;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-border:1px solid #999;
-  z-index:5000;
-}
-
-.msgDiv img{
-    max-width:650px;
-    width: expression(this.width > 650 ? 650: true);
-    max-height:400px;
-    height: expression(this.width > 400 ? 400: true);
-    max-width:400px;
-margin:-2;
- z-index: 1;
-opacity:1;
--webkit-transition: opacity;
--webkit-transition-timing-function: ease-out;
--webkit-transition-duration: 500ms;
-
-}
-
-.msgDiv {padding:2px;   
-}
-.oldmsg {
-    color: #666;
-}
-
-#palette-button {
-border:1px solid #000;
-background-position:top right;
-	position:absolute;
-/*	display:inline-block;*/
-	width:40px;
-  height:35px;
-  right:245px;
-  top:15px;
-  padding-bottom:1;
-	text-align:center;
-	z-index:100;
-	cursor:pointer;
-  background-color:#fff;
-	font-size:12px;
-	color:#fff;
-border-right:0px;
-}
-
-#palette {
-  position: absolute;
-  right: 30px;
-  bottom: 76px;
-  width: auto;
-max-width:350;
-min-width:150;
-  height: auto;
-max-height:400px;
-min-height:150;
-padding:20;
-  background-color: white;
-  z-index: 1000000000;
-  display: none;
-  overflow-y: auto;
-		box-shadow: 3px 4px 4px #c8cbce;
--webkit-box-shadow: 3px 4px 4px #c8cbce;
--moz-box-shadow: 3px 3px 4px #c8cbce;
-	border-top-right-radius:5px;
-	background-color:#FFF;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-border:1px solid #999;
-}
-
-#palette-thumbs {
-}
-
-#palette-thumbs img {
-  max-width: 100px;
-cursor:pointer;
-opacity:.9;
-padding:1;
-  max-height: 100px;
-}
-#palette-thumbs img:hover {
-  max-width: 100px;
-cursor:pointer;
-opacity:1;
-padding:0;
-border:1px solid blue;
-  max-height: 100px;
-}
-
-
-#userList {
-	overflow-x: hidden;
-	overflow-y:auto;
-	max-height: 55%;
-	margin: 0px;
-	position: absolute;
-	padding: 5px;
-	top:70px;
-	min-width: 200px;
-	width:11%;
-	float:right;
-	right: 6.2%;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	font-weight:420;
-	border-top-left-radius:5px;
-	border-top-right-radius:5px;
-	-webkit-border-top-left-radius:5px;
-	background-color:#FFF;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topleft:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-left-radius:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomleft:5px;
-	-moz-border-radius-bottomright:5px;
-border-right:2px solid #c8cbce;
-border-bottom:2px solid #c8cbce;
-
-		box-shadow: 3px 4px 4px #c8cbce;
--webkit-box-shadow: 3px 4px 4px #c8cbce;
--moz-box-shadow: 3px 3px 4px #c8cbce;
-filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true);
-	text-overflow:ellipsis;
-opacity:0.87;
-	z-index:18;
-	text-align: left;
-}
-.username{height:30px;
-margin-top:6px;
-line-height:20px;
-text-indent:6px;
-z-index:18;
-min-width:90px;
-overflow:hidden;
-
-}
-.username a { 
-display:block; 
-width:100%; 
-height:100%; 
-text-decoration:none; 
-}  
-.username a:hover { 
-display:block; 
-width:100%;
-height:100%;
-background-image:url(/static/img/moverc.png);
-background-repeat:repeat-x;
-color:#fff;
-text-decoration:none;
-background-color:#f3f3f3;
-	border-top-right-radius:5px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomright:5px;
-}  
-#userList img{
-    max-width:30px;
-    width: expression(this.width > 30 ? 30: true);
-    max-height:30px;
-    height: expression(this.width > 30 ? 30: true);
-    max-width:30px;
-	float:right;
-	right:1px;
-	z-index:77;
-	height:30px;
-	border-top-left-radius:3px;
-	border-top-right-radius:3px;
-	-webkit-border-top-left-radius:3px;
-	-webkit-border-top-right-radius:3px;
-	-moz-border-radius-topleft:3px;
-	-moz-border-radius-topright:3px;
-	border-bottom-left-radius:3px;
-	border-bottom-right-radius:3px;
-	-webkit-border-bottom-left-radius:3px;
-	-webkit-border-bottom-right-radius:3px;
-	-moz-border-radius-bottomleft:3px;
-	-moz-border-radius-bottomright:3px;
-}
-#userListicon {
-    overflow: auto;
-    height: 70%;
-    margin: 0px;
-    position: fixed;
-    padding: 5px;
-    top:48px;
-    width: 7%;
-    float:right;
-    right: 35px;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    text-transform: uppercase;
-    min-width:72px;
-    line-height:13px;
-    z-index:1;
-    font-weight: bold;
-    font-family: Arial, Helvetica, sans-serif;
-    color: #666;
-    text-transform:none;
-    
-}
-#avatar
-{	
-	right:1px;
-	float:right;
-	text-align:left;
-	width:auto;
-	
-}
-#mgsavatar{
-left:0;
-}
-#binfo {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 11px;
-    bottom
-}
-
-#preload {
-  position: absolute;
-  left: 0px;
-  top: 0px;
-}
-
-.invisible { display: none !important; }
-
+        }
 
         /* profile shit */
     body.profile {
@@ -1125,15 +662,19 @@ margin-top:0;
 }
 #profile h8{
 position:absolute;
-top:35px;font-size:100%;
+top:38px;font-size:100%;
 letter-spacing:-1px;
 left:12px;
 color:#000;
 }
 #profile h9{
-font-size:140%;
+font-size:120%;
 color:#000;color:#000;
-text-shadow:#000 1px 1px 1px;
+
+}
+#adsenseprofile{
+position:fixed;top:490;
+left:20;
 }
 #chatrap{
 margin-left:245px;
@@ -1417,7 +958,7 @@ text-overflow: ellipsis-word;
 	line-height:15px;
 	background-color:#fff;
 border:1px solid #f0e0d6;
-margin-left:-120px;
+margin-left:20px;
 margin-bottom:20px;
 	z-index:4;
 		 border-top-left-radius:5px;
@@ -1454,16 +995,13 @@ top:;
 	-webkit-border-bottom-right-radius:5px;
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
-border:1px solid #ccc;
-height:22;
+border:1px solid #000;
 margin-left:-30;
-color:fff;
-text-shadow: 1px 1px 1px #000;
-padding-right:8;
+color:#000;
+background-color:#fff;
+padding:3;
 text-transform:uppercase;
-	background-image:url(/static/img/upload.png);
 margin-top:-54;
-text-indent:5;
 }
    #dprofile {
 	float: right;
@@ -1472,8 +1010,26 @@ opacity:0.9;
 	position:fixed;
 	top:76px;
 image-rendering: -moz-crisp-edges;
-left:772px;
-max-width:140px;
+left:22px;
+max-width:120px;
+line-height:1.3;
+background-color:#fff;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	height:auto;
+	text-overflow: ellipsis-word;
+	z-index:9;
+      }
+
+   #lprofile {
+	float: right;
+	padding: 20px;
+opacity:0.9;
+	position:fixed;
+	top:95px;
+image-rendering: -moz-crisp-edges;
+left:12px;
+width:180px;
 line-height:1.3;
 background-color:#fff;
 	overflow: hidden;
@@ -1509,4 +1065,3 @@ margin-left:-5px;
 font-size:12px;
 
 }
-
diff --git a/static/css/header.css b/static/css/header.css
index dd6f2ad..d6134b3 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -1,27 +1,5 @@
 
-.share-buttons{
-cursor:pointer;
-width:100;
-}
 
-.white a:link {
-	text-decoration: none;
-	font-size:14px;
-	
-	color: #fff;
-}
-.white a:visited {
-	text-decoration: none;
-	font-size:14px;
-	color: #fff;
-}
-#strapline{position:absolute;
-top:-775;
-right:0;
-opacity:0.0;
-margin-right:80%;
-
-}
 .white a:hover {
 	text-decoration: none;
 	color: #fff;
@@ -35,36 +13,34 @@ margin-right:80%;
 #header7{
 	margin: 0px auto -1px auto;
 	top:-1px;
-height:38;
+height:49px;
 	position:fixed;
 background-color:#fff;
 border:1px solid #000;
 width:100%;
 min-width:600px;
 left:-1px;background-image:url(/static/img/blgrad.png);
-	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #000;
-  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #000;
-  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #000;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #000;
 
 }
 #bar7{
-	top:8px;
+	top:19px;
 	position:absolute;
 	word-spacing:-1;
 	font-size: 16px;
 height:22;
-width:455;
-text-indent:14;
+width:455px;
+text-indent:14px;
 line-height:1.9;
-	left: 140px;
+	left: 150px;
 	margin-left: 0.1%;
 	margin-right: 8%;
 	letter-spacing:.2px;
 	z-index: 999;
 }
-#registerlink{
 
-}
 #bar7 img{
 margin-top:4;display:none;
   vertical-align: top;
@@ -72,51 +48,44 @@ margin-top:4;display:none;
 #bar7 a{
 	text-decoration: none;
 	font-size:13;
-padding:6;
+padding:6px;
 cursor:pointer;
-	color: #000;
+  color: #000;
+
 
 }
 #bar7 a:hover{
 	text-decoration: none;
-padding:6;background-color:#fff;
-	color: #000;
+padding:6px;background-color:#fff;
+  color: #000;
+
 }
 #logout7{
-	top:1px;
+	top:-1px;
+height:22px;
+padding-left:4px;padding-right:3px;
+
+	border-bottom-left-radius:3px;
+	-webkit-border-bottom-left-radius:3px;
+	-moz-border-radius-bottomleft:3px;
 	position:relative;
-	font-size:10px;
-	margin-right: 7px;
+	font-size:1px;
+border-left:1px solid #999;
+border-bottom:1px solid #999;
+background-color:#fff;
 	float:right;
 	font-family: Arial, Helvetica, sans-serif;
 	font-weight: normal;
 }
 #logout7 img{display:none;
 }
-#logout7 a{font-size:10px;color:#000;
+#logout7 a{font-size:10px;  color: #5a5858;
+
 }
 #logout7 a:hover{font-size:10px;
-color:#000;	text-shadow: -1px 1px 0px #fff;
-}
-a {
- font-size: 12px;
- color: #000;
-}
-a:link {
- text-decoration: none;
-}
-a:visited {
- text-decoration: none;
- color: #000;
-}
-a:hover {
- text-decoration: none;
- color: #00F;
-}
-a:active {
- text-decoration: none;
- color: #000;
+color:#000;	text-shadow: 0px 1px 0px #fff;
 }
+
 .white a:link {
  text-decoration: none;
  font-size:14px;
@@ -128,50 +97,37 @@ a:active {
  color: #fff;
 }
 #logo7{
-	margin-left: 6px;
+	margin-left: 0px;
 	margin-right: 10%;
-	z-index:1050;
-	float:left;
-background-repete:none;
-	margin-top:-2px;
-
-background-image:url(/static/img/logobg.png);
-background-repeat:no-repeat;background-position:44 2;
-
+	z-index:1050;	text-decoration: none;
+	float:left;padding-right:1px;
+	margin-top:5px;
 }
-#logo7 a{font-size:42;
-
-letter-spacing:-4;
+#logo7 a{font-size:28px;
 
-	text-shadow: 1px 1px 3px #ccc;	text-shadow: 1px 1px 3px #999;
-color:#fff;    
+letter-spacing:-1;
+font-weight:bold;	text-decoration: none;
+color:#000;    
 }
 #logo7 a:hover{
-color:#fff;
-	text-shadow: 1px 1px 2px #000;
- 
+color:#000;	text-decoration: none;
+text-shadow: -0.5px -0.5px 0px #f0e;
 }
-
-#vippp{
-	top:-3px;
-	position:absolute;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-height:30;
-word-spacing:2;
-color:#000;
-text-indent:14;
-line-height:1.8;
-	right:65px;
-text-transform:capatalize;
-	margin-right:0;
-	letter-spacing:.2px;
-	z-index: 999;
+#dumplist{
+top:0px:width:100%;padding:0px;background-color:#fff;
+color:#000;font-size:60%;text-transform:uppercase;text-decoration: none;
+border-bottom:1px solid #999;text-align:right;
+padding-right:90px;line-height:1.1;
+/*margin-left:40%;
+	border-bottom-left-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-moz-border-radius-bottomleft:5px;text-decoration: none;
+border-left:1px solid #999;*/
 }
-#vippp a{color:#000;font-size:10;
+#dumplist a{color:#000;font-size:100%;text-transform:uppercase;text-decoration: none;
 }
-#vippp a:hover{color:#ccc;
-text-shadow: 0px 0px 0.3px #fff;
+#dumplist a:hover{color:#000;text-decoration: none;
+
 }
 #rapper7{
 	top: 0px;
@@ -183,66 +139,25 @@ text-shadow: 0px 0px 0.3px #fff;
 }
 #logoicons{
 width:auto;
-
-}
-
-
-#topnav {
-	padding:10px 0px 12px;
-	font-size:11px;
-	line-height:23px;
-	text-align:right;
-}
-#topnav a.signin {
-	background:#88bbd4;
-	padding:4px 6px 6px;
-	text-decoration:none;
-	font-weight:bold;
-	color:#fff;
-	-webkit-border-radius:4px;
-	-moz-border-radius:4px;
-	border-radius:4px;
-	*background:transparent url("images/signin-nav-bg-ie.png") no-repeat 0 0;
-	*padding:4px 12px 6px;
-}
-#topnav a.signin:hover {
-	background:#59B;
-	*background:transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0;
-	*padding:4px 12px 6px;
-}
-#topnav a.signin, #topnav a.signin:hover {
-	*background-position:0 3px!important;
 }
-#register{
+#registerlink{
 	top:-5px;
 	position:absolute;
 	font-size: 16px;
 height:22;
-
+left:5px;
 word-spacing:2;
-width:365;
 color:#fff;
-text-indent:14;
-line-height:1.9;
-font-weight:bold;
-	left: -140;
-	margin-left: 1.2%;
-	margin-right: 8%;
-	letter-spacing:.2px;
-	z-index: 999;
+
 }
 
+#registerlink img{
+display:none;
+}
 .no-cursor { cursor: none; }
 .invisible { display: none !important; }
 #cursor-big { position: absolute; z-index: 1000; }
 
-#iesucks{
-background-image:url(/static/img/ieburnbtn.gif); font-size:40;color:white;height:100%;width:100%;z-index:1000000000000000000000000000000;padding-top:100;
-padding-right:400;padding-left:50;
-font-weight:bold;
-
-}
-
 .thumb {
   cursor:pointer;
 }
@@ -321,3 +236,8 @@ a.youtube {
   bottom: 0;
   margin: 0;
 }
+.share-buttons{
+cursor:pointer;
+width:100;
+}
+
diff --git a/static/css/index.css b/static/css/index.css
index 5d0241f..9210f8f 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -195,6 +195,7 @@ input {
 	border:0px;
 	background:#e9e9e9;
 	margin:10px;
+padding-left:2px;
 	color:#000;z-index:20;
 	font-size:30px;
 	
@@ -264,7 +265,9 @@ margin-bottom:7px;
   z-index: 10;
 
 }
-
+#adsense{
+padding-top:20px;margin: 0 auto 0 auto;
+}
 /*
  * jQuery Nivo Slider v1.9
  * http://nivo.dev7studios.com
@@ -278,8 +281,8 @@ margin-bottom:7px;
 #talkaboutus{
 position:relative;
 z-index:20;
-top:-20px;
-	width:311px;
+top:-30px;
+height:0px;
 	margin: 0 auto 0 auto;
 }
 
diff --git a/static/css/indexxx.css b/static/css/indexxx.css
new file mode 100644
index 0000000..a71e0b1
--- /dev/null
+++ b/static/css/indexxx.css
@@ -0,0 +1,449 @@
+    body.profile {
+	font-family: Arial, Helvetica, sans-serif;
+	background-color:#f0f9ff;
+	background-image:url(/static/img/fade-blue.png)!important;
+	background-repeat:repeat-x;	
+	background-position:0 -200;
+background-attachment:scroll;
+overflow:auto !important;
+		margin: 0;
+}
+    #container  {
+clear:both;
+padding-top:0;
+
+}
+#page  {
+padding-top:60px;
+width:900px;margin-left:8%;
+}
+#rightstuff  {
+float:left;
+height:180px;
+margin-bottom:0;
+margin-left:10px;
+margin-right:0;
+margin-top:25px;
+padding:10px;
+width:380px;
+	border-radius: 15px;
+  -webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+
+}
+#leftstuff{
+float:left;
+height:200px;
+	border-radius: 15px;
+  -webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+margin-bottom:0;
+margin-left:15px;	background-color:#f0f9ff;
+margin-right:0;
+margin-top:25px;
+padding-bottom:0;
+padding-left:0;
+padding-right:0;
+padding-top:0;
+width:270px;
+}
+#cloud{background-image:url(/static/img/cloud.png);position:absolute;height:320px;left:25%;top:20%;z-index:-1;
+	background-repeat:no-repeat;background-position:20% 30px;width:100%;}
+#wrapper{
+margin-bottom:0;
+margin-left:5%;
+margin-right:10%;
+margin-top:20;
+padding-bottom:0px;
+min-width:850px;
+overflow-x:hidden;
+overflow-y:hidden;
+position:relative;
+text-align:left;
+}
+#divide{width: 900px;margin: 0pt 12px 0pt 16px; padding: 0pt; no-repeat scroll 0% 0% transparent;}
+#signin{
+text-align: left;text-indent:6px;}#signinrapper{float: left; padding: 0pt; margin: 20px 0pt 0pt 10px; width: 450px; height: 220px;}
+#aboutdump{
+background-attachment:scroll;
+background-color:transparent;
+background-image:url("/static/grgrad.png");
+background-position:0 0;
+background-repeat:repeat-y;
+margin-bottom:0;
+margin-left:16px;
+margin-right:12px;
+margin-top:0;
+padding-bottom:0;
+padding-left:0;
+padding-right:0;
+padding-top:0;
+width:800px;height:520px;
+}
+#aboutl{
+float:left;
+margin-bottom:0;
+margin-left:-2;
+margin-right:0;
+margin-top:10px;
+padding-bottom:10px;
+padding-left:15px;
+padding-right:15px;
+padding-top:15px;
+width:290px;
+height:158px;
+	border-radius: 15px;
+  -webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+border:1px solid #ccc;	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+}
+#aboutr{
+float: left; width: 290px;margin-top:10px;padding:10px;margin-left:10px;
+
+}
+#aboutcenter{float: left; width: 160px; margin: 0pt; padding: 2px 24px 2px 8px; border: 0px solid rgb(161, 191, 225);}
+#footerspace
+{
+padding-bottom:15px;
+padding-left:15px;
+padding-right:15px;
+padding-top:15px;
+}
+#footeri{
+bottom:0;
+left:-5;
+font-size:12px;
+padding:10px;
+padding-left:3%;
+font-weight:bold;
+color:#999;
+border-top:1px solid #999;
+position:fixed;
+word-spacing:15px;
+background-image:url(/static/img/blgrad.png);
+text-align:left;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #999;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #999;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 2px #999;
+width:100%;
+}
+#footeri a{color:#999;text-decoration:none;}
+.heading1{color: rgb(0, 179, 216); font-size: 20px;}
+.body1{color: rgb(0, 179, 216); font-size: 12px; margin: 0pt; padding: 5px 10px 5px 0pt; line-height: 15px;}
+
+#video{
+display:none;
+}
+#rapper{
+margin-top:6%;
+}
+#content{
+	background:url(/static/img/cloudbg.png);
+background-position:top center;
+	background-repeat:no-repeat;
+}
+#preload {
+  position: absolute;
+  left: 0px;
+  top: 0px;
+}
+#bigbow{
+display:none;
+}
+#panel {
+	padding: 10px 10px 10px 10px;
+	height: 600;
+	margin: 0 auto 0 auto;
+	display: none;
+}
+.slide {	margin: 0 auto 0 auto;
+	margin: 0;
+	padding: 0;
+border-top:1px solid #ccc;
+color:black;
+}
+.btn-slide {
+	text-align: center;
+	width: 144px;	margin: 0 auto 0 auto;
+	height: 0px;
+	padding: 5px 10px 0 0;
+	margin: 0 auto;
+	display: block;
+font-size:42%;
+	text-decoration: none;
+	text-align: center;
+
+width:150;
+
+}
+
+.active {
+	background-position: right 12px;
+}
+#main {
+	width:460px;
+	margin: 0 auto 0 auto;
+  padding: 19px 0;
+z-index:2;
+	position: relative;
+		border-radius: 5px;
+  -webkit-border-radius: 15px;
+	-moz-border-radius: 15px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #fff;
+}
+}
+.menu2 li {
+	padding: 0;
+	margin: 0 2px;
+	float: left;
+	position: relative;
+	text-align: center;
+}
+.menu2 a {
+	padding: 14px 10px;
+	display: block;
+	color: #000000;
+	width: 144px;
+	text-decoration: none;
+	font-weight: bold;
+	background: url(images/button.gif) no-repeat center center;
+}
+.menu2 li em {
+	font-weight: normal;
+	background: url(images/hover.png) no-repeat;
+	width: 180px;
+	height: 45px;
+	position: absolute;
+	top: -85px;
+	left: -15px;
+	text-align: center;
+	padding: 20px 12px 10px;
+	font-style: normal;
+	z-index: 2;
+	display: none;
+}
+#logo-and-text {
+  position: relative;
+  z-index: 20;
+  padding-bottom: 20px;
+}
+
+#horse {
+	position: absolute;
+	z-index: 10;
+	top:-39px;
+	left: 140px;
+}
+#remember{
+
+}
+#furie1 {
+  position: absolute;
+  left: -250px;
+  top: 130px;
+  z-index:-1;display:block;
+
+}
+#furie2 {
+  position: absolute;
+  left:330px;
+  top: 185px;
+  z-index:-1;
+display:block;
+
+}
+#info {
+	width:420px;
+	margin:30px auto -1px auto;
+opacity:0.9;
+z-index:4500;
+  vertical-align: bottom;
+	text-align:center;
+	width:100%;
+	bottom:0px;
+margin-left:-9px;
+	font-size:11px;
+word-spacing:6px;
+line-height:2;	color: #666;
+}
+
+#info a{
+color:#666;
+text-decoration:none;
+}
+#info a:hover{
+color:#f0e;
+text-decoration:none;
+}
+#dumpednow{
+position:absolute;
+height:50px;
+width:420px;
+top:0px;
+}
+
+p {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 24px;
+}
+
+.btnav {  border: 0px #000 solid;} 
+
+.submit {
+	
+	text-shadow: -1px 1px 1px #ccc;
+	font-size:15px;
+  z-index: 11;
+}
+#submit{
+cursor:pointer;
+	display:inline-block;
+	width:300px;
+  height:33px;
+  font-size:20px;
+  background-image:url(/static/img/btngrad1.png);
+  font-weight:bold;
+  word-spacing:7;
+ margin-top:12px;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#fff;
+	text-shadow:1px 1px 3px #000;
+
+z-index:20;
+	-moz-border-radius: 5px;*/
+}
+input {
+	height:40px;
+	width:240px;
+	border:0px;
+	background:#e9e9e9;
+	margin:5px;
+	color:#000;z-index:20;
+	font-size:30px;
+	
+}
+
+.txt {
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:14px;
+line-height:1.2;z-index:20;
+	word-spacing: 3px;
+}
+	.line {
+	font-family:Arial, Helvetica, sans-serif;
+	letter-spacing:0px;
+line-height:-1;
+	color:#000;z-index:20;
+	font-size:17px;
+}
+
+.no-cursor { cursor: none; }
+.invisible { display: none !important; }
+#cursor-big { position: absolute; z-index: 1000; }
+
+#signin-submit {
+	display:inline-block;
+	width:135px;
+  height:33px;float:left;
+  font-size:20px;
+  background-image:url(/static/img/btngrad1.png);
+  font-weight:bold;
+  word-spacing:7;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#fff;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	text-shadow:1px 1px 3px #000;
+z-index:20;border:1px solid #999;
+}
+
+#register-submit {
+	display:inline-block;
+	width:130px;float:right;
+  height:33px;
+  font-size:20px;
+  background-image:url(/static/img/ylgrad.png);
+  font-weight:bold;
+  word-spacing:7;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#fff;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	text-shadow:1px 1px 3px #000;
+z-index:20;border:1px solid #999;
+}
+#remembermeInput {
+ width: 15px;
+ height: 15px;
+ margin: 1px;
+}
+
+label {
+ display:inline-block;
+ font-size: 11px;
+ color: #222;
+margin-bottom:4px;
+}
+#remember{margin-top:4px;z-index:30;text-align: right;float:left;}
+#remember a{text-decoration:none;font-size:11px;z-index:30;}
+#furie3 {
+  position: absolute;
+  left:294px;
+  top:260px;
+  z-index: 10;
+
+}
+#adsense{
+padding-top:20px;margin: 0 auto 0 auto;
+}
+/*
+ * jQuery Nivo Slider v1.9
+ * http://nivo.dev7studios.com
+ *
+ * Copyright 2010, Gilbert Pellegrom
+ * Free to use and abuse under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ * 
+ * March 2010
+ */
+#talkaboutus{
+position:relative;
+z-index:-20;
+height:0px;
+margin-left:-5px;
+padding-top:1px;
+
+}
+
+#slider {
+	position:relative;
+z-index:-20;
+	//See the "style-pack" below for image
+	background:url(images/loading.gif) no-repeat 50% 50%; 
+}
+#slider img {
+	position:absolute;
+	top:0px;
+	left:0px;
+	display:none;
+}
+
+
diff --git a/static/css/jquery.simplyscroll-1.0.4.css b/static/css/jquery.simplyscroll-1.0.4.css
new file mode 100755
index 0000000..97ba7b0
--- /dev/null
+++ b/static/css/jquery.simplyscroll-1.0.4.css
@@ -0,0 +1,61 @@
+

+

+.simply-scroll-container { /* Container DIV - automatically generated */

+	position: relative;

+}

+

+	.simply-scroll-clip { /* Clip DIV - automatically generated */

+		position: relative;

+		overflow: hidden;

+		z-index: 2;

+	}

+

+	.simply-scroll-list { /* UL/OL/DIV - the element that simplyScroll is inited on */

+		position: absolute;

+		top: 0;

+		left: 0;

+		z-index: 1;

+		overflow: hidden;

+		margin: 0;

+		padding: 0;

+		list-style: none;

+	}

+	

+		.simply-scroll-list li {

+			padding: 0;

+			margin: 0;

+			list-style: none;

+		}

+	

+		.simply-scroll-list li img {

+			border: none;

+			display: block;

+		}

+	

+

+

+/* Custom class modifications - override classees

+

+.simply-scroll is default

+

+*/

+

+.simply-scroll { /* Customisable base class for style override DIV */

+	height: 80px;

+

+}

+

+	.simply-scroll .simply-scroll-clip {

+

+		height: 200px;z-index:-1;

+	}

+	

+		.simply-scroll .simply-scroll-list {}

+		

+		.simply-scroll .simply-scroll-list li {

+			float: left;

+			width: 290px;

+			height: 200px;

+		}

+		.simply-scroll .simply-scroll-list li img {}

+	

diff --git a/static/favicon.ico b/static/favicon.ico
index d9d9acb..932df2b 100644
--- a/static/favicon.ico
+++ b/static/favicon.ico
diff --git a/static/form_login/front.css b/static/form_login/front.css
index 9536318..8973e90 100644
--- a/static/form_login/front.css
+++ b/static/form_login/front.css
@@ -18,7 +18,7 @@ filter:alpha(opacity=90);
 	text-decoration:none;
 }
 #login-container .topnav {
-	padding:10px 0px 12px;
+	padding:0px 0px 12px;
 	font-size:11px;color:000;
 	line-height:23px;
 	text-shadow: #000 0px 0px 0px;
@@ -29,9 +29,8 @@ filter:alpha(opacity=90);
 	text-shadow: #000 0px 0px 0px;
 	padding:5px  5px 5px 5px;
 	text-decoration:none;
-background-image:url(/static/img/grgrad.png);
-	color:#000;
-	-webkit-border-radius:4px;
+	background-color:#ddeef6;
+	-webkit-border-radius:4px;font-size:11px;
 	-moz-border-radius:4px;
 	border-radius:4px;
 	*background:transparent url("images/signin-nav-bg-ie.png") no-repeat 0 0;
@@ -41,7 +40,7 @@ background-image:url(/static/img/grgrad.png);
 }
 #login-container .topnav a.signin:hover {
 	*background:transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0;
-	*padding:4px 12px 6px;
+	*padding:4px 12px 6px;background-color:#ccc;
 }
 #login-container .topnav a.signin, #login-container .topnav a.signin:hover {
 	*background-position:0 3px!important;color:#000;
@@ -87,10 +86,9 @@ a.signin.menu-open span {
 	border:1px transparent;
 	text-align:left;
 	padding:12px;
-	top: 23.5px; 
+	top: 16.5px; 
 	right: 0px; 
 	margin-top:5px;
-
 	margin-right: 0px;
 	*margin-right: -1px;
 	color:#789;
diff --git a/static/img/calm.gif b/static/img/calm.gif
new file mode 100644
index 0000000..c7cc71f
--- /dev/null
+++ b/static/img/calm.gif
diff --git a/static/img/cloud.png b/static/img/cloud.png
new file mode 100644
index 0000000..485d5d4
--- /dev/null
+++ b/static/img/cloud.png
diff --git a/static/img/cnetquote.png b/static/img/cnetquote.png
new file mode 100644
index 0000000..949e4ef
--- /dev/null
+++ b/static/img/cnetquote.png
diff --git a/static/img/metroquote.png b/static/img/metroquote.png
index 84d2465..698cd67 100644
--- a/static/img/metroquote.png
+++ b/static/img/metroquote.png
diff --git a/static/img/paperquote.png b/static/img/paperquote.png
index c6e789e..0ee1140 100644
--- a/static/img/paperquote.png
+++ b/static/img/paperquote.png
diff --git a/static/img/ylgrad.png b/static/img/ylgrad.png
new file mode 100644
index 0000000..c144315
--- /dev/null
+++ b/static/img/ylgrad.png
diff --git a/static/index.html b/static/index.html
index 3743520..62f00e2 100755
--- a/static/index.html
+++ b/static/index.html
@@ -63,8 +63,8 @@ $(document).ready(function() {
 });
 </script>
 
-<link rel="stylesheet" type="text/css" href="static/css/reset.css">  
-<link rel="stylesheet" type="text/css" href="static/css/index.css">  
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/reset.css">  
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css">  
 <link rel="stylesheet" href="static/css/nivo-slider.css" type="text/css" media="screen" />
 <link rel="shortcut icon" href="static/favicon.ico">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -118,16 +118,16 @@ $(document).ready(function() {
  <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
  <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
  </div>
+
  <div id="footer" style="text-align: center">
 @2010 <a href="/">dump.fm</a>
 <a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
 <a href="/terms">Terms</a>
 <a href="/privacy">Privacy</a></div>
 </div> 
-
+<br><br>
 </div>
 </div>
-
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
 </div>
diff --git a/static/index2.html b/static/index2.html
new file mode 100644
index 0000000..b9cc23f
--- /dev/null
+++ b/static/index2.html
@@ -0,0 +1,192 @@
+<!--/*
+
+     _____          ___           ___           ___         ___         ___     
+    /  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
+   /  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
+  /  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
+ /__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
+ \  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
+  \  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
+   \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
+    \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
+     \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
+                   \__\/         \__\/         \__\/       \__\/       \__\/    
+
+(c)2010 dump.fm -->
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <title>dump.fm</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
+    <META NAME="description" CONTENT="Talk with pictures!">
+    <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+    <script type="text/javascript" src="/static/js/underscore-min.js"></script>
+    <script type="text/javascript" src="/static/js/sha1.js"></script>
+    <script type="text/javascript" src="/static/js/register.js"></script>
+    <script type="text/javascript" src="/static/js/cookie.js"></script>
+    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <script>
+      $(document).ready(initLoginForm);
+    </script>
+<script type="text/javascript">
+jQuery(window).load(function() {
+	jQuery('#slider').nivoSlider({
+		effect:'random',
+		slices:15,
+		animSpeed:500,
+		pauseTime:5000,
+		startSlide:0, //Set starting Slide (0 index)
+		directionNav:false, //Next & Prev
+		directionNavHide:false, //Only show on hover
+		controlNav:false, //1,2,3...
+		controlNavThumbs:false, //Use thumbnails for Control Nav
+		controlNavThumbsSearch: '.jpg', //Replace this with...
+		controlNavThumbsReplace: '_thumb.jpg', //...this in thumb Image src
+		keyboardNav:false, //Use left & right arrows
+		pauseOnHover:false, //Stop animation while hovering
+		manualAdvance:false, //Force manual transitions
+		captionOpacity:0.8, //Universal caption opacity
+		beforeChange: function(){},
+		afterChange: function(){},
+		slideshowEnd: function(){} //Triggers after all slides have been shown
+	});
+});
+</script>
+
+
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/reset.css">  
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css">
+<link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/header.css"> 
+<link rel="stylesheet" href="http://dump.fm/static/css/nivo-slider.css" type="text/css" media="screen" />
+<link rel="shortcut icon" href="static/favicon.ico">
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>dump.fm</title></head>
+</head>
+<body>
+
+<div id="rapper7">
+  <div id="header7">
+  <div id="logoicons">
+    <div id="logo7">
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/calm.gif">dump.fm</a></div>
+    </div>
+    <div class="white">
+      
+      <div id="bar7">    
+        <div style="float: left;">
+          <div align="center">
+
+
+      <a href="http://dump.fm/log" ><img src="/static/img/log.gif"width="20px" height="20px">&#9827; Log</a>
+        <a href="http://dump.fm/$user_nick$"><img src="$user_avatar$" width="19px" height="19px" /><img src="/static/img/profile.gif"width="22px" height="22px" />&#9829; Profile</a>
+                  <a href="http://dump.fm/directory"><img src="/static/img/directory.gif"width="20px" height="20px" />&#9824; Directory</a>
+             <a href="http://dump.fm/browser"><img src="/static/img/image_draw.gif"/>&#9830; Image Search</a>
+               
+
+          </div>            	    
+	  </div>
+        </div>
+      </div>
+    </div>
+
+    
+    <div id="topic"></div>
+<div id="dumplist">
+    <a href="http://news.dump.fm">news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
+
+
+        -<a href="http://vip.dump.fm/">  VIP </a>
+
+      </div>
+
+          <div id="logout7" class="white">   
+      <div align="center"> <a href="/logout"> Logout</a>       </div>
+
+      
+    </div>
+    <div align="center"><br /></div>
+    
+  </div>
+</div>
+
+<div id="rapper"></div><div id="idgi"></div>
+<div id="content" style="z-index:77;">
+
+<div id="main" align="center">
+  
+  <img src="/static/img/flyhorse.gif" id="horse" />
+
+  <div id="passwordreset">
+        <div align="center">
+        <label style="text-align:left;margin-bottom:-8px;">username</label>
+          <input type="text" class="field"id="nickInput" />
+          <br>
+          
+           <label style="text-align:left;margin-bottom:-8px;">password</label>
+          <input type="password" class="field" id="passwordInput" />
+          <br>
+           <label style="text-align:left;margin-bottom:-8px;">password2x</label>
+          <input type="password" class="field" id="passwordInput2" />
+      
+        <label style="text-align:left;margin-bottom:-8px;">email</label>
+          <input type="text" class="field"id="emailInput" />
+        </h1>
+
+                           </form>
+         
+        <br>
+           
+       
+         <div align="center">                  
+           <input type="submit" class="submit" id="submit" value="Register!" />
+        </div>
+      </div>
+    </div>
+  <img src="/static/img/furie1.png" id="furie1" />
+  <img src="/static/img/furie2.png" id="furie2" />
+  </div>
+
+</div>
+
+<div id="info">
+
+ <br>
+ <div id="talkaboutus">
+<div id="slider" style="display:none;">
+ <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
+ <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
+ </div>
+ <div id="footer" style="text-align: center">
+@2010 <a href="/">dump.fm</a>
+<a href="/about_us"><span style="word-spacing:normal;">About Us</span></a> 
+<a href="/terms">Terms</a>
+<a href="/privacy">Privacy</a></div>
+</div> 
+
+</div>
+</div>
+
+<div id="preload">
+  <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+</div>
+
+
+      <div id="preload">
+        <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+      </div>
+
+      <script type="text/javascript">
+        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+      </script>
+      <script type="text/javascript">
+        try {
+        var pageTracker = _gat._getTracker("UA-12364576-1");
+        pageTracker._trackPageview();
+        } catch(err) {}
+      </script>
+  </body>
+</html>
diff --git a/static/js/jquery.simplyscroll-1.0.4.min.js b/static/js/jquery.simplyscroll-1.0.4.min.js
new file mode 100755
index 0000000..e1aee43
--- /dev/null
+++ b/static/js/jquery.simplyscroll-1.0.4.min.js
@@ -0,0 +1,26 @@
+/*

+ * simplyScroll 1.0.4 - a scroll-tastic jQuery plugin

+ *

+ * http://logicbox.net/jquery/simplyscroll

+ * http://logicbox.net/blog/simplyscroll-jquery-plugin

+ * http://plugins.jquery.com/project/simplyScroll

+ *

+ * Copyright (c) 2009 Will Kelly - http://logicbox.net

+ *

+ * Dual licensed under the MIT (MIT-LICENSE.txt)

+ * and GPL (GPL-LICENSE.txt) licenses.

+ *

+ * Last revised: 03/07/2009 21:13

+ *

+ */

+

+(function($){$.fn.simplyScroll=function(o){return this.each(function(){new $.simplyScroll(this,o);});};var defaults={className:'simply-scroll',frameRate:24,speed:1,horizontal:true,autoMode:'off',pauseOnHover:true,startOnLoad:false,localJsonSource:'',flickrFeed:'',jsonImgWidth:240,jsonImgHeight:180};$.simplyScroll=function(el,o){var self=this;this.o=$.extend({},defaults,o||{});this.auto=this.o.autoMode!=="off"?true:false;this.$list=$(el);this.$list.addClass('simply-scroll-list').wrap('<div class="simply-scroll-clip"></div>').parent().wrap('<div class="'+this.o.className+' simply-scroll-container"></div>');if(!this.o.auto){this.$list.parent().parent().prepend('<div class="simply-scroll-forward"></div>').prepend('<div class="simply-scroll-back"></div>');}

+if(this.o.flickrFeed){$.getJSON(this.o.flickrFeed+"&format=json&jsoncallback=?",function(data){json=[];$.each(data.items,function(i,item){json.push({"src":item.media.m,"title":item.title,"link":item.link});});self.renderData(json);});}else if(this.o.localJsonSource){$.getJSON(this.o.localJsonSource,function(json){self.renderData(json);});}else{if(!this.o.startOnLoad){this.init();}else{$(window).load(function(){self.init();});}}};$.simplyScroll.fn=$.simplyScroll.prototype={};$.simplyScroll.fn.extend=$.simplyScroll.extend=$.extend;$.simplyScroll.fn.extend({init:function(){this.$items=this.$list.children();this.$clip=this.$list.parent();this.$container=this.$clip.parent();if(!this.o.horizontal){this.itemMax=this.$items[0].offsetHeight;this.clipMax=this.$clip.height();this.dimension='height';this.moveBackClass='simply-scroll-btn-up';this.moveForwardClass='simply-scroll-btn-down';}else{this.itemMax=this.$items[0].offsetWidth;this.clipMax=this.$clip.width();this.dimension='width';this.moveBackClass='simply-scroll-btn-left';this.moveForwardClass='simply-scroll-btn-right';}

+this.posMin=0;this.posMax=this.$items.length*this.itemMax;this.$list.css(this.dimension,this.posMax+'px');if(this.o.autoMode=='loop'){var addItems=Math.ceil(this.clipMax/this.itemMax);this.$items.slice(0,addItems).clone(true).appendTo(this.$list);this.posMax+=(this.clipMax-this.o.speed);this.$list.css(this.dimension,this.posMax+(this.itemMax*addItems)+'px');}

+this.interval=null;this.intervalDelay=Math.floor(1000/this.o.frameRate);while(this.itemMax%this.o.speed!==0){this.o.speed--;if(this.o.speed===0){this.o.speed=1;break;}}

+var self=this;this.trigger=null;this.funcMoveBack=function(){self.trigger=this;self.moveBack();};this.funcMoveForward=function(){self.trigger=this;self.moveForward();};this.funcMoveStop=function(){self.moveStop();};this.funcMoveResume=function(){self.moveResume();};if(this.auto){if(this.o.pauseOnHover){this.$clip.hover(this.funcMoveStop,this.funcMoveResume);}

+this.moveForward();}else{this.$btnBack=$('.simply-scroll-back',this.$container).addClass('simply-scroll-btn'+' '+this.moveBackClass+' '+'disabled').hover(this.funcMoveBack,this.funcMoveStop);this.$btnForward=$('.simply-scroll-forward',this.$container).addClass('simply-scroll-btn'+' '+this.moveForwardClass).hover(this.funcMoveForward,this.funcMoveStop);}},moveForward:function(){var self=this;this.movement='forward';if(this.trigger!==null){this.$btnBack.removeClass('disabled');}

+self.interval=setInterval(function(){if(!self.o.horizontal&&self.$clip[0].scrollTop<(self.posMax-self.clipMax)){self.$clip[0].scrollTop+=self.o.speed;}else if(self.o.horizontal&&self.$clip[0].scrollLeft<(self.posMax-self.clipMax)){self.$clip[0].scrollLeft+=self.o.speed;}else if(self.o.autoMode=='loop'){self.resetPos();}else{self.moveStop(self.movement);}},self.intervalDelay);},moveBack:function(){var self=this;this.movement='back';if(this.trigger!==null){this.$btnForward.removeClass('disabled');}

+self.interval=setInterval(function(){if(!self.o.horizontal&&self.$clip[0].scrollTop>0){self.$clip[0].scrollTop-=self.o.speed;}else if(self.o.horizontal&&self.$clip[0].scrollLeft>0){self.$clip[0].scrollLeft-=self.o.speed;}else if(self.o.autoMode=='loop'){self.resetPos();}else{self.moveStop(self.movement);}},self.intervalDelay);},moveStop:function(moveDir){clearInterval(this.interval);if(this.trigger!==null){if(typeof moveDir!="undefined"){$(this.trigger).addClass('disabled');}

+this.trigger=null;}

+if(this.auto){if(this.o.autoMode=='bounce'){moveDir=='forward'?this.moveBack():this.moveForward();}}},moveResume:function(){this.movement=='forward'?this.moveForward():this.moveBack();},resetPos:function(){if(!this.o.horizontal){this.$clip[0].scrollTop=0;}else{this.$clip[0].scrollLeft=0;}},renderData:function(json){if(json.length>0){var self=this;$.each(json,function(i,item){$("<img/>").attr({src:item.src,title:item.title,alt:item.title,width:self.o.jsonImgWidth,height:self.o.jsonImgHeight}).appendTo(self.$list);});this.init();}}});})(jQuery);
\ No newline at end of file
diff --git a/static/js/pichat.js b/static/js/pichat.js
index f8be6c1..84a9b79 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -612,7 +612,7 @@ function paletteBuildImageThumbs(){
 function paletteShow(){
   $("#palette").css("display", "block")
   if (isEmptyObject(RawFavs)) {
-    $('#palette-thumbs').html('<h1 style="width:300px;color:#000;letter-spacing:-1px;">This is where all the stuff you FAV goes!<br><br>To FAV a post click the little heart <img src="/static/img/thumbs/smallheart.gif"> next to a users name.<br><br> Everything you fav gets saved to your profile.. Have fun!</h1>');
+    $('#palette-thumbs').html('<div style="width:300px;color:#000;">This is where all the stuff you FAV goes!<br><br>To FAV a post click the little heart <img src="/static/img/thumbs/smallheart.gif"> next to a users name.<br><br> Everything you fav gets saved to your profile.. Have fun!</div>');
   } else {
     paletteBuildImageThumbs();
   }
diff --git a/template/banner.st b/template/banner.st
index ef40476..000dfd9 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -2,7 +2,7 @@
   <div id="header7">
   <div id="logoicons">
     <div id="logo7">
-  <div align="center"><a href="http://dump.fm">dump.fm</a></div>
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/calm.gif">dump.fm</a></div>
     </div>
     <div class="white">
       
@@ -20,7 +20,7 @@
 	    $else$
   
 
-<a href="/register"><img src="/static/img/ako.gif"width="21px" height="21px" /> Join the Conversation!</a>
+<a href="/register" id="registerlink"><img src="/static/img/ako.gif"width="21px" height="21px" /> Join the Conversation!</a>
    
 	    $endif$     
 
@@ -32,15 +32,17 @@
 
     
     <div id="topic"></div>
+       <div id="dumplist"> dump.fm:let pictures do the talking$if(isadmin)$ 
+    <a href="http://news.dump.fm">news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
 
-      $if(isadmin)$
-      <div id="vippp">
-        <a href="http://vip.dump.fm/"> &#x2605; VIP &#x2605; </a>
+
+        -<a href="http://vip.dump.fm/">  VIP </a>
+              $endif$
       </div>
-      $endif$
+$if(user_nick)$
           <div id="logout7" class="white">   
-      <div align="center">$if(user_nick)$ <a href="/logout"> Logout</a> $else$ $form_login()$ $endif$
-      </div>
+      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="logout7" class="white">   $form_login()$</div> $endif$
+
       
     </div>
     <div align="center"><br /></div>
diff --git a/template/butt.st b/template/butt.st
index b3f118f..93c22b4 100644
--- a/template/butt.st
+++ b/template/butt.st
@@ -2,183 +2,149 @@
   <head>
     <title>$nick$'s dump.fm</title>
     $head()$
-    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/profiletest.css">
     <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
-    <script src="/static/js/ajaxupload.js"></script>
-    <script>
-      jQuery(document).ready(initProfile);
-    </script> 
-    
-  </head>
-  <body>
-    $banner()$
-    <div id="chatrap">  
-      <div id="headerbar"></div>
+    <link rel="stylesheet" href="/static/css/nivo-slider.css" type="text/css" media="screen" />
+    <link rel="stylesheet" href="/static/css/indexxx.css" type="text/css" media="screen" />
+    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <script type="text/javascript" src="/static/js/jquery.simplyscroll-1.0.4.min.js"></script>
+<link rel="stylesheet" href="/static/css/jquery.simplyscroll-1.0.4.css" media="all" 
+type="text/css">
 
-      <div id="log">
-        <div id="loghead">
-        </div>
-        <br>
-        <div id="posts">
-          
-          <div id="cats">
-            $if(dumps)$
-            <div id="lolbanner">
-              <img src="/static/img/welcomebanner.gif">
-            </div>
-            
-            $dumps:{ d | $profile_dump(dump=d)$ }$
-            <div id="profile">
+<script type="text/javascript">
+(function() {
+	jQuery(function() { //on DOM ready
+		jQuery("#scroller").simplyScroll({
+		autoMode: 'loop',
+		pauseOnHover: false,
+			speed: 1
+		});
+	});
+})(jQuery);
 
-              <h2>$nick$</h2>
+</script>
 
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
-              </div>
-              $endif$
-
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-              
-              $if(is_home)$
-              <div id="avatar-editing" style="display: none">
-                <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
-              </div>
-              $endif$
-              
-	      <h3>contact info</h3>
-              $if(contact)$
-	      <div id="contact" class="linkify">$contact$</div>
-	      $else$
-	      <div><img id="contact" src="/static/img/noinfo.png"></div>
-	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
-              $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
-	      $endif$
+    <script type="text/javascript">
+    
+jQuery(window).load(function() {
+	jQuery('#slider').nivoSlider({
+		effect:'random',
+		slices:15,
+		animSpeed:500,
+		pauseTime:5000,
+		startSlide:0, //Set starting Slide (0 index)
+		directionNav:false, //Next & Prev
+		directionNavHide:false, //Only show on hover
+		controlNav:false, //1,2,3...
+		controlNavThumbs:false, //Use thumbnails for Control Nav
+		controlNavThumbsSearch: '.jpg', //Replace this with...
+		controlNavThumbsReplace: '_thumb.jpg', //...this in thumb Image src
+		keyboardNav:false, //Use left & right arrows
+		pauseOnHover:false, //Stop animation while hovering
+		manualAdvance:false, //Force manual transitions
+		captionOpacity:0.8, //Universal caption opacity
+		beforeChange: function(){},
+		afterChange: function(){},
+		slideshowEnd: function(){} //Triggers after all slides have been shown
+	});
+});
+</script>
+  </head>
+  <body class="profile">
+<div id="rapper7">
+  <div id="header7">
+  <div id="logoicons">
+    <div id="logo7">
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/calm.gif">dump.fm</a></div>
+    </div>
+    <div class="white">
+      
+      <div id="bar7">    
+        <div style="float: left;">
+              	    
+	  </div>
+        </div>
+      </div>
+    </div>
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
+    
+    <div id="topic"></div>
+       <div id="dumplist"> 
+    <a href="http://news.dump.fm">news</a> -  <a href="http://gossip.dump.fm">gossip</a> - <a href="http://art.dump.fm">art</a> - <a href="http://gif.dump.fm">gif</a> -  <a href="http://design.dump.fm">design</a> - <a href="http://fashion.dump.fm">fashion</a>
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
 
-	    $else$
+        -<a href="http://vip.dump.fm/">  VIP </a>
 
+      </div>
+$if(user_nick)$
+          <div id="logout7" class="white">   
+      <div align="center"> <a href="/logout"> Logout</a>       </div>$else$           <div id="logout7" class="white">   $form_login()$</div> $endif$
 
-           <div id="newfavs"><img src="http://dump.fm/static/img/thumbs/heartover.gif"> You have 27 new favs!</div>
-            <div id="newdogs"><img src="http://dump.fm/static/img/directory.gif"> You have 27 new favs!</div>
-	    <div id="activestuff">blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>blah blah<br><br>
-	    </div>
-	    <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-  <div>
-   $nick$'s first dump.fm post!  
+      
+    </div>
+    <div align="center"><br /></div>
+    
   </div>
-  <a href="/u/$nick$">  
-  <div id="logavatar">
-$if(dump.avatar)$
-  <img height="50" width="50" src="$dump.avatar$" /> 
-$else$  
-  <img height="50" width="50" src="/static/img/noinfo.png">  
-$endif$
-  </div></a>
-$if(dump.favorited)$
-  <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
-$else$
-  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
-$endif$
-  <div class="content2"><img src="/static/img/furieprofile.png"></div>
-<hr/>
-$share_buttons()$
 </div>
+<div id="clouds">
+        <div id="page">  
+    <div id="wrapper">  
+        <div id="container">  
+       
+<div id="leftstuff"><div id="signinrapper"><div id="signin"><p class="memebertxt">Already a member?</p></div>
+  <input type="text" id="nickInput" size="17" /><br>
+    <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+    <input type="password" id="passwordInput" size="17" /><br />
 
-	               <div id="profile">
-
-              <h2>$nick$</h2>
-
-              $if(isadmin)$
-               <div id="adminmute">
-              <a href="#" onclick="Admin.mute('$nick$'); return false">Mute $nick$!</a><br>
-              </div>
-              $endif$
-
-              $if(avatar)$
-              <img id="avatarPic" src="$avatar$" width="150px"/>
-              $else$
-              <img id="avatarPic" src="/static/img/noinfo.png">
-              $endif$
-              
-              $if(is_home)$
-              <div id="avatar-editing" style="display: none">
-                <input id="upload" value="Upload Icon" type="submit">
-                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
-              </div>
-              $endif$
-              
-	      <h3>contact info</h3>
-              $if(contact)$
-	      <div id="contact" class="linkify">$contact$</div>
-	      $else$
-	      <div><img id="contact" src="/static/img/noinfo.png"></div>
-	      $endif$            
-	      <br>
-              
-	      <h3>bio</h3>
-              $if(bio)$
-	      <div id="bio" class="linkify">$bio$</div>
-	      $else$
-	      <div><img id="bio" src="/static/img/noinfo.png"></div>
-	      $endif$
+    <input id="signin-submit" value="Sign In!" />
+    <div id="remember"><label>
+        <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+        Remember Me
+    </label>
+  <br>
+  <a href="/reset-request">Lost password?</a><br>
+</div>
+</div></div>
+<div id="rightstuff"><p class="heading1"><i>The internet is more fun with dump.fm!</p></i><br>
+    <input id="register-submit" value="Sign Up!" />
+</div>
+</div>
+<div id="divide"></div>
+<div id="aboutdump"><div id="aboutl">
+<div class="heading1">What's dump.fm?</div> 
+<p class="body1">
+dump.fm is a social network of images. Post pix from anywhere on the net, your computer or right from your webcam in real-time with other people. 
+</p>
+ <div id="talkaboutus">
+<div id="slider">
+ <a href="http://www.papermag.com/arts_and_style/2009/12/play-on-playas.php"target="_blank"><img src="/static/img/paperquote.png"alt="" /></a>
+ <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/metroquote.png"alt="" /></a>
+  <a href="http://www.metronews.ca/edmonton/comment/article/505801--trafficking-in-nostalgia-with-indiana-jones"target="_blank"><img src="/static/img/cnetquote.png"alt="" /></a>
+ </div></div>
+</div>
 
-              $if(is_home)$
-              <br>
-              <div id="edit-toggle"><a href="#">edit profile</a></div>
-              $endif$
+<div id="cloud"></div>
+<div id="aboutr" class="right">
+<div class="heading1">What's being dumped now...</div>
+<p class="body1">
+Here are some rad images being posted</p>
+ <div id="talkaboutus">
+<ul id="scroller">
+	<li><img src="http://www.gossipboulevard.com/wp-content/uploads/2009/06/paris_cristiano_breakup-150x150.jpg"height="100px"width="100px"></li>
+	<li><img src="http://hollywooddame.com/wp-content/uploads/2009/02/hayden-panettiere-dumps-milo-ventimiglia-3-150x150.jpg"height="100px"width="100px"></li>
+	<li><img src="http://th00.deviantart.net/fs5/150/i/2004/293/b/e/Ode_to_Junkyards_and_dumps__by_nove.png"height="100px"width="100px"></li>
+	<li><img src="http://th06.deviantart.net/fs38/150/i/2008/331/4/4/AA__AJ_PW_Oekaki_Dumps_by_Kai_dono.png" height="100px"width="100px"></li>
+		<li><img src="http://www.redhorsetruck.com/prodimages/thumbs/multipurposebody%20tn.jpg"height="100px"width="100px"></li>
+		
 
-              <br>
-              
-         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
-              
-              <div id="date">
-                <div type="text" id="datepicker"></div></div>
-	    </div>
-	    $endif$
-            
-	    <p>&nbsp;</p>
-	    <div id="pnav">
 
-              $if(next)$
-              <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div> 
-              $endif$
 
-              &nbsp;
-              $if(prev)$
-              <div id="pnavo">  <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
-              $endif$
-              
-              <br><br>
-            </div>
+</ul>  
+</div>
 
-            <div id="footer">
+</div></div></div></div></div>
+<div id="footerspace">
+            <div id="footeri">
               $footer()$
-            </div>
-          </div>
-    </div></div></div>
+            </div></div>
   </body>
 </html>
diff --git a/template/chat.st b/template/chat.st
index c54936b..a45ba4f 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -16,9 +16,10 @@
 
 <html>
 <head>
-  <title>dump.fm</title>
 $head()$
+  <title>dump.fm</title>
 
+<META name="keywords" content="credit, mortgage, dating, hot girls, hot guys, debt solutions, get rich quick"> 
   <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
   <script type="text/javascript" src="/static/js/invalid_domains.js"></script>
   <script type="text/javascript" src="/static/webcam/webcam.js"></script>
@@ -61,16 +62,20 @@ $endif$
 </head>
 <body>
 $banner()$
+
 $if(isadmin)$
 $tinychat()$
 $endif$
+
   <div id="chatrap">
 
       <div id="content">
         <div id="messagetabs"></div>
         <div id="rapper">
         </div>
-        <div id="userList">
+  
+        <div id="messagePane">
+              <div id="userList">
           $users: { u |
           <div class="username"><a href="/$u.nick$" target="_blank">
           $u.score_ent$
@@ -83,7 +88,6 @@ $endif$
             </div>
           }$
 	</div>
-        <div id="messagePane">
           <div id="messageList">
 $messages: { m |
             <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$">
@@ -100,6 +104,7 @@ $messages: { m |
 }$
             <hr />
           </div>
+          
           <div id="msgInputDiv">
               <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
                 <input id="msgSubmit" type="submit" value="Send"/>
@@ -119,7 +124,17 @@ $messages: { m |
   <div id="palette"><div id="palette-thumbs"></div></div>
   <div id="footerc">
     <p>
-$footer()$
+<script type="text/javascript"><!--
+google_ad_client = "pub-9863902168532765";
+/* 728x15, created 5/22/10 */
+google_ad_slot = "3981015107";
+google_ad_width = 728;
+google_ad_height = 15;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
     <p>
   </div>
 $preload()$
diff --git a/template/directory.st b/template/directory.st
index b6db5dd..d9129ff 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -56,14 +56,21 @@
           $else$
           <span>No more users!</span>
           $endif$
-          <div id="pnav">
-            $if(prev)$
-            <div id="pnavn"><a href="/directory$prev$">BACK</a></div>
-            $endif$
-            $if(users)$
-            <div id="pnavo"> <a href="/directory$next$">MOAR!</a></div>
-            $endif$            
-          </div>                
+
+  <div id="pnav">
+   $if(users)$
+              $if(next)$
+              <div id="pnavn"><a href="/directory$prev$">next &#9758;</a></div> 
+              $endif$
+  $endif$  
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/directory$prev$">&#9756; prev</a></div>
+              $endif$
+              
+              <br><br>
+            </div>
+
           <div id="footer">
             $footer()$
           </div>
diff --git a/template/form_login.st b/template/form_login.st
index 2f87e5a..4f07d0f 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -1,5 +1,5 @@
 <div id="login-container">
-  <div class="topnav"> Have an account?  <a href="login" class="signin"><span>Sign in</span></a> </div>
+  <div class="topnav"><a href="login" class="signin"><span>Sign in</span></a> </div>
   <fieldset id="signin_menu">
     <form onsubmit="return false">
       </p>
diff --git a/template/head.st b/template/head.st
index ec45d19..918dbc3 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,5 +1,5 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
+<meta name="keywords" content="dump.fm,mortgage, dating, hot girls, hot guys, debt solutions, get rich quick,buy gold,free stuff, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board,credit,">
 <meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js">
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
@@ -18,8 +18,7 @@ $if(isadmin)$
       type="text/css" media="all" />
 <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js"
         type="text/javascript"></script>
-<script src="/static/js/admin.js"
-        type="text/javascript"></script>
+<script src="/static/js/admin.js" type="text/javascript"></script>
 $endif$
 
 <link rel="shortcut icon" href="/static/favicon.ico">
diff --git a/template/log.st b/template/log.st
index de118ec..a6f3a07 100644
--- a/template/log.st
+++ b/template/log.st
@@ -2,21 +2,23 @@
   <head>
     <title>dump.fm log</title>
     $head()$
-    <link rel="stylesheet" type="text/css" href="/static/css/log.css">
+    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
     <script>
       jQuery(document).ready(initLog);
     </script>
   </head>
-  <body>
+ <body class="profile">
     $banner()$
     <div id="chatrap">
       <div id="log">   
-	<div id="loghead"></div>
         <br>
-        <div id="posts">  
-          <div id="lolbanner">
-            <img src="/static/img/welcomebanner.gif">
-          </div>
+                         <div id="lprofile">
+            <h2> $roomkey$ log </h2><br><h3></h3>      
+            </div>
+            
+             <div id="dposts">
+          <br>
+     
           $if(dumps)$
           $dumps: { d | $log_dump(dump=d)$ }$
           $if(json_tags)$
diff --git a/template/preload.st b/template/preload.st
index 3339e4e..b14f8b9 100644
--- a/template/preload.st
+++ b/template/preload.st
@@ -2,12 +2,6 @@
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big" />
    <img src="/static/img/upload.png" class="invisible" />
-   <img src="/static/img/dblue2.png" class="invisible" />
-<img src="/static/img/log.gif" class="invisible" />
-<img src="/static/img/directory.gif" class="invisible" />
-<img src="/static/img/image_draw.gif" class="invisible" />
-<img src="/static/img/door.gif" class="invisible" />
-<img src="/static/img/cambutton.png" class="invisible" />
-<img src="/static/img/urlbutton.png" class="invisible" />
-<img src="/static/img/upbutton.png" class="invisible" />
+   <img src="/static/img/fade-blue.png" class="invisible" />
+   <img src="/static/img/calm.gif" class="invisible" />
 </div>
\ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index 61be826..0634b05 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -78,6 +78,19 @@
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
 	    </div>
+ <div id="adsenseprofile" style="display:none;">
+	    <script type="text/javascript"><!--
+google_ad_client = "pub-9863902168532765";
+/* 200x200, created 5/23/10 */
+google_ad_slot = "0464631788";
+google_ad_width = 200;
+google_ad_height = 200;
+//-->
+</script>
+<script type="text/javascript"
+src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+</div> 
 
 	    $else$
 	    <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
diff --git a/template/tinychat.st b/template/tinychat.st
index 58ecba3..818d60a 100644
--- a/template/tinychat.st
+++ b/template/tinychat.st
@@ -5,8 +5,12 @@ $if(user_nick)$
   , nick: "$user_nick$"
   , oper: "none"
   , urlsuper: "http://dump.fm"
+  , join: "auto"
+  , nick: "dumpuser"
   };
+  
 </script>
+
 <script src="http://tinychat.com/js/embed.js"></script>
-<div id="chat-wrapper"><h3>Tinychat Friends<h3><div id="client"></div></div>
+<div id="tinychat-wrapper"><h3>Tinychat Friends<h3><div id="client"></div></div>
 $endif$