Index: trunk/kernel/admin/include/toolbar/theme_general.php
===================================================================
diff -u
--- trunk/kernel/admin/include/toolbar/theme_general.php	(revision 0)
+++ trunk/kernel/admin/include/toolbar/theme_general.php	(revision 1037)
@@ -0,0 +1,31 @@
+<?php
+
+print<<<END
+<script language="javascript1.2">
+<!--
+
+function align_primary_value () {
+	if (document.getElementById('primary_prompt').checked) {
+		document.getElementById('primary').value = 1;
+		document.getElementById('enabled_prompt').checked = true;
+		document.getElementById('enabled').value = 1;
+	} else {
+		document.getElementById('primary').value = 0;
+	}
+}
+
+function align_enabled_value() {
+	if (document.getElementById('enabled_prompt').checked) {
+		document.getElementById('enabled').value = 1;
+	} else {
+		document.getElementById('enabled').value = 0;
+		document.getElementById('primary_prompt').checked = false;
+		document.getElementById('primary').value = 0;
+	}
+}
+
+//-->
+</script>
+
+END;
+?>
Index: trunk/admin/include/toolbar.js
===================================================================
diff -u -r767 -r1037
--- trunk/admin/include/toolbar.js	(.../toolbar.js)	(revision 767)
+++ trunk/admin/include/toolbar.js	(.../toolbar.js)	(revision 1037)
@@ -352,6 +352,7 @@
 		document.listform.submit();
 	}
 }
+
 END;
 
 if ($section == 'in-portal:user_list')
Index: trunk/admin/config/addtheme.php
===================================================================
diff -u -r1016 -r1037
--- trunk/admin/config/addtheme.php	(.../addtheme.php)	(revision 1016)
+++ trunk/admin/config/addtheme.php	(.../addtheme.php)	(revision 1037)
@@ -208,7 +208,8 @@
 <tr <?php int_table_color(); ?>> 
   <td valign="top" class="text"><?php echo prompt_language("la_prompt_Enabled"); ?></td>
   <td> 
-    <input type="checkbox" name="enabled" class="text" value="1" <?php if($c->Get("Enabled") == 1) echo "checked"; ?>>
+    <input type="checkbox" id="enabled_prompt" name="enabled_prompt" class="text" value="1" <?php if($c->Get("Enabled") == 1) echo "checked "; if($c->Get("PrimaryTheme") == 1) echo 'disabled ';?> onchange="align_enabled_value()">
+    <input type="hidden" id="enabled" name="enabled" class="text" <?php echo 'value="'.$c->Get("Enabled").'"'; ?>>
   </td>
   <td class="text">&nbsp;</td>
 </tr>
@@ -225,7 +226,8 @@
 <tr <?php int_table_color(); ?>> 
   <td valign="top" class="text"><?php echo prompt_language("la_prompt_Primary"); ?></td>
   <td> 
-    <input type="checkbox" name="primary" class="text" value="1" <?php if($c->Get("PrimaryTheme") == 1) echo "checked disabled"; ?>>
+    <input type="checkbox" name="primary_prompt" id="primary_prompt" class="text" value="1" <?php if($c->Get("PrimaryTheme") == 1) echo 'checked disabled'; ?> onchange="align_primary_value()">
+    <input type="hidden" name="primary" id="primary" <?php echo 'value="'.$c->Get("PrimaryTheme").'"'; ?>>
   </td>
   <td class="text">&nbsp;</td>
       <input type=hidden NAME="Action" VALUE="<?php echo $action; ?>">