sostler prod commit

26 files changed, 1390 insertions, 215 deletions

diff --git a/docs/feeds.csv b/docs/feeds.csv
index ed6dfdf..3fbca67 100644
--- a/docs/feeds.csv
+++ b/docs/feeds.csv
@@ -44,21 +44,6 @@ art,,http://feeds2.feedburner.com/todayandtomorrow_net,,info@todayandtomorrow.ne
 art,,http://www.booooooom.com/feed/,,http://www.booooooom.com/canadian-photography-art-blog-contact-jeff-hamada-booooooom/

 art,,http://www.fecalface.com/SF/index.php?option=com_rss&feed=RSS2.0&no_html=1,,http://www.fecalface.com/SF/index.php?option=com_contact

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

-art,,http://davemisled.tumblr.com/rss,,davemisled@gmail.com

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

-art,,,,

 art,,,,

 art,,,,

 art,,,,

@@ -292,15 +277,12 @@ xxx,,,,
 xxx,,,,

 xxx,,,,

 xxx,,,,

-bieber,,http://justinbieberfansite.blogspot.com/feeds/posts/default,,fansofjustin@gmail.com

-bieber,,http://lesbianswholooklikejustinbieber.tumblr.com/rss,,

-bieber,,http://fvckyeahjustinbieber.tumblr.com/rss,,

-bieber,,,,

-bieber,,,,

-bieber,,,,

-bieber,,,,

-bieber,,,,

-toes,,http://blog.footsiebabes.com/feed?nats=MDowOjIx,,

-toes,,http://feeds.feedburner.com/StockingsWife,,

-toes,,,,

-toes,,,,
\ No newline at end of file
+deviantart,,http://backend.deviantart.com/rss.xml?q=special%3Anewest&type=deviation&offset=0,,

+,,,,

+,,,,

+,,,,

+,,,,

+,,,,

+,,,,

+,,,,

+,,,,
\ No newline at end of file
diff --git a/static/css/dump.css b/static/css/dump.css
index f6e4bce..e5c22de 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -166,7 +166,7 @@ font-size:20px;
 }
 .msgInput {
     min-width:500px;width:100%;
-	z-index:100;background-image:url(/static/img/e9.png);
+	z-index:100;background-color:#eff5fb;
 }
 #msginputrapper{
 margin-right:374;
@@ -179,20 +179,19 @@ height:0px;
 	width:120px;
 height:35px;
 right:285px;
-font-size:20px;background-image:url(/static/img/e9.png);
+font-size:20px;background-color:#eff5fb;
 top:0;
 	text-align:center;
 	z-index:100;
 border:1px solid #000;
 border-right:0px;
 	cursor:pointer;
-	background-color:#ffffff;
 	font-size:12px;
 	color:#000;
 }
 #webcam-button-upload{
 		border-top-right-radius:10px;
-	-webkit-border-top-right-radius:5px;background-image:url(/static/img/e9.png);
+	-webkit-border-top-right-radius:5px;background-color:#eff5fb;
 	-moz-border-radius-topright:5px;
 	border-bottom-right-radius:5px;
 	-webkit-border-bottom-right-radius:5px;
@@ -209,7 +208,6 @@ padding-bottom:1;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
-background-color:#fff;
 	font-size:12px;
 	color:#000;
 }
@@ -271,12 +269,11 @@ height:35px;
 background-position:center;
 right:125px;
 top:0;
-background-image:url(/static/img/e9.png);
+background-color:#eff5fb;
 padding-bottom:1;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
-background-color:#fff;
 	font-size:12px;
 	color:#000;
 border:1px solid #000;border-right:0px;
@@ -303,7 +300,7 @@ opacity:1;
 }
 
 #palette-button {
-border:1px solid #000;background-image:url(/static/img/e9.png);
+border:1px solid #000;background-color:#eff5fb;
 background-position:top right;
 	position:absolute;
 /*	display:inline-block;*/
@@ -315,7 +312,6 @@ background-position:top right;
 	text-align:center;
 	z-index:100;
 	cursor:pointer;
-  background-color:#fff;
 	font-size:12px;
 	color:#fff;
 border-right:0px;
@@ -475,6 +471,7 @@ background-color:#f3f3f3;
 	-moz-border-radius-bottomright:5px;
 }  
 #userList img{
+
     max-width:30px;
     width: expression(this.width > 30 ? 30: true);
     max-height:30px;
diff --git a/static/css/header.css b/static/css/header.css
index 7729cf2..493f4d4 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -19,7 +19,7 @@ background-color:#fff;
 border:1px solid #000;
 width:100%;
 min-width:600px;
-left:-1px;background-image:url(/static/img/blgrad.png);
+left:-1px;
 	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;
@@ -34,7 +34,7 @@ height:22;
 
 text-indent:14px;
 line-height:1.9;
-	left: 150px;
+	left: 125px;
 	margin-left: 0.1%;
 	margin-right: 8%;
 	letter-spacing:.2px;
@@ -62,7 +62,7 @@ padding:6px;background-color:#fff;
 }
 #logout7{
 	top:-1px;
-height:22px;
+height:16px;
 padding-left:4px;padding-right:3px;
 
 	border-bottom-left-radius:3px;
@@ -72,7 +72,7 @@ padding-left:4px;padding-right:3px;
 	font-size:1px;
 border-left:1px solid #999;
 border-bottom:1px solid #999;
-background-color:#fff;
+background-color:#eff5fb;
 	float:right;
 	font-family: Arial, Helvetica, sans-serif;
 	font-weight: normal;
@@ -97,11 +97,10 @@ color:#000;	text-shadow: 0px 1px 0px #fff;
  color: #fff;
 }
 #logo7{
-	margin-left: 0px;
-	margin-right: 10%;
+	margin-left: 10px;
 	z-index:1050;	text-decoration: none;
-	float:left;padding-right:1px;
-	margin-top:5px;
+	float:left;
+	margin-top:-1px;
 }
 #logo7 a{font-size:28px;
 
@@ -117,7 +116,7 @@ text-shadow: -0.5px -0.5px 0px #f0e;
 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:70px;line-height:1.1;
+padding-right:70px;line-height:1.1;background-color:#eff5fb;
 /*margin-left:40%;
 	border-bottom-left-radius:5px;
 	-webkit-border-bottom-left-radius:5px;
diff --git a/static/css/indextest.css b/static/css/indextest.css
new file mode 100644
index 0000000..05a4545
--- /dev/null
+++ b/static/css/indextest.css
@@ -0,0 +1,301 @@
+
+body {
+	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+	background-repeat:repeat-x;
+	background-position:top;
+}
+
+#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;
+  -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;
+border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+}
+input {
+	height:40px;
+	width:300px;
+	border:0px;
+	background:#e9e9e9;
+	margin:10px;
+padding-left:2px;
+	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: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;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	text-shadow:1px 1px 3px #000;
+z-index:20;
+}
+
+#remembermeInput {
+ width: 15px;
+ height: 15px;
+ margin: 1px;
+}
+
+label {
+ display:inline-block;
+ width: 300px;
+ text-align: right;
+ font-size: 12px;
+ color: #222;
+line-height:1.5;z-index:20;
+z-index:30;
+margin-top:-3px;
+margin-bottom:7px;
+}
+#remember{margin-top:-4px;z-index:30; margin-right:50px;text-align: right;display:inline-block;line-height:0.5;}
+#remember a{text-decoration:none;font-size:11px;display:block;z-index:30;}
+#furie3 {
+  position: absolute;
+  left:294px;
+  margin-top:250px;
+  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:-10;
+height:0px;
+	margin: 0 auto 0 auto;
+}
+
+#slider {
+	position:relative;
+z-index:-1;
+	//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/favicon.ico b/static/favicon.ico
index 932df2b..19db906 100644
--- a/static/favicon.ico
+++ b/static/favicon.ico
diff --git a/static/img/blue2fade.png b/static/img/blue2fade.png
new file mode 100644
index 0000000..7a4f218
--- /dev/null
+++ b/static/img/blue2fade.png
diff --git a/static/img/dumppixel.png b/static/img/dumppixel.png
new file mode 100644
index 0000000..981efe1
--- /dev/null
+++ b/static/img/dumppixel.png
diff --git a/static/img/dumppixellarge.png b/static/img/dumppixellarge.png
new file mode 100644
index 0000000..d01cbab
--- /dev/null
+++ b/static/img/dumppixellarge.png
diff --git a/static/img/fuck.png b/static/img/fuck.png
new file mode 100644
index 0000000..2093560
--- /dev/null
+++ b/static/img/fuck.png
diff --git a/static/img/image-01.jpg b/static/img/image-01.jpg
new file mode 100644
index 0000000..2a15326
--- /dev/null
+++ b/static/img/image-01.jpg
diff --git a/static/img/image-02.jpg b/static/img/image-02.jpg
new file mode 100644
index 0000000..36951c2
--- /dev/null
+++ b/static/img/image-02.jpg
diff --git a/static/img/image-03.jpg b/static/img/image-03.jpg
new file mode 100644
index 0000000..f3843c4
--- /dev/null
+++ b/static/img/image-03.jpg
diff --git a/static/img/image-04.jpg b/static/img/image-04.jpg
new file mode 100644
index 0000000..e26f5a8
--- /dev/null
+++ b/static/img/image-04.jpg
diff --git a/static/img/lilflag.png b/static/img/lilflag.png
new file mode 100644
index 0000000..4980989
--- /dev/null
+++ b/static/img/lilflag.png
diff --git a/static/img/pagination.png b/static/img/pagination.png
new file mode 100644
index 0000000..2853bd8
--- /dev/null
+++ b/static/img/pagination.png
diff --git a/static/img/slide1.png b/static/img/slide1.png
new file mode 100644
index 0000000..4f3b173
--- /dev/null
+++ b/static/img/slide1.png
diff --git a/static/img/slide2.png b/static/img/slide2.png
new file mode 100644
index 0000000..e451092
--- /dev/null
+++ b/static/img/slide2.png
diff --git a/static/img/slide3.png b/static/img/slide3.png
new file mode 100644
index 0000000..3d8bd3f
--- /dev/null
+++ b/static/img/slide3.png
diff --git a/static/img/slide4.png b/static/img/slide4.png
new file mode 100644
index 0000000..87c0be9
--- /dev/null
+++ b/static/img/slide4.png
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index 313b2c7..e23906f 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -12,6 +12,7 @@ var InvalidDomains = [
     "http://images.nintendolife.com",
     "http://img.bettersoft.de",
     "http://izismile.com",
+    "http://izismile.com",
     "http://izismile.com/img",
     "http://mytextgraphics.com",
     "http://nexus404.com",
@@ -66,9 +67,12 @@ var InvalidDomains = [
     "http://www.onemetal.com",
     "http://static.funnyjunk.com",
     "http://www.whimsical-wits.com",
+    "http://madsenworld.dk",
+    "http://www.oafe.net",
+    "http://www.mrbalihai.com",
+    "http://www.digyourowngrave.com",
     "http://www.kaitaia.com",
     "http://carsdriveingallery.com",
     "http://xxxspacegirls.us",
-    "http://www.newlog.com.ar",
-    "http://www.lift-4-life.com"
+    "http://www.newlog.com.ar"
 ];
\ No newline at end of file
diff --git a/static/js/loopedslider.js b/static/js/loopedslider.js
new file mode 100644
index 0000000..a544a64
--- /dev/null
+++ b/static/js/loopedslider.js
@@ -0,0 +1,261 @@
+/*
+ * 	loopedSlider 0.5.6 - jQuery plugin
+ *	written by Nathan Searles	
+ *	http://nathansearles.com/loopedslider/
+ *
+ *	Copyright (c) 2009 Nathan Searles (http://nathansearles.com/)
+ *	Dual licensed under the MIT (MIT-LICENSE.txt)
+ *	and GPL (GPL-LICENSE.txt) licenses.
+ *
+ *	Built for jQuery library
+ *	http://jquery.com
+ *	Compatible with jQuery 1.3.2+
+ *
+ */
+
+/*
+ *	markup example for $("#loopedSlider").loopedSlider();
+ *
+ *	<div id="loopedSlider">	
+ *		<div class="container">
+ *			<div class="slides">
+ *				<div><img src="01.jpg" alt="" /></div>
+ *				<div><img src="02.jpg" alt="" /></div>
+ *				<div><img src="03.jpg" alt="" /></div>
+ *				<div><img src="04.jpg" alt="" /></div>
+ *			</div>
+ *		</div>
+ *		<a href="#" class="previous">previous</a>
+ *		<a href="#" class="next">next</a>	
+ *	</div>
+ *
+*/
+
+if(typeof jQuery != 'undefined') {
+	jQuery(function($) {
+		$.fn.extend({
+			loopedSlider: function(options) {
+				var settings = $.extend({}, $.fn.loopedSlider.defaults, options);
+			
+				return this.each(
+					function() {
+					if($.fn.jquery < '1.3.2') {return;}
+					var $t = $(this);
+					var o = $.metadata ? $.extend({}, settings, $t.metadata()) : settings;
+					
+					var distance = 0;
+					var times = 1;
+					var slides = $(o.slides,$t).children().size();
+					var width = $(o.slides,$t).children().outerWidth();
+					var position = 0;
+					var active = false;
+					var number = 0;
+					var interval = 0;
+					var restart = 0;
+					var pagination = $("."+o.pagination+" li a",$t);
+
+					if(o.addPagination && !$(pagination).length){
+						var buttons = slides;
+						$($t).append("<ul class="+o.pagination+">");
+						$(o.slides,$t).children().each(function(){
+							if (number<buttons) {
+								$("."+o.pagination,$t).append("<li><a rel="+(number+1)+" href=\"#\" >"+(number+1)+"</a></li>");
+								number = number+1;
+							} else {
+								number = 0;
+								return false;
+							}
+							$("."+o.pagination+" li a:eq(0)",$t).parent().addClass("active");
+						});
+						pagination = $("."+o.pagination+" li a",$t);
+					} else {
+						$(pagination,$t).each(function(){
+							number=number+1;
+							$(this).attr("rel",number);
+							$(pagination.eq(0),$t).parent().addClass("active");
+						});
+					}
+
+					if (slides===1) {
+						$(o.slides,$t).children().css({position:"absolute",left:position,display:"block"});
+						return;
+					}
+
+					$(o.slides,$t).css({width:(slides*width)});
+
+					$(o.slides,$t).children().each(function(){
+						$(this).css({position:"absolute",left:position,display:"block"});
+						position=position+width;
+					});
+
+					$(o.slides,$t).children(":eq("+(slides-1)+")").css({position:"absolute",left:-width});
+
+					if (slides>3) {
+						$(o.slides,$t).children(":eq("+(slides-1)+")").css({position:"absolute",left:-width});
+					}
+
+					if(o.autoHeight){autoHeight(times);}
+
+					$(".next",$t).click(function(){
+						if(active===false) {
+							animate("next",true);
+							if(o.autoStart){
+								if (o.restart) {autoStart();}
+								else {clearInterval(sliderIntervalID);}
+							}
+						} return false;
+					});
+
+					$(".previous",$t).click(function(){
+						if(active===false) {	
+							animate("prev",true);
+							if(o.autoStart){
+								if (o.restart) {autoStart();}
+								else {clearInterval(sliderIntervalID);}
+							}
+						} return false;
+					});
+
+					if (o.containerClick) {
+						$(o.container,$t).click(function(){
+							if(active===false) {
+								animate("next",true);
+								if(o.autoStart){
+									if (o.restart) {autoStart();}
+									else {clearInterval(sliderIntervalID);}
+								}
+							} return false;
+						});
+					}
+
+					$(pagination,$t).click(function(){
+						if ($(this).parent().hasClass("active")) {return false;}
+						else {
+							times = $(this).attr("rel");
+							$(pagination,$t).parent().siblings().removeClass("active");
+							$(this).parent().addClass("active");
+							animate("fade",times);
+							if(o.autoStart){
+								if (o.restart) {autoStart();}
+								else {clearInterval(sliderIntervalID);}
+							}
+						} return false;
+					});
+
+					if (o.autoStart) {
+						sliderIntervalID = setInterval(function(){
+							if(active===false) {animate("next",true);}
+						},o.autoStart);
+						function autoStart() {
+							if (o.restart) {
+							clearInterval(sliderIntervalID,interval);
+							clearTimeout(restart);
+								restart = setTimeout(function() {
+									interval = setInterval(	function(){
+										animate("next",true);
+									},o.autoStart);
+								},o.restart);
+							} else {
+								sliderIntervalID = setInterval(function(){
+									if(active===false) {animate("next",true);}
+								},o.autoStart);
+							}
+						};
+					}
+
+					function current(times) {
+						if(times===slides+1){times = 1;}
+						if(times===0){times = slides;}
+						$(pagination,$t).parent().siblings().removeClass("active");
+						$(pagination+"[rel='" + (times) + "']",$t).parent().addClass("active");
+					};
+
+					function autoHeight(times) {
+						if(times===slides+1){times=1;}
+						if(times===0){times=slides;}	
+						var getHeight = $(o.slides,$t).children(":eq("+(times-1)+")",$t).outerHeight();
+						$(o.container,$t).animate({height: getHeight},o.autoHeight);					
+					};		
+
+					function animate(dir,clicked){	
+						active = true;	
+						switch(dir){
+							case "next":
+								times = times+1;
+								distance = (-(times*width-width));
+								current(times);
+								if(o.autoHeight){autoHeight(times);}
+								if(slides<3){
+									if (times===3){$(o.slides,$t).children(":eq(0)").css({left:(slides*width)});}
+									if (times===2){$(o.slides,$t).children(":eq("+(slides-1)+")").css({position:"absolute",left:width});}
+								}
+								$(o.slides,$t).animate({left: distance}, o.slidespeed,function(){
+									if (times===slides+1) {
+										times = 1;
+										$(o.slides,$t).css({left:0},function(){$(o.slides,$t).animate({left:distance})});							
+										$(o.slides,$t).children(":eq(0)").css({left:0});
+										$(o.slides,$t).children(":eq("+(slides-1)+")").css({ position:"absolute",left:-width});				
+									}
+									if (times===slides) $(o.slides,$t).children(":eq(0)").css({left:(slides*width)});
+									if (times===slides-1) $(o.slides,$t).children(":eq("+(slides-1)+")").css({left:(slides*width-width)});
+									active = false;
+								});					
+								break; 
+							case "prev":
+								times = times-1;
+								distance = (-(times*width-width));
+								current(times);
+								if(o.autoHeight){autoHeight(times);}
+								if (slides<3){
+									if(times===0){$(o.slides,$t).children(":eq("+(slides-1)+")").css({position:"absolute",left:(-width)});}
+									if(times===1){$(o.slides,$t).children(":eq(0)").css({position:"absolute",left:0});}
+								}
+								$(o.slides,$t).animate({left: distance}, o.slidespeed,function(){
+									if (times===0) {
+										times = slides;
+										$(o.slides,$t).children(":eq("+(slides-1)+")").css({position:"absolute",left:(slides*width-width)});
+										$(o.slides,$t).css({left: -(slides*width-width)});
+										$(o.slides,$t).children(":eq(0)").css({left:(slides*width)});
+									}
+									if (times===2 ) $(o.slides,$t).children(":eq(0)").css({position:"absolute",left:0});
+									if (times===1) $(o.slides,$t).children(":eq("+ (slides-1) +")").css({position:"absolute",left:-width});
+									active = false;
+								});
+								break;
+							case "fade":
+								times = [times]*1;
+								distance = (-(times*width-width));
+								current(times);
+								if(o.autoHeight){autoHeight(times);}
+								$(o.slides,$t).children().fadeOut(o.fadespeed, function(){
+									$(o.slides,$t).css({left: distance});
+									$(o.slides,$t).children(":eq("+(slides-1)+")").css({left:slides*width-width});
+									$(o.slides,$t).children(":eq(0)").css({left:0});
+									if(times===slides){$(o.slides,$t).children(":eq(0)").css({left:(slides*width)});}
+									if(times===1){$(o.slides,$t).children(":eq("+(slides-1)+")").css({ position:"absolute",left:-width});}
+									$(o.slides,$t).children().fadeIn(o.fadespeed);
+									active = false;
+								});
+								break; 
+							default:
+								break;
+							}					
+						};
+					}
+				);
+			}
+		});
+		$.fn.loopedSlider.defaults = {
+			container: ".container", //Class/id of main container. You can use "#container" for an id.
+			slides: ".slides", //Class/id of slide container. You can use "#slides" for an id.
+			pagination: "pagination", //Class name of parent ul for numbered links. Don't add a "." here.
+			containerClick: true, //Click slider to goto next slide? true/false
+			autoStart: 5000, //Set to positive number for true. This number will be the time between transitions.
+			restart: 0, //Set to positive number for true. Sets time until autoStart is restarted.
+			slidespeed: 300, //Speed of slide animation, 1000 = 1second.
+			fadespeed: 200, //Speed of fade animation, 1000 = 1second.
+			autoHeight: 1000, //Set to positive number for true. This number will be the speed of the animation.
+			addPagination: false //Add pagination links based on content? true/false
+		};
+	});
+}
\ No newline at end of file
diff --git a/static/newindex.html b/static/newindex.html
new file mode 100644
index 0000000..e06d8f7
--- /dev/null
+++ b/static/newindex.html
@@ -0,0 +1,329 @@
+<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/sha1.js"></script>
+    <script type="text/javascript" src="/static/js/home.js"></script>
+    <link rel="shortcut icon" href="/static/favicon.ico">
+	<script src="/static/js/loopedslider.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="/static/js/jquery.nivo.slider.pack.js"></script>
+    <link rel="stylesheet" href="/static/css/nivo-slider.css" type="text/css" media="screen" />
+    <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>
+<style>
+
+
+
+
+
+
+
+
+
+
+body{margin:0px;
+background-color:#fff;
+	font-family:Arial, Helvetica, sans-serif;	background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+}
+A:link {text-decoration: none}
+A:visited {text-decoration: none}
+A:active {text-decoration: none}
+#rapper{
+width:800px;
+	margin: 0 auto 0 auto;
+
+background-position:top center;
+	background-repeat:no-repeat;
+	box-shadow: 0 0 10px #000;
+  -webkit-box-shadow: 0 0 10px #000;
+  -moz-box-shadow: 0 0 10px #000;
+}
+#toplogo{
+top:0px;
+width:800px;
+background-image:url(/static/img/blue2fade.png);
+}
+#bottomcontainer{
+width:800px;
+
+}
+#signin{
+background-color:#eff5fb;
+float:right;
+width:201px;
+height:225px;
+top:0px;
+padding:15px;
+padding-top:10px;
+font-size:10px;
+text-indent:5px;
+border:1px solid #000;border-right:0px solid #000;
+
+}
+#membertxt{
+background-color:#fff;
+padding:5px;
+border:1px solid black;
+margin-top:-22px;
+z-index:5;
+width:100;
+}
+
+#wtftxt{
+background-color:#fff;
+padding:5px;
+padding-left:15px;
+padding-right:15px;
+font-size:24px;
+border:1px solid black;
+margin-top:-56px;
+z-index:5;
+float:left;
+background-image:url(/static/img/ylgrad.png);
+}
+
+input {
+	height:40px;
+	width:190px;
+float:right;
+padding-left:2px;
+	border:0px;
+border:1px solid #000;
+	margin:5px;
+	color:#000;z-index:20;
+	font-size:20px;
+	
+}
+.no-cursor { cursor: none; }
+.invisible { display: none !important; }
+#cursor-big { position: absolute; z-index: 1000; }
+
+label {
+ display:inline-block;
+ font-size: 13px;
+ color: #222;
+float:right;
+margin-bottom:4px;
+}
+#signin-submit {
+	display:inline-block;
+
+  height:33px;float:left;
+  font-size:20px;
+width:190px;
+  font-weight:bold;
+  word-spacing:7;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#000;
+float:right;
+border:1px solid #000;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+
+z-index:20;
+}
+#remember{
+float:right;padding-top:5px;
+top:0px;display:block;
+margin-right:5px;
+}
+#remember a{text-decoration:none;font-size:11px;float:right;}
+#remembermeInput {
+ width: 15px;
+ height: 15px;
+ margin: 1px;
+}
+#wtf{
+float:left;
+width:538px;
+position:absolute;
+border:1px solid #000;
+border-left:0px solid #000;
+padding:15px;
+height:220px;
+background-color:#eff5fb;
+}
+#toptxt{
+padding:10px;
+text-align:center;
+}
+#lilflag{
+background-image:url(/static/img/lilflag.png);
+width: 173px; height: 59px;
+top:15px;
+padding-left:20px;
+position:absolute;
+color:#fff;
+padding-top:1px;
+text-align:left;
+word-spacing:8px;padding-right:10px;
+font-size:19px;
+margin-left:-13px;text-decoration:none;
+}
+#lilflag a:link {
+text-decoration:none;
+}
+#footer{
+padding-top:15px;
+padding-bottom:5px;
+text-align: center;
+color:#000;
+font-size:11px;
+word-spacing:30px;
+	margin: 0 auto 0 auto;
+background-color:#eff5fb;
+margin-top:250px;
+width:798px;
+}
+#footer a{color:#000;text-decoration:none;}
+
+
+
+	/*
+		 * Required 
+		*/
+		.container { margin-top:8px;border:01px solid #666;width:538px; height:205px; overflow:hidden; position:relative; cursor:pointer; }
+		.slides { position:absolute; top:0; left:0; }
+		.slides div { position:absolute; top:0; width:538px; display:none; }
+		/*
+		 * Optional
+		*/
+
+		blockquote, q { quotes: none; }
+		:focus { outline: 0; }
+		ins { text-decoration: none; }
+		del { text-decoration: line-through; }
+		table { border-collapse: collapse; border-spacing: 0; }
+		#loopedSlider {width:610px; position:relative; clear:both; }
+		ul.pagination { list-style-type:none; margin:0; padding:0; margin:9px auto; width:132px; }
+		ul.pagination li { float:left; margin:0 5px;display:none; }	
+		ul.pagination a { display:block; width:12px; padding-top:12px; height:0; overflow:hidden; background-image:url(/static/img/pagination.png); background-position:0 0; background-repeat:no-repeat;}
+
+
+
+
+
+</style>
+</head>
+<body>
+
+<div id="rapper">
+<div id="toplogo">
+<img src="/static/img/dumppixellarge.png">
+<a href="/static/slowthgoth.html">
+<div id="lilflag">
+HOME OF THE SLOTHGOTH!!!!!
+</div>
+</a>
+</div>
+
+<div id="bottomcontainer">
+<div id="wtf">
+<a href="/register"><div id="wtftxt">
+Click here to Register!
+</div>
+</a>
+<div id="loopedSlider">	
+	<div class="container">
+		<div style="width: 2152px; left: 0px;" class="slides">
+			<div style="position: absolute; left: 0px; display: block;"><img 
+src="/static/img/slide1.png" alt="dump.fm" width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 538px; display: block;"><img 
+src="/static/img/slide2.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 1076px; display: block;"><img 
+src="/static/img/slide3.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+			<div style="position: absolute; left: 1614px; display: block;"><img 
+src="/static/img/slide4.png" alt="dump.fm"  width="538px" 
+height="205"></div>
+		</div>
+	</div>
+	
+	<ul class="pagination">
+		<li class=" "><a rel="1" href="#">1</a></li>
+		<li class=" "><a rel="2" href="#">2</a></li>
+		<li class=" "><a rel="3" href="#">3</a></li>
+		<li class="  active"><a rel="4" href="#">4</a></li>
+	</ul>	
+</div>
+<script type="text/javascript" charset="utf-8">
+	jQuery(function(){
+		jQuery('#loopedSlider').loopedSlider();
+	});
+</script>
+
+</div>
+
+<div id="signin">
+<div id="membertxt">Already a member?</div><br><br>
+ <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 />
+
+    <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="footer">
+@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 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/testindex.html b/static/testindex.html
new file mode 100644
index 0000000..0d24e57
--- /dev/null
+++ b/static/testindex.html
@@ -0,0 +1,139 @@
+<!--/*
+
+     _____          ___           ___           ___         ___         ___     
+    /  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
+   /  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
+  /  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
+ /__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
+ \  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
+  \  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
+   \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
+    \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
+     \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
+                   \__\/         \__\/         \__\/       \__\/       \__\/    
+
+(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/sha1.js"></script>
+    <script type="text/javascript" src="/static/js/home.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>
+<script type="text/javascript">
+$(document).ready(function() {
+	jQuery(".btn-slide").click(function() {
+		jQuery("#panel").slideToggle("slow");
+		jQuery(this).toggleClass("active"); return false;
+	});
+});
+</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" 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">
+<title>dump.fm</title></head>
+</head>
+<body>
+
+<div id="content" style="z-index:77;">
+
+<div id="main" align="center">
+  
+  <div id="registerbox">
+    <div id="logo-and-text">
+        <div align="center">
+        <a href="/register" style="text-decoration:none;">Click here to Register!</a> <br>
+        </div>
+      </div>
+    </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 />
+
+    <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="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> 
+<br><br>
+</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/template/banner.st b/template/banner.st
index f541393..9ee037a 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"><img src="/static/img/calm.gif">dump.fm</a></div>
+  <div align="center"><a href="http://dump.fm"><img src="/static/img/dumppixel.png"></a></div>
     </div>
     <div class="white">
       
diff --git a/template/butt.st b/template/butt.st
index 93c22b4..e97390e 100644
--- a/template/butt.st
+++ b/template/butt.st
@@ -1,150 +1,302 @@
-<html>
-  <head>
-    <title>$nick$'s dump.fm</title>
-    $head()$
-    <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
-    <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">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> 
+<html> 
+<head> 
+<title>dump.fm image vortex</title>
+<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="/static/js/pichat.butt.js"></script>
+<script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
+<script type="text/javascript" src="/static/js/sha1.js"></script>
+<link rel="stylesheet" type="text/css" href="/static/css/reset.css">
+<link rel="stylesheet" type="text/css" href="/static/css/header.css">
+$if(!user_nick)$
+<link href="/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
+$endif$
 
-<script type="text/javascript">
-(function() {
-	jQuery(function() { //on DOM ready
-		jQuery("#scroller").simplyScroll({
-		autoMode: 'loop',
-		pauseOnHover: false,
-			speed: 1
-		});
-	});
-})(jQuery);
-
-</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>
-  </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>
-
-    
-    <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>
+$if(isadmin)$
+<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css"
+      type="text/css" media="all" />
+<link rel="stylesheet" href="/static/css/admin.css"
+      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>
+$endif$
+$if(!user_avatar)$
+  <link rel="stylesheet" type="text/css" href="/static/css/dumpnewuser.css">
+$endif$
+  <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
+  <script type="text/javascript" src="/static/webcam/webcam.js"></script>
+  <script type="text/javascript" src="/static/js/tooltip.js"></script>
+  <script type="text/javascript" src="/static/js/away.js"></script>
+  <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
 $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>
-    <div align="center"><br /></div>
-    
-  </div>
-</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 />
-
-    <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>
+  <script type="text/javascript" src="/json/$user_nick$/favorites"></script>
+$endif$
+  <script>
+    jQuery(document).ready(initChat);
+    var Nick = $json_user_nick$;
+    var Room = $json_room_key$;
+    var Timestamp = $timestamp$;
+$if(isadmin)$
+    var IsAdmin = true;
+$else$
+    var IsAdmin = false;
+$endif$
+    if (Nick) {
+      jQuery(document).ready(function() { setupUpload('upload', Room); });
+    }
+    function showAlert() { alert('MUST LOGIN'); }
+    var newwindow;
+    function pop(url) {
+      newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
+      if (window.focus) {newwindow.focus()}
+    } 
+  </script>
 
-<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>
-		
+<style type="text/css"> 
+	html { 
+		overflow: hidden; 
+	} 
+	body { 
+		margin: 0px; 
+		padding: 0px; 
+		background: #111; 
+		position: absolute; 
+		width: 100%; 
+		height: 100%; 
 
+		cursor: crosshair; 
+	} 
+	#canvas { 
+		position:absolute; 
+		left: 0%; 
+		top: 0%; 
+		width: 100%; 
+		height: 100%; 
+		background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
+		overflow: hidden; 
+	} 
+	#canvas img { 
+		position: absolute; 
+		background: #666; 
+		overflow: hidden; 
+		cursor: pointer; 
+		left: 100%; 
+		border-color: #000; 
+		border-style: solid; 
+		border-width: 1px; 
+		-ms-interpolation-mode:nearest-neighbor; 
+	} 
+	#canvas span { 
+		position: absolute; 
+		color: #9C9; 
+		font-family: 'courier new', typewriter, matrix, monospace; 
+		font-size: 0px; 
+		white-space: nowrap; 
+		left: -1000px; 
+		background: #010; 
+		filter: alpha(opacity=90); 
+		opacity: 0.9; 
+	} 
+</style> 
+<script type="text/javascript"> 
+// ================================================== 
+// script realized by G�rard Ferrandez - June 2006 
+// http://www.dhteumeuleu.com 
+// ================================================== 
+ 
+id = function(o) { return document.getElementById(o); } 
+px = function (x) {	return ''.concat(Math.round(x), 'px'); } 
+ 
+////////////////////////////////////////////////////////////////////////////// 
+function resize() {	gf.resize(); } 
+onresize = resize; 
+ 
+document.onmousemove = function(e) 
+{ 
+	if(window.event) e=window.event; 
+	gf.xm = (e.x || e.clientX) - gf.nx - gf.nw * .5; 
+	gf.ym = (e.y || e.clientY) - gf.ny - gf.nh * .5; 
+} 
+ 
+////////////////////////////////////////////////////////////////////////////// 
+var gf = { 
+	O    : [], 
+	cont : 0, 
+	N    : 0, 
+	S    : 0, 
+	img  : 0, 
+	spa  : 0, 
+	xm   : 0, 
+	ym   : 0, 
+	nx   : 0, 
+	ny   : 0, 
+	nw   : 0, 
+	nh   : 0, 
+	cx   : 0, 
+	cy   : 0, 
+	zoom : 1, 
+	x    : 0, 
+	y    : 0, 
+	z    : -40000, 
+	xt   : 0, 
+	yt   : 0, 
+	zt   : 0, 
+////////////////////////////////////////////////////////////////////////////// 
+	resize : function () 
+	{ 
+		var o   = id('canvas'); 
+		gf.nx   = o.offsetLeft; 
+		gf.ny   = o.offsetTop; 
+		gf.nw   = o.offsetWidth; 
+		gf.nh   = o.offsetHeight; 
+		gf.zoom = gf.nh / 700; 
+	}, 
+ 
+	CObj : function (n) 
+	{ 
+		this.n                = n; 
+		this.x                = gf.zoom * Math.random() * gf.nw * 2 - gf.nw; 
+		this.y                = gf.zoom * Math.random() * gf.nh * 2 - gf.nh; 
+		this.z                = Math.round(n * (10000 / gf.N)); 
+		this.w                = gf.img[n].width; 
+		this.h                = gf.img[n].height; 
+		this.oxt              = gf.spa[n]; 
+		this.oxs              = this.oxt.style; 
+		this.txt              = gf.spa[n].innerHTML; 
+		this.oxt.innerHTML    = ""; 
+		this.obj              = gf.img[n]; 
+		this.obs              = this.obj.style; 
+		this.obj.parent       = this; 
+		this.obj.onclick      = function() { this.parent.click(); } 
+		this.obj.ondrag       = function() { return false; } 
+		this.oxt.style.zIndex = this.obj.style.zIndex = Math.round(1000000 - this.z); 
+		this.F                = false; 
+		this.CF               = 100; 
+		this.sto              = []; 
+ 
+		this.anim = function() 
+		{ 
+			var f = 700 + this.z - gf.z; 
+			if (f > 0) 
+			{ 
+				var d               = 1000 / f; 
+				var X               = gf.nw * .5 + ((this.x - gf.x - gf.cx) * d); 
+				var Y               = gf.nh * .5 + ((this.y - gf.y - gf.cy) * d); 
+				var W               = d * this.w * gf.zoom; 
+				var H               = d * this.h * gf.zoom; 
+				this.obs.left       = px(X - W * .5); 
+				this.obs.top        = px(Y - H * .5); 
+				this.obs.width      = px(W); 
+				this.obs.height     = px(H); 
+				this.oxs.visibility = (this.CF-- > 0 && Math.random() > .9) ? "hidden" : "visible"; 
+				this.oxs.left       = px(X - W * .5); 
+				this.oxs.top        = px(Y + H * .5); 
+				if((gf.zt - gf.z) < 20) 
+				{ 
+					if(!this.F) 
+					{ 
+						this.F            = true; 
+						this.CF           = Math.random() * 200; 
+						this.oxs.fontSize = px(1 + d * 20 * gf.zoom); 
+						var T             = ""; 
+						var tn            = this.txt.length; 
+						for(var i = 0; i < tn; i++) 
+						{ 
+							T = T.concat(this.txt.charAt(i)); 
+							this.sto[i] = setTimeout('gf.O['.concat(n, '].oxt.innerHTML = "', T.concat("_"), '";'), Math.round(f / 4) + 32 * i); 
+						} 
+					} 
+				} 
+				else 
+				{ 
+					this.F = false; 
+					this.oxt.innerHTML = ""; 
+				} 
+			} 
+			else 
+			{ 
+				this.x  = gf.zoom * Math.random() * gf.nw * 2 - gf.nw; 
+				this.y  = gf.zoom * Math.random() * gf.nh * 2 - gf.nh; 
+				this.z += 10000; 
+				this.oxs.zIndex = this.obs.zIndex = Math.round(1000000 - this.z); 
+			} 
+		} 
+ 
+		this.cto = function() 
+		{ 
+			var i = this.txt.length; 
+			while (i--) clearTimeout(this.sto[i]); 
+		} 
+ 
+		this.click = function() 
+		{ 
+			var i = gf.N; 
+			while (i--) gf.O[i].cto(); 
+			if(gf.S != this) 
+			{ 
+				gf.xt = this.x; 
+				gf.yt = this.y; 
+				gf.zt = this.z; 
+				gf.S  = this; 
+			} 
+			else 
+			{ 
+				gf.S   = 0; 
+				gf.zt += 1600; 
+			} 
+		} 
+	}, 
+ 
+	init : function () 
+	{ 
+		gf.cx   = gf.nw / 2; 
+		gf.cy   = gf.nh / 2; 
+		gf.cont = id("canvas"); 
+		gf.img  = id("canvas").getElementsByTagName("img"); 
+		gf.spa  = id("canvas").getElementsByTagName("span"); 
+		gf.N    = gf.img.length; 
+		for (var i = 0; i < gf.N; i++) gf.O[i] = new gf.CObj(i); 
+		gf.run(); 
+		gf.O[0].click(); 
+	}, 
+ 
+	run : function () 
+	{ 
+		gf.cx += (gf.xm - gf.cx) * .1; 
+		gf.cy += (gf.ym - gf.cy) * .1; 
+		gf.x  += (gf.xt - gf.x)  * .05; 
+		gf.y  += (gf.yt - gf.y)  * .05; 
+		gf.z  += (gf.zt - gf.z)  * .05; 
+		var i = gf.N; 
+		while (i--) gf.O[i].anim(); 
+		setTimeout(gf.run, 16); 
+	} 
+} 
+ 
+onload = function() { 
+	resize(); 
+	gf.init(); 
+} 
+ 
+</script> 
+</head> 
+ 
+<body> 
+ 
+<div id="canvas"> 
+$messages: { m |
+<img src="$m.content$"><span>$m.nick$</span> 
+ }$
 
 
-</ul>  
-</div>
+</div> 
 
-</div></div></div></div></div>
-<div id="footerspace">
-            <div id="footeri">
-              $footer()$
-            </div></div>
-  </body>
+<!-- crossbrowser images_loading_bar - Gerard Ferrandez - www.dhteumeuleu.com - Feb 2005 --> 
+<span id="LB0" style="position:absolute;left:50%;top:50%;"><span style="position:absolute;font-family:arial;font-size:10px;color:#ccc;background:#000;left:-50px;top:-18px">Loading...</span><span style="position:absolute;left:-50px;top:-5px;font-size:1px;width:100px;height:10px;background:#333"><span id="LB1" style="position:absolute;font-size:1px;width:0px;height:10px;background:#ccc"></span></span></span> 
+<script type="text/javascript">m00=document.getElementById("canvas").getElementsByTagName("img");m01=m00.length;function images_loading_bar(){m02=0;for(i=0;i<m01;i++)m02+=(m00[i].complete)?1:0;document.getElementById("LB1").style.width=Math.round(m02/m01*100)+'px';if(m02==m01)setTimeout("document.getElementById('LB0').style.display='none'",128); else setTimeout("images_loading_bar()", 64);};images_loading_bar();</script> 
+<!-- end of images_loading_bar code --> 
+ 
+</body> 
 </html>
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
index 94b66e7..cbc2f59 100644
--- a/template/tagged_dumps.st
+++ b/template/tagged_dumps.st
@@ -2,45 +2,56 @@
 <head>
   <title>dump.fm - $page_title$</title>
 $head()$
-  <link rel="stylesheet" type="text/css" href="/static/css/directory.css">
+  <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
   <script>
      jQuery(document).ready(initLog);
   </script>
 </head>
-<body>
-  $banner()$
-  <div id="chatrap">
-    <div id="log">   
-	    <div id="loghead"></div>
-      <br>
-      <div id="posts">
-        <center><h2>$page_title$</h2></center>
-        <div id="lolbanner">
-          <img src="/static/img/welcomebanner.gif">
-        </div>
+  <body class="profile">
+    $banner()$
+    <div id="chatrap">
+      <div id="log">   
+        <br>
+                         <div id="dprofile">
+            <h2>$page_title$ </h2><br><h3><br>
+            
+            
+            
+            </h3>
+            
+            
+            </div>
+        <div id="dposts">
+          <br>
+
 $if(dumps)$
-  $dumps: { d | $log_dump(dump=d)$ }$
+  $dumps: { d |  <div class="dlogged-dump">$log_dump(dump=d)$
+
+  
+  </div> }$
   $if(json_tags)$
 <script>
   $json_tags: { j | $j$;
 }$
 </script>
+
   $endif$
 $else$
-  No dumps!
-$endif$
-        <div id="pnav">
-$if(next)$
-          <div id="pnavo"><a href="/$page_url$/$next$">MOAR!</a></div> 
-$endif$
-            &nbsp;
-$if(prev)$
-          <div id="pnavn">  <a href="/$page_url$/$prev$">BACK</a>          </div>
+          <span>No favs!</span>
 $endif$
-          <br><br>
-        </div>
-      </div>
 
+
+  <div id="pnav">
+  $if(next)$
+                <div id="pnavn"><a href="/$page_url$/$next$">next &#9758;</a></div> 
+              $endif$
+
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/$page_url$/$prev$">&#9756; prev</a></div>
+              $endif$
+          <br><br>
+         </div>
       <div id="footer">
 $footer()$
       </div>