diff --git a/templates/blue/img/back.png b/templates/blue/img/back.png
deleted file mode 100644
index 8c6ddc20..00000000
Binary files a/templates/blue/img/back.png and /dev/null differ
diff --git a/templates/blue/img/down.png b/templates/blue/img/down.png
deleted file mode 100644
index c5145cac..00000000
Binary files a/templates/blue/img/down.png and /dev/null differ
diff --git a/templates/blue/img/forward.png b/templates/blue/img/forward.png
deleted file mode 100644
index 36703c77..00000000
Binary files a/templates/blue/img/forward.png and /dev/null differ
diff --git a/templates/blue/img/up.png b/templates/blue/img/up.png
deleted file mode 100644
index 40e21dec..00000000
Binary files a/templates/blue/img/up.png and /dev/null differ
diff --git a/templates/blue/preview_fullsize.jpg b/templates/blue/preview_fullsize.jpg
index 9be5227b..3d78bd9e 100644
Binary files a/templates/blue/preview_fullsize.jpg and b/templates/blue/preview_fullsize.jpg differ
diff --git a/templates/carl_contest/preview_fullsize.jpg b/templates/carl_contest/preview_fullsize.jpg
index 6c0635db..559dae03 100644
Binary files a/templates/carl_contest/preview_fullsize.jpg and b/templates/carl_contest/preview_fullsize.jpg differ
diff --git a/templates/competition/preview_fullsize.jpg b/templates/competition/preview_fullsize.jpg
index 83800663..5982ffc8 100644
Binary files a/templates/competition/preview_fullsize.jpg and b/templates/competition/preview_fullsize.jpg differ
diff --git a/templates/contest/admin/img/header_bar.png b/templates/contest/admin/img/header_bar.png
deleted file mode 100644
index d0c9baae..00000000
Binary files a/templates/contest/admin/img/header_bar.png and /dev/null differ
diff --git a/templates/contest/admin/img/header_logo.png b/templates/contest/admin/img/header_logo.png
deleted file mode 100644
index 6df9996d..00000000
Binary files a/templates/contest/admin/img/header_logo.png and /dev/null differ
diff --git a/templates/contest/admin/img/sidebar_left.jpg b/templates/contest/admin/img/sidebar_left.jpg
deleted file mode 100644
index 11bb5a22..00000000
Binary files a/templates/contest/admin/img/sidebar_left.jpg and /dev/null differ
diff --git a/templates/contest/admin/style.css b/templates/contest/admin/style.css
index 367808b9..9a6536bb 100644
--- a/templates/contest/admin/style.css
+++ b/templates/contest/admin/style.css
@@ -94,13 +94,13 @@ input, select, textarea {
     padding: 0px;
     margin: 0px;
     border: 0px;
-    background-image: url({TEMPLATE_PATH}img/header_logo.png);
+    background-image: url({TEMPLATE_PATH}../img/header_logo.png);
     background-repeat: no-repeat;
     width: 770px;
 }
 
 #serendipityAdminFrame {
-    background-image: url({TEMPLATE_PATH}img/header_bar.png);
+    background-image: url({TEMPLATE_PATH}../img/header_bar.png);
     background-repeat: repeat-x;
     background-color: white;
 }
@@ -172,7 +172,7 @@ ul.serendipitySideBarMenu li.serendipitySideBarMenuHead {
     color: #FFFFFF;
     font-weight: bold;
     padding: 5px 0px 0px 5px;
-    background: url({TEMPLATE_PATH}img/sidebar_left.jpg) no-repeat;
+    background: url({TEMPLATE_PATH}../img/sidebar_left.jpg) no-repeat;
     border: 1px solid #011a7c;
     height: 20px;
     font-size: 0.9em;
@@ -198,7 +198,7 @@ ul.serendipitySideBarMenu li a {
 ul.serendipitySideBarMenu li a:hover {
     background-color: #011c7e;
     color: white;
-    background: url({TEMPLATE_PATH}img/sidebar_left.jpg) no-repeat;
+    background: url({TEMPLATE_PATH}../img/sidebar_left.jpg) no-repeat;
 }
 
 
diff --git a/templates/contest/preview_fullsize.jpg b/templates/contest/preview_fullsize.jpg
index cd16e46c..89629f3c 100644
Binary files a/templates/contest/preview_fullsize.jpg and b/templates/contest/preview_fullsize.jpg differ
diff --git a/templates/default-php/preview_fullsize.jpg b/templates/default-php/preview_fullsize.jpg
deleted file mode 100644
index 4946ddc2..00000000
Binary files a/templates/default-php/preview_fullsize.jpg and /dev/null differ
diff --git a/templates/default-rtl/preview_fullsize.jpg b/templates/default-rtl/preview_fullsize.jpg
index 9935ac90..922e79b7 100644
Binary files a/templates/default-rtl/preview_fullsize.jpg and b/templates/default-rtl/preview_fullsize.jpg differ
diff --git a/templates/default-xml/preview_fullsize.jpg b/templates/default-xml/preview_fullsize.jpg
deleted file mode 100644
index 4946ddc2..00000000
Binary files a/templates/default-xml/preview_fullsize.jpg and /dev/null differ
diff --git a/templates/default/preview_fullsize.jpg b/templates/default/preview_fullsize.jpg
index 5179a4b2..7a054c91 100644
Binary files a/templates/default/preview_fullsize.jpg and b/templates/default/preview_fullsize.jpg differ
diff --git a/templates/idea/preview_fullsize.jpg b/templates/idea/preview_fullsize.jpg
index e941a2f6..52256c9c 100644
Binary files a/templates/idea/preview_fullsize.jpg and b/templates/idea/preview_fullsize.jpg differ
diff --git a/templates/kubrick/img/back.png b/templates/kubrick/img/back.png
deleted file mode 100644
index 8c6ddc20..00000000
Binary files a/templates/kubrick/img/back.png and /dev/null differ
diff --git a/templates/kubrick/img/down.png b/templates/kubrick/img/down.png
deleted file mode 100644
index c5145cac..00000000
Binary files a/templates/kubrick/img/down.png and /dev/null differ
diff --git a/templates/kubrick/img/forward.png b/templates/kubrick/img/forward.png
deleted file mode 100644
index 36703c77..00000000
Binary files a/templates/kubrick/img/forward.png and /dev/null differ
diff --git a/templates/kubrick/img/up.png b/templates/kubrick/img/up.png
deleted file mode 100644
index 40e21dec..00000000
Binary files a/templates/kubrick/img/up.png and /dev/null differ
diff --git a/templates/kubrick/preview_fullsize.jpg b/templates/kubrick/preview_fullsize.jpg
index f2bd935e..bb20f328 100644
Binary files a/templates/kubrick/preview_fullsize.jpg and b/templates/kubrick/preview_fullsize.jpg differ
diff --git a/templates/moz-modern/preview_fullsize.jpg b/templates/moz-modern/preview_fullsize.jpg
index 75c6cd73..b6c80e48 100644
Binary files a/templates/moz-modern/preview_fullsize.jpg and b/templates/moz-modern/preview_fullsize.jpg differ
diff --git a/templates/mt-clean/preview_fullsize.jpg b/templates/mt-clean/preview_fullsize.jpg
index 83ee9ec1..49214bcb 100644
Binary files a/templates/mt-clean/preview_fullsize.jpg and b/templates/mt-clean/preview_fullsize.jpg differ
diff --git a/templates/mt-georgiablue/preview_fullsize.jpg b/templates/mt-georgiablue/preview_fullsize.jpg
index bc2083e8..2457d9d8 100644
Binary files a/templates/mt-georgiablue/preview_fullsize.jpg and b/templates/mt-georgiablue/preview_fullsize.jpg differ
diff --git a/templates/mt-gettysburg/img/back.png b/templates/mt-gettysburg/img/back.png
deleted file mode 100644
index 8c6ddc20..00000000
Binary files a/templates/mt-gettysburg/img/back.png and /dev/null differ
diff --git a/templates/mt-gettysburg/img/down.png b/templates/mt-gettysburg/img/down.png
deleted file mode 100644
index c5145cac..00000000
Binary files a/templates/mt-gettysburg/img/down.png and /dev/null differ
diff --git a/templates/mt-gettysburg/img/forward.png b/templates/mt-gettysburg/img/forward.png
deleted file mode 100644
index 36703c77..00000000
Binary files a/templates/mt-gettysburg/img/forward.png and /dev/null differ
diff --git a/templates/mt-gettysburg/img/up.png b/templates/mt-gettysburg/img/up.png
deleted file mode 100644
index 40e21dec..00000000
Binary files a/templates/mt-gettysburg/img/up.png and /dev/null differ
diff --git a/templates/mt-gettysburg/preview_fullsize.jpg b/templates/mt-gettysburg/preview_fullsize.jpg
index 2f09fb98..c5f395d9 100644
Binary files a/templates/mt-gettysburg/preview_fullsize.jpg and b/templates/mt-gettysburg/preview_fullsize.jpg differ
diff --git a/templates/mt-plainjane/preview_fullsize.jpg b/templates/mt-plainjane/preview_fullsize.jpg
index 751ae28c..7ba1dea4 100644
Binary files a/templates/mt-plainjane/preview_fullsize.jpg and b/templates/mt-plainjane/preview_fullsize.jpg differ
diff --git a/templates/mt-rusty/img/back.png b/templates/mt-rusty/img/back.png
deleted file mode 100644
index 8c6ddc20..00000000
Binary files a/templates/mt-rusty/img/back.png and /dev/null differ
diff --git a/templates/mt-rusty/img/down.png b/templates/mt-rusty/img/down.png
deleted file mode 100644
index c5145cac..00000000
Binary files a/templates/mt-rusty/img/down.png and /dev/null differ
diff --git a/templates/mt-rusty/img/forward.png b/templates/mt-rusty/img/forward.png
deleted file mode 100644
index 36703c77..00000000
Binary files a/templates/mt-rusty/img/forward.png and /dev/null differ
diff --git a/templates/mt-rusty/img/up.png b/templates/mt-rusty/img/up.png
deleted file mode 100644
index 40e21dec..00000000
Binary files a/templates/mt-rusty/img/up.png and /dev/null differ
diff --git a/templates/mt-rusty/preview_fullsize.jpg b/templates/mt-rusty/preview_fullsize.jpg
index a8e5734b..eecc0959 100644
Binary files a/templates/mt-rusty/preview_fullsize.jpg and b/templates/mt-rusty/preview_fullsize.jpg differ
diff --git a/templates/mt-trendy/preview_fullsize.jpg b/templates/mt-trendy/preview_fullsize.jpg
index d3443e2a..16436b85 100644
Binary files a/templates/mt-trendy/preview_fullsize.jpg and b/templates/mt-trendy/preview_fullsize.jpg differ
diff --git a/templates/mt3-chalkboard/img/back.png b/templates/mt3-chalkboard/img/back.png
deleted file mode 100644
index 8c6ddc20..00000000
Binary files a/templates/mt3-chalkboard/img/back.png and /dev/null differ
diff --git a/templates/mt3-chalkboard/img/down.png b/templates/mt3-chalkboard/img/down.png
deleted file mode 100644
index c5145cac..00000000
Binary files a/templates/mt3-chalkboard/img/down.png and /dev/null differ
diff --git a/templates/mt3-chalkboard/img/forward.png b/templates/mt3-chalkboard/img/forward.png
deleted file mode 100644
index 36703c77..00000000
Binary files a/templates/mt3-chalkboard/img/forward.png and /dev/null differ
diff --git a/templates/mt3-chalkboard/img/up.png b/templates/mt3-chalkboard/img/up.png
deleted file mode 100644
index 40e21dec..00000000
Binary files a/templates/mt3-chalkboard/img/up.png and /dev/null differ
diff --git a/templates/mt3-chalkboard/preview_fullsize.jpg b/templates/mt3-chalkboard/preview_fullsize.jpg
index 8b25b0fe..6f1df46e 100644
Binary files a/templates/mt3-chalkboard/preview_fullsize.jpg and b/templates/mt3-chalkboard/preview_fullsize.jpg differ
diff --git a/templates/mt3-gettysburg/preview_fullsize.jpg b/templates/mt3-gettysburg/preview_fullsize.jpg
index f5e86181..cacbcc6d 100644
Binary files a/templates/mt3-gettysburg/preview_fullsize.jpg and b/templates/mt3-gettysburg/preview_fullsize.jpg differ
diff --git a/templates/mt3-independence/preview_fullsize.jpg b/templates/mt3-independence/preview_fullsize.jpg
index 4c304034..fce78f75 100644
Binary files a/templates/mt3-independence/preview_fullsize.jpg and b/templates/mt3-independence/preview_fullsize.jpg differ
diff --git a/templates/mt3-squash/preview_fullsize.jpg b/templates/mt3-squash/preview_fullsize.jpg
index 4fe57411..05ef551c 100644
Binary files a/templates/mt3-squash/preview_fullsize.jpg and b/templates/mt3-squash/preview_fullsize.jpg differ
diff --git a/templates/newspaper/preview_fullsize.jpg b/templates/newspaper/preview_fullsize.jpg
index cf3baac7..9a4aad25 100644
Binary files a/templates/newspaper/preview_fullsize.jpg and b/templates/newspaper/preview_fullsize.jpg differ
diff --git a/templates/wp/htmlarea.css b/templates/wp/htmlarea.css
deleted file mode 100644
index 99c3377e..00000000
--- a/templates/wp/htmlarea.css
+++ /dev/null
@@ -1,45 +0,0 @@
-body {
-    font-size: 10pt;
-    padding: 10px;
-    color: #333333;
-    background-color: #FAFFFF;
-    font-size: 9.5pt;
-    font-weight: normal;
-    font-family: verdana, arial, geneva, helvetica, sans-serif;
-    direction: {LANG_DIRECTION};
-}
-
-/** Embedded images with the s9y image manager **/
-.serendipity_imageComment_center,
-.serendipity_imageComment_left,
-.serendipity_imageComment_right {
-    border: 1px solid black;
-    background-color: #EFEFEF;
-    margin: 3px;
-}
-
-.serendipity_imageComment_center {
-}
-
-.serendipity_imageComment_left {
-    float: left;
-}
-
-.serendipity_imageComment_right {
-    float: right;
-}
-
-.serendipity_imageComment_img,
-.serendipity_imageComment_img img {
-    margin: 0px;
-    padding: 0px;
-    border: 0px;
-}
-
-.serendipity_imageComment_txt {
-    margin: 0px;
-    padding: 3px;
-    clear: both;
-    font-size: 9pt;
-}
-