diff --git a/admin/index.php b/admin/index.php
index 0b0a173..e944074 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -180,33 +180,33 @@ if ($user->isAuthenticated()) {
                 switch ($_GET["new"]) {
                         case "post":
                                 $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_post.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_post.htm'));
                                 break;
                         case "photo":
                                 $url = str_replace("../", $conf->urlGelato."/", $url);
                                 $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_photo.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_photo.htm'));
                                 break;
                         case "quote":
                                 $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_quote.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_quote.htm'));
                                 break;
                         case "url":
                                 $form->set('editTitle',$title);
                                 $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_link.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_link.htm'));
                                 break;
                         case "conversation":
                                 $form->set('editTitle',$title);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_conversation.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_conversation.htm'));
                                 break;
                         case "video":
                                 $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_video.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_video.htm'));
                                 break;
                         case "mp3":
                                 $form->set('editUrl',$url);
-                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/template_add_mp3.htm'));
+                                $theme->set('form',$form->fetch(Absolute_Path.'admin/themes/admin/parts/template_add_mp3.htm'));
                                 break;
                         }
 
diff --git a/admin/themes/admin/template_add_conversation.htm b/admin/themes/admin/parts/template_add_conversation.htm
similarity index 100%
rename from admin/themes/admin/template_add_conversation.htm
rename to admin/themes/admin/parts/template_add_conversation.htm
diff --git a/admin/themes/admin/template_add_link.htm b/admin/themes/admin/parts/template_add_link.htm
similarity index 100%
rename from admin/themes/admin/template_add_link.htm
rename to admin/themes/admin/parts/template_add_link.htm
diff --git a/admin/themes/admin/template_add_mp3.htm b/admin/themes/admin/parts/template_add_mp3.htm
similarity index 100%
rename from admin/themes/admin/template_add_mp3.htm
rename to admin/themes/admin/parts/template_add_mp3.htm
diff --git a/admin/themes/admin/template_add_photo.htm b/admin/themes/admin/parts/template_add_photo.htm
similarity index 96%
rename from admin/themes/admin/template_add_photo.htm
rename to admin/themes/admin/parts/template_add_photo.htm
index 54fe97e..64f05a8 100644
--- a/admin/themes/admin/template_add_photo.htm
+++ b/admin/themes/admin/parts/template_add_photo.htm
@@ -1,5 +1,3 @@
-
-
 	<div id="photo_upload">
 		<label for="description">Photo</label>												
 		<br /><input type="file" name="photo" id="photo" accept="image/gif,image/jpeg,image/jpg,image/png"/>
@@ -30,15 +28,13 @@
 	<input type="hidden" name="date" id="date" value="{date}" />
 	<input type="hidden" name="id_user" id="id_user" value="{id_user}" />
 
-
-
-
 	<script>
 		$('#photo_url').css('display','none');
+
 		$("#autosave").validate({
 			rules: {				
 				photo: { 
-					required:  function() {
+					required:  function() {
  						return ($('#photo_upload').css('display')!= 'none') ? true : false;
   					},
 					accept: "(jpe?g|gif|png)" 
@@ -64,7 +60,7 @@
 				return false;
 			} 
 		);
-		
+
 		$("#photo_url a.linkFrm").click( function() {
 				$('#photo_url').css('display','none');				
 				$('#photo_upload').css('display','block'); 
@@ -72,5 +68,4 @@
 				return false;
 			} 
 		);
-
-	</script>
\ No newline at end of file
+	</script>
diff --git a/admin/themes/admin/template_add_photo_bm.htm b/admin/themes/admin/parts/template_add_photo_bm.htm
similarity index 100%
rename from admin/themes/admin/template_add_photo_bm.htm
rename to admin/themes/admin/parts/template_add_photo_bm.htm
diff --git a/admin/themes/admin/template_add_post.htm b/admin/themes/admin/parts/template_add_post.htm
similarity index 100%
rename from admin/themes/admin/template_add_post.htm
rename to admin/themes/admin/parts/template_add_post.htm
diff --git a/admin/themes/admin/template_add_quote.htm b/admin/themes/admin/parts/template_add_quote.htm
similarity index 100%
rename from admin/themes/admin/template_add_quote.htm
rename to admin/themes/admin/parts/template_add_quote.htm
diff --git a/admin/themes/admin/template_add_video.htm b/admin/themes/admin/parts/template_add_video.htm
similarity index 100%
rename from admin/themes/admin/template_add_video.htm
rename to admin/themes/admin/parts/template_add_video.htm
diff --git a/admin/themes/admin/template_bm.htm b/admin/themes/admin/parts/template_bm.htm
similarity index 100%
rename from admin/themes/admin/template_bm.htm
rename to admin/themes/admin/parts/template_bm.htm
diff --git a/admin/themes/admin/template_comment.htm b/admin/themes/admin/parts/template_comment.htm
similarity index 100%
rename from admin/themes/admin/template_comment.htm
rename to admin/themes/admin/parts/template_comment.htm
diff --git a/admin/themes/admin/template_comment_post.htm b/admin/themes/admin/parts/template_comment_post.htm
similarity index 100%
rename from admin/themes/admin/template_comment_post.htm
rename to admin/themes/admin/parts/template_comment_post.htm
diff --git a/admin/themes/admin/template_conversation.htm b/admin/themes/admin/parts/template_conversation.htm
similarity index 100%
rename from admin/themes/admin/template_conversation.htm
rename to admin/themes/admin/parts/template_conversation.htm
diff --git a/admin/themes/admin/template_mp3.htm b/admin/themes/admin/parts/template_mp3.htm
similarity index 100%
rename from admin/themes/admin/template_mp3.htm
rename to admin/themes/admin/parts/template_mp3.htm
diff --git a/admin/themes/admin/template_photo.htm b/admin/themes/admin/parts/template_photo.htm
similarity index 96%
rename from admin/themes/admin/template_photo.htm
rename to admin/themes/admin/parts/template_photo.htm
index 81f6386..640d63a 100644
--- a/admin/themes/admin/template_photo.htm
+++ b/admin/themes/admin/parts/template_photo.htm
@@ -6,4 +6,5 @@
 					<span class="option">{Caption}</span>
 					<p><a {Effect}><img src="{PhotoURL}" alt="{PhotoAlt}" /></a></a></p>
 				</div>
-			</div>
\ No newline at end of file
+			</div>
+
diff --git a/admin/themes/admin/template_quote.htm b/admin/themes/admin/parts/template_quote.htm
similarity index 100%
rename from admin/themes/admin/template_quote.htm
rename to admin/themes/admin/parts/template_quote.htm
diff --git a/admin/themes/admin/template_regular_post.htm b/admin/themes/admin/parts/template_regular_post.htm
similarity index 100%
rename from admin/themes/admin/template_regular_post.htm
rename to admin/themes/admin/parts/template_regular_post.htm
diff --git a/admin/themes/admin/template_url.htm b/admin/themes/admin/parts/template_url.htm
similarity index 100%
rename from admin/themes/admin/template_url.htm
rename to admin/themes/admin/parts/template_url.htm
diff --git a/admin/themes/admin/template_video.htm b/admin/themes/admin/parts/template_video.htm
similarity index 100%
rename from admin/themes/admin/template_video.htm
rename to admin/themes/admin/parts/template_video.htm