Index: branches/release-34/tmpl/cms/edit_template.tmpl
===================================================================
--- branches/release-34/tmpl/cms/edit_template.tmpl (revision 1847)
+++ branches/release-34/tmpl/cms/edit_template.tmpl (revision 1877)
@@ -160,7 +160,6 @@
     <mt:unless name="new_object">
         <mt:unless name="build_dynamic">
-        <mt:unless name="build_type_0">
-            <mt:if name="has_rebuild">
-                <mt:if name="can_rebuild">
+            <mt:if name="can_rebuild">
+                <mt:unless name="archive_types">
     <button
         type="submit"
@@ -170,7 +169,6 @@
         onclick="return validate(this.form, 1);"
         ><__trans phrase="Save &amp; Publish"></button>
-                </mt:if>
+                </mt:unless>
             </mt:if>
-        </mt:unless>
         </mt:unless>
     </mt:unless>
@@ -626,19 +624,14 @@
     </mtapp:setting>
 <mt:else>
-    <mt:if name="has_build_options">
-        <mtapp:setting
-            id="build_dynamic"
-            label="<__trans phrase="Publish Options">"
-            help_page="templates"
-            help_section="enable_dynamic_publishing">
-            <mt:if name="custom_dynamic"><mt:if name="build_dynamic"><input type="hidden" name="current_build_dynamic" value="1" /></mt:if></mt:if>
-            <mt:unless name="build_dynamic"><mt:if name="has_rebuild"><mt:if name="rebuild_me"><input type="hidden" name="current_rebuild_me" value="1" /></mt:if></mt:if></mt:unless>
+    <mtapp:setting
+        id="build_dynamic"
+        label="<__trans phrase="Publish Options">"
+        help_page="templates"
+        help_section="enable_dynamic_publishing">
         <select name="build_type" id="build-type" class="full-width">
             <option value="1"<mt:if name="build_type_1"> selected="selected"</mt:if>><__trans phrase="Statically"></option>
-            <mt:if name="custom_dynamic">
             <option value="3"<mt:if name="build_type_3"> selected="selected"</mt:if>><__trans phrase="Dynamically"></option>
-            </mt:if>
-            <mt:if name="publish_queue">
-            <option value="4"<mt:if name="build_type_4"> selected="selected"</mt:if>><__trans phrase="Asynchronously"></option>
+            <mt:if name="publish_queue_available">
+            <option value="4"<mt:if name="build_type_4"> selected="selected"</mt:if>><__trans phrase="Background"></option>
     <mt:ignore>
         <!-- untested features -->
@@ -655,9 +648,7 @@
     </mt:ignore>
             </mt:if>
-            <option value="2"<mt:if name="build_type_2"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
-            <option value="0"<mt:if name="build_type_0"> selected="selected"</mt:if>><__trans phrase="Disabled"></option>
+            <option value="2"<mt:if name="build_type_2"> selected="selected"</mt:if><mt:if name="build_type_0"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
         </select>
-        </mtapp:setting>
-    </mt:if>
+    </mtapp:setting>
 </mt:if>
 <mt:if name="template_group" like="(module|widget)">
@@ -730,5 +721,4 @@
     },
 
-
     autoSave: function() {
         arguments.callee.applySuper( this, arguments );
Index: branches/release-34/tmpl/cms/include/template_table.tmpl
===================================================================
--- branches/release-34/tmpl/cms/include/template_table.tmpl (revision 1786)
+++ branches/release-34/tmpl/cms/include/template_table.tmpl (revision 1877)
@@ -80,5 +80,5 @@
             <mt:loop name="archive_types">
                 <mt:loop name="archive_tmpl_loop">
-                        <li><mt:if name="selected"><mt:var name="name" escape="html"></mt:if></li>
+                        <li><mt:if name="selected"><mt:var name="name" escape="html"><mt:var name="build_type" value="$map_build_type"></mt:if></li>
                 </mt:loop>
             </mt:loop>
@@ -94,11 +94,12 @@
     <mt:if name="template_type" like="/(index|archive)/">
                 <td class="publishing-method">
-                    <mt:if name="build_type" eq="0"><__trans phrase="Disabled">
-                    <mt:else name="build_type" eq="2"><__trans phrase="Manual">
-                    <mt:else name="build_type" eq="3"><__trans phrase="Dynamic">
-                    <mt:else name="build_type" eq="4"><__trans phrase="Asynchronous">
-                    <mt:else name="build_type" eq="5"><__trans phrase="Scheduled">
+                    <mt:if name="build_dynamic"><__trans phrase="Dynamic"><mt:else>
+                    <mt:if name="build_type" eq="0"><__trans phrase="Manual">
+                    <mt:elseif name="build_type" eq="2"><__trans phrase="Manual">
+                    <mt:elseif name="build_type" eq="3"><__trans phrase="Dynamic">
+                    <mt:elseif name="build_type" eq="4"><__trans phrase="Background">
+                    <mt:elseif name="build_type" eq="5"><__trans phrase="Scheduled">
                     <mt:else><__trans phrase="Static">
-                    </mt:if>
+                    </mt:if></mt:if>
                 </td>
     </mt:if>
Index: branches/release-34/tmpl/cms/include/archive_maps.tmpl
===================================================================
--- branches/release-34/tmpl/cms/include/archive_maps.tmpl (revision 1632)
+++ branches/release-34/tmpl/cms/include/archive_maps.tmpl (revision 1877)
@@ -28,15 +28,12 @@
             </td>
             <td class="publish-options">
-                <select name="build_type" id="build-type" class="half-width">
-                    <option value="1"<mt:if name="build_type_1"> selected="selected"</mt:if>><__trans phrase="Statically"></option>
-
-                <mt:if name="custom_dynamic">
-                    <option value="3"<mt:if name="build_type_3"> selected="selected"</mt:if>><__trans phrase="Dynamically"></option>
-                </mt:if>
-                <mt:if name="publish_queue">
-                    <option value="4"<mt:if name="build_type_4"> selected="selected"</mt:if>><__trans phrase="Asynchronously"></option>
+                <select name="map_build_type_<mt:var name="map_id">" id="build-type" class="half-width">
+                    <option value="1"<mt:if name="map_build_type_1"> selected="selected"</mt:if>><__trans phrase="Statically"></option>
+                    <option value="3"<mt:if name="map_build_type_3"> selected="selected"</mt:if>><__trans phrase="Dynamically"></option>
+    <mt:if name="publish_queue_available">
+                    <option value="4"<mt:if name="map_build_type_4"> selected="selected"</mt:if>><__trans phrase="Background"></option>
         <mt:ignore>
             <!-- untested features -->
-                    <option value="5"<mt:if name="build_type_5"> selected="selected"</mt:if>><__trans phrase="On a schedule"></option>
+                    <option value="5"<mt:if name="map_build_type_5"> selected="selected"</mt:if>><__trans phrase="On a schedule"></option>
                     <mt:ignore>
                         <!-- This code needs to be shown if the "On a schedule" has been selected -->
@@ -49,7 +46,6 @@
                     </mt:ignore>
         </mt:ignore>
-                </mt:if>
-                    <option value="2"<mt:if name="build_type_2"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
-                    <option value="0"<mt:if name="build_type_0"> selected="selected"</mt:if>><__trans phrase="Disabled"></option>
+    </mt:if>
+                    <option value="2"<mt:if name="map_build_type_2"> selected="selected"</mt:if><mt:if name="map_build_type_0"> selected="selected"</mt:if>><__trans phrase="Manually"></option>
                 </select>
             </td>
Index: branches/release-34/tmpl/cms/dialog/publishing_profile.tmpl
===================================================================
--- branches/release-34/tmpl/cms/dialog/publishing_profile.tmpl (revision 1852)
+++ branches/release-34/tmpl/cms/dialog/publishing_profile.tmpl (revision 1877)
@@ -34,9 +34,16 @@
 <mt:include name="dialog/header.tmpl">
 <form name="publishing_profiles_form" id="publishing_profiles_form" method="post" action="<mt:var name="script_url">" target="_top" onsubmit="return false">
+    <input type="hidden" name="blog_id" value="<mt:var name="blog_id">" />
+    <input type="hidden" name="__mode" value="save" />
+    <input type="hidden" name="_type" value="blog" />
+    <input type="hidden" name="id" value="<mt:var name="blog_id">" />
+    <input type="hidden" name="cfg_screen" value="cfg_publish_profile" />
+    <input type="hidden" name="return_args" value="<mt:var name="return_args" escape="html">" />
+    <input type="hidden" name="magic_token" value="<mt:var name="magic_token">" />
 
     <div id="profile-panel" class="hidden panel">
-        
+
         <p><__trans phrase="Choose the profile that best matches the requirements for this blog."></p>
-        
+
         <mtapp:setting
             id="dynamicity"
@@ -87,5 +94,5 @@
     </div>
     <div id="confirm-panel" class="hidden panel">
-        <p><__trans phrase="This new publishing profile will update all of you templates."></p>
+        <p><__trans phrase="This new publishing profile will update all of your templates."></p>
 
         <p><strong><__trans phrase="Are you sure you wish to continue?"></strong></p>
Index: branches/release-34/tmpl/cms/list_template.tmpl
===================================================================
--- branches/release-34/tmpl/cms/list_template.tmpl (revision 1875)
+++ branches/release-34/tmpl/cms/list_template.tmpl (revision 1877)
@@ -71,7 +71,7 @@
         </mtapp:statusmsg>
     </mt:if>
-    <mt:if name="dynamic_set">
+    <mt:if name="saved">
         <mtapp:statusmsg
-            id="dynamic-set"
+            id="saved-settings"
             class="success">
             <__trans phrase="Your settings have been saved.">
Index: branches/release-34/tmpl/cms/cfg_archives.tmpl
===================================================================
--- branches/release-34/tmpl/cms/cfg_archives.tmpl (revision 1850)
+++ branches/release-34/tmpl/cms/cfg_archives.tmpl (revision 1877)
@@ -292,4 +292,5 @@
 
 <mt:unless name="hide_build_option">
+<mt:if name="dynamic_enabled">
 <fieldset>
     <h3><__trans phrase="Dynamic Publishing Options"></h3>
@@ -312,4 +313,5 @@
 
 </fieldset>
+</mt:if>
 </mt:unless>