diff --git a/addons/DePoClean.plugin/templates/archives.mtml b/addons/DePoClean.plugin/templates/archives.mtml
index 478552fc1..b31c62d07 100644
--- a/addons/DePoClean.plugin/templates/archives.mtml
+++ b/addons/DePoClean.plugin/templates/archives.mtml
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"> 
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> -   <__trans phrase="Archived"></title> 
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head"$>
 
 	<link rel='canonical' href='<$mt:Link template="<__trans phrase="Archives">"$>' /> 
 </head> 
@@ -11,24 +11,38 @@
  
 <div class="container"> 
  
-	<$mt:Include module="<__trans phrase="Header">"$>
-
-		<div class="post">
-			<h2><__trans phrase="The Archives"></h2>
-		</div>
-			
-		<div class="post" style="border-bottom:0px">
-		    
-		<div style="float:right;width:250px;">
-			<h3><__trans phrase="By Month"></h3>
+	<$mt:Include identifier="header"$>
+
+
+		<div class="post">
+
+			<h2><__trans phrase="The Archives"></h2>
+
+		</div>
+
+			
+
+		<div class="post" style="border-bottom:0px">
+
+		    
+
+		<div style="float:right;width:250px;">
+
+			<h3><__trans phrase="By Month"></h3>
+
 			<ul class="nav">
-			<mt:ArchiveList type="Monthly">
+			<mt:ArchiveList type="Monthly">
+
 				<li><a href='<$mt:ArchiveLink$>' title='<$mt:ArchiveTitle escape="html"$>'><$mt:ArchiveTitle$></a></li>
 			</mt:ArchiveList>
-			</ul>
-		</div>
-            
-		<h3><__trans phrase="By Category"></h3>
+			</ul>
+
+		</div>
+
+            
+
+		<h3><__trans phrase="By Category"></h3>
+
 		<ul class="nav">
 			<mt:TopLevelCategories>
 				<li class="cat-item"><a href="<$mt:CategoryArchiveLink$>" title="<__trans phrase="View all posts filed under"> <$mt:CategoryLabel escape="html"$>"><$mt:CategoryLabel$></a>
@@ -43,13 +57,22 @@
 					</mt:SubCatIsLast>
 				</mt:SubCategories>
 			</mt:TopLevelCategories>
-		</ul>
-		</div>
-
-<br clear="all" />
-
-	<$mt:Include module="<__trans phrase="Footer">"$>
-
-	</div> <!-- end container -->
-</body>
-</html>
\ No newline at end of file
+		</ul>
+
+		</div>
+
+
+
+<br clear="all" />
+
+
+
+	<$mt:Include identifier="footer"$>
+
+
+
+	</div> <!-- end container -->
+
+</body>
+
+</html>
diff --git a/addons/DePoClean.plugin/templates/comment_response.mtml b/addons/DePoClean.plugin/templates/comment_response.mtml
index 77829ec6b..4ec9d324c 100644
--- a/addons/DePoClean.plugin/templates/comment_response.mtml
+++ b/addons/DePoClean.plugin/templates/comment_response.mtml
@@ -17,11 +17,11 @@
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> &#8211; <$mt:BlogDescription escape="html"$></title> 
 	<meta name='robots' content='noindex,nofollow' />
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head""$>
 </head> 
 <body> 
 <div class="container"> 
-	<$mt:Include module="<__trans phrase="Header">"$>
+	<$mt:Include identifier="header"$>
 
                 <div class="post">
                     <div class="metainfo">
@@ -39,7 +39,7 @@
 	</div> 
  
 	<br clear="all" />
-	<$mt:Include module="<__trans phrase="Footer">"$>
+	<$mt:Include identifier="footer"$>
  
 	</div> <!-- end container --> 
 </body> 
diff --git a/addons/DePoClean.plugin/templates/dynamic_error.mtml b/addons/DePoClean.plugin/templates/dynamic_error.mtml
index 63c3b7d54..2d198195b 100644
--- a/addons/DePoClean.plugin/templates/dynamic_error.mtml
+++ b/addons/DePoClean.plugin/templates/dynamic_error.mtml
@@ -3,11 +3,11 @@
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> &#8211; <$mt:BlogDescription escape="html"$></title> 
 	<meta name='robots' content='noindex,nofollow' />
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head"$>
 </head> 
 <body> 
 <div class="container"> 
-	<$mt:Include module="<__trans phrase="Header">"$>
+	<$mt:Include identifier="header"$>
 
                 <div class="post">
                     <div class="metainfo">
@@ -25,7 +25,7 @@
 	</div> 
  
 	<br clear="all" />
-	<$mt:Include module="<__trans phrase="Footer">"$>
+	<$mt:Include identifier="footer"$>
  
 	</div> <!-- end container --> 
 </body> 
diff --git a/addons/DePoClean.plugin/templates/entry.mtml b/addons/DePoClean.plugin/templates/entry.mtml
index 1579d9036..04f72674c 100644
--- a/addons/DePoClean.plugin/templates/entry.mtml
+++ b/addons/DePoClean.plugin/templates/entry.mtml
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"> 
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> &#8211; <$mt:EntryTitle escape="html"$></title>
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head"$>
 	<mt:EntryPrevious>
 	<link rel='prev' title='<$mt:EntryTitle escape="html"$>' href='<$mt:EntryPermalink$>' />
 	</mt:EntryPrevious>
@@ -31,9 +31,9 @@
         <$mt:EntryModifiedDate  format="%Y%m%d" setvar="this_entry"$>
         <mt:If name="today" gt="$this_entry">
                 <mt:SetVarBlock name="cache_key">Single;EntryDetails;<$mt:EntryID$></mt:SetVarBlock>
-                <$mt:Include module="<__trans phrase="Entry Details">" cache="1" cache_key="$cache_key" ttl="604800"$>
+                <$mt:Include identifier="entry_details" cache="1" cache_key="$cache_key" ttl="604800"$>
         <mt:Else>
-                <$mt:Include module="<__trans phrase="Entry Details">"$>
+                <$mt:Include identifier="entry_details"$>
         </mt:If>
  
 	<div id="comments" class="post"> 
@@ -90,7 +90,7 @@
         </div> <!-- END posttopline -->
 	<br clear="all" /> 
  
-	<$mt:Include module="<__trans phrase="Footer">"$>
+	<$mt:Include identifier="footer"$>
  
 	</div> <!-- end container --> 
 </body> 
diff --git a/addons/DePoClean.plugin/templates/entry_listing.mtml b/addons/DePoClean.plugin/templates/entry_listing.mtml
index 1ad8fcdc7..e3d887d47 100644
--- a/addons/DePoClean.plugin/templates/entry_listing.mtml
+++ b/addons/DePoClean.plugin/templates/entry_listing.mtml
@@ -34,11 +34,11 @@
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> &#8211; <$mt:ArchiveTitle escape="html"$></title> 
 	<meta name='robots' content='noindex,nofollow' />
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head"$>
 </head> 
 <body> 
 <div class="container"> 
-	<$mt:Include module="<__trans phrase="Header">"$>
+	<$mt:Include identifier="header"$>
  
 	<div class="post">
 		<h2 style="font-weight:normal">Posts from <strong><$mt:ArchiveTitle escape="html"$></strong></h2>
@@ -55,9 +55,9 @@
         <$mt:EntryDate format="%Y%M%d" setvar="this_entry"$>
         <mt:If name="today" gt="$this_entry">
                 <mt:SetVarBlock name="cache_key">Listing;EntryDetails;<$mt:EntryID$></mt:SetVarBlock>
-                <$mt:Include module="<__trans phrase="Entry Details">" cache="1" cache_key="$cache_key" ttl="604800"$>
+                <$mt:Include identifier="entry_details" cache="1" cache_key="$cache_key" ttl="604800"$>
         <mt:Else>
-                <$mt:Include module="<__trans phrase="Entry Details">"$>
+                <$mt:Include identifier="entry_details"$>
         </mt:If>
 </mt:Entries>
 		
@@ -66,7 +66,7 @@
 	</div> 
  
 	<br clear="all" />
-	<$mt:Include module="<__trans phrase="Footer">"$>
+	<$mt:Include identifier="footer"$>
  
 	</div> <!-- end container --> 
 </body> 
diff --git a/addons/DePoClean.plugin/templates/html_head.mtml b/addons/DePoClean.plugin/templates/html_head.mtml
index 618568515..f13e15cf6 100644
--- a/addons/DePoClean.plugin/templates/html_head.mtml
+++ b/addons/DePoClean.plugin/templates/html_head.mtml
@@ -8,7 +8,7 @@
         <link rel='start' title='<$mt:EntryTitle escape="html"$>' href='<$mt:EntryPermalink$>' />
         </mt:Entries>
 
-        <script type="text/javascript" src="<$mt:PluginStaticWebPath component="DePoClean"$>js/jquery.js"></script> 
+	<script type="text/javascript" src="<$mt:jQueryURL$>"></script>
         <script type="text/javascript" src="<$mt:Link template="<__trans phrase="MT jQuery Data">"$>"></script>
         <script type="text/javascript" src="<$mt:PluginStaticWebPath component="DePoClean"$>js/jquery.mtauth.js"></script>
         <script type="text/javascript" src="<$mt:PluginStaticWebPath component="DePoClean"$>js/jquery.mtgreet.js"></script>
diff --git a/addons/DePoClean.plugin/templates/main_index.mtml b/addons/DePoClean.plugin/templates/main_index.mtml
index fd71b64e0..088509002 100644
--- a/addons/DePoClean.plugin/templates/main_index.mtml
+++ b/addons/DePoClean.plugin/templates/main_index.mtml
@@ -33,7 +33,7 @@
 <head profile="http://gmpg.org/xfn/11"> 
 	<title><$mt:BlogName escape="html"$> &#8211; <$mt:BlogDescription escape="html"$></title> 
 	<meta name='robots' content='noindex,nofollow' />
-	<$mt:Include module="<__trans phrase="HTML Head">"$>
+	<$mt:Include identifier="html_head"$>
 </head> 
 <body> 
 <div class="container"> 
@@ -52,7 +52,7 @@
 	</div>
 
 	<mt:If tag="FlickrPhotoType" ne="Disable"> 
-	<$mt:Include module="<__trans phrase="Flickr">"$>
+	<$mt:Include identifier="flickr"$>
 	</mt:If>
 
 <$mt:Date format="%Y$%m%d" setvar="today"$>
@@ -60,9 +60,9 @@
         <$mt:EntryDate format="%Y%M%d" setvar="this_entry"$>
         <mt:If name="today" gt="$this_entry">
                 <mt:SetVarBlock name="cache_key">Listing;EntryDetails;<$mt:EntryID$></mt:SetVarBlock>
-                <$mt:Include module="<__trans phrase="Entry Details">" cache="1" cache_key="$cache_key" ttl="604800"$>
+                <$mt:Include identifier="entry_details" cache="1" cache_key="$cache_key" ttl="604800"$>
         <mt:Else>
-                <$mt:Include module="<__trans phrase="Entry Details">"$>
+                <$mt:Include identifier="entry_details"$>
         </mt:If>
 </mt:Entries>
 	
@@ -72,7 +72,7 @@
 	</div> 
  
 	<br clear="all" />
-	<$mt:Include module="<__trans phrase="Footer">"$>
+	<$mt:Include identifier="footer"$>
  
 	</div> <!-- end container --> 
 </body> 
