diff --git a/include/admin/tpl/configuration.inc.tpl b/include/admin/tpl/configuration.inc.tpl
index d655ac8b..dc011a6e 100644
--- a/include/admin/tpl/configuration.inc.tpl
+++ b/include/admin/tpl/configuration.inc.tpl
@@ -23,5 +23,5 @@
 {else}
     <h2>{$CONST.CONFIGURATION}</h2>
 
-    {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
+    {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_multilist"':'class="form_multiselect"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
 {/if}
diff --git a/include/admin/tpl/groups.inc.tpl b/include/admin/tpl/groups.inc.tpl
index 1222e1bc..386bf58a 100644
--- a/include/admin/tpl/groups.inc.tpl
+++ b/include/admin/tpl/groups.inc.tpl
@@ -35,7 +35,7 @@
 {/if}
 
 {if $edit || $new}
-    <form id="serendipity_admin_groups" action="?serendipity[adminModule]=groups" method="post">
+    <form id="serendipity_admin_groups" class="configuration_group" action="?serendipity[adminModule]=groups" method="post">
         {$formToken}
     {if $edit}
         <h3>{$CONST.EDIT}</h3>
diff --git a/include/admin/tpl/out_stack_loop.tpl b/include/admin/tpl/out_stack_loop.tpl
index 9792ac47..c720dba4 100644
--- a/include/admin/tpl/out_stack_loop.tpl
+++ b/include/admin/tpl/out_stack_loop.tpl
@@ -3,9 +3,7 @@
 
 {* serendipity_plugins_admin.inc.php::serendipity_plugin_config() - the OUT_STACK loop *}
     {if $ctype == 'seperator'}
-        {* This could just as well be replaced by a CSS-only solution … *}
         <hr>
-        {* … then again, hr has new meaning in HTML5. *}
     {/if}
     {if $ctype == 'select'}
         <div class="form_select">
diff --git a/include/admin/tpl/personal.inc.tpl b/include/admin/tpl/personal.inc.tpl
index 3487732d..5838ff60 100644
--- a/include/admin/tpl/personal.inc.tpl
+++ b/include/admin/tpl/personal.inc.tpl
@@ -15,7 +15,7 @@
 {/if}
 <form action="?serendipity[adminModule]=personal&amp;serendipity[adminAction]=save" method="post">
     {$formToken}
-    {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
+    {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_multilist"':'class="form_multiselect"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
     <div class="form_buttons">
         <input name="SAVE" type="submit" value="{$CONST.SAVE}">
     </div>
diff --git a/include/admin/tpl/users.inc.tpl b/include/admin/tpl/users.inc.tpl
index 78ec5a4e..7c8e5272 100644
--- a/include/admin/tpl/users.inc.tpl
+++ b/include/admin/tpl/users.inc.tpl
@@ -70,7 +70,7 @@
         {$formToken}
         {if $adminAction == 'edit'}{if $create_permission}<input name="serendipity[user]" type="hidden" value="{$from.authorid}">{/if}{/if}
         <h3>{if $adminAction == 'edit'}{if $no_create_permission}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{else}{if $create_permission}{$CONST.EDIT}{else}{$CONST.CREATE_NOT_AUTHORIZED}: {$CONST.EDIT}{/if}{/if}{else}{$CONST.CREATE}{/if}</h3>
-        {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
+        {$config|replace:'class="form_string"':'class="form_field"'|replace:'class="form_fullprotected"':'class="form_field"'|replace:'class="form_list"':'class="form_select"'|replace:'class="form_multilist"':'class="form_multiselect"'|replace:'class="form_int"':'class="form_field"'|replace:'class="form_textarea"':'class="form_area"'}
         <div class="form_buttons">
         {if $adminAction == 'edit'}
             <input name="SAVE_EDIT" type="submit" value="{$CONST.SAVE}">
diff --git a/templates/2k11/admin/style.css b/templates/2k11/admin/style.css
index 773d66b9..ea566f61 100644
--- a/templates/2k11/admin/style.css
+++ b/templates/2k11/admin/style.css
@@ -447,6 +447,7 @@ legend>span>span,
 #template_options .form_select label,
 #template_options .form_field label,
 .configuration_group .form_select label,
+.configuration_group .form_multiselect label,
 .configuration_group .form_field label,
 .configuration_group .form_area label { display: block; }
 
@@ -1043,6 +1044,7 @@ summary {
 #template_options .form_select select,
 #template_options .form_field input,
 .configuration_group .form_select select,
+.configuration_group .form_multiselect select,
 .configuration_group .form_field input,
 .configuration_group .form_area textarea,
 #uploadform .form_select select,
@@ -1154,6 +1156,7 @@ fieldset p,
 #entries_list .actions { margin-bottom: 0; }
 
 #entries_list .actions,
+.serendipityCommentForm,
 #formMultiDelete .form_buttons input { margin-top: .75em; }
 
 .media_file .actions { margin-top: 1em; }
@@ -1201,6 +1204,13 @@ form>.button_link:first-of-type { margin-top: 0; }
     box-sizing: border-box;
 }
 
+#serendipity_iframe {
+    margin-top: 1.5em;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.5);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.5);
+    box-shadow: 0 0 4px rgba(0,0,0,.5);
+}
+
 #template_select article,
 #serendipityScaleImg img,
 .media_file,
@@ -1370,6 +1380,7 @@ form>.button_link:first-of-type { margin-top: 0; }
     #template_options .form_select select,
     #template_options .form_field input,
     .configuration_group .form_select select,
+    .configuration_group .form_multiselect select,
     .configuration_group .form_field input,
     .configuration_group .form_area textarea { max-width: 320px; }
 }
@@ -1427,9 +1438,11 @@ form>.button_link:first-of-type { margin-top: 0; }
     #template_options fieldset legend,
     #template_options fieldset>.clearfix,
     .configuration_group .form_select label,
+    .configuration_group .form_multiselect label,
     .configuration_group .form_field label,
     .configuration_group .form_area label,
     .configuration_group .form_select select,
+    .configuration_group .form_multiselect select,
     .configuration_group .form_field input,
     .configuration_group .form_area textarea,
     .configuration_group fieldset>fieldset legend,
@@ -1450,6 +1463,7 @@ form>.button_link:first-of-type { margin-top: 0; }
     #template_options .form_select select,
     #template_options .form_field input,
     .configuration_group .form_select select,
+    .configuration_group .form_multiselect select,
     .configuration_group .form_field input,
     .configuration_group .form_area textarea,
     #uploadform .form_select select,
@@ -1458,6 +1472,7 @@ form>.button_link:first-of-type { margin-top: 0; }
     .template_info dl { font-size: .65em; }
 
     .configuration_group .form_select,
+    .configuration_group .form_multiselect,
     .configuration_group .form_field,
     .configuration_group .form_area,
     .configuration_group fieldset>fieldset,
@@ -1465,6 +1480,7 @@ form>.button_link:first-of-type { margin-top: 0; }
     .media_pane .odd { clear: left; }
 
     .configuration_group .form_select,
+    .configuration_group .form_multiselect,
     .configuration_group .form_field,
     .configuration_group .form_area,
     .configuration_group fieldset>fieldset,
@@ -1474,6 +1490,7 @@ form>.button_link:first-of-type { margin-top: 0; }
     #serendipityScaleImg { margin-top: 2.25em; }
 
     .configuration_group fieldset>fieldset .form_radio,
+    #serendipity_plugin_config>fieldset .form_radio,
     #template_options fieldset .form_radio { margin-top: 0; }
 
     /* Plugin manager – might go into pluginmanager.css in the end */
@@ -1605,7 +1622,7 @@ form>.button_link:first-of-type { margin-top: 0; }
         margin: .75em 0;
     }
 
-    .template_info dl { max-width: .8125em; }
+    .template_info dl { font-size: .8125em; }
 }