diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index e8232fc05..95c78562a 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -60,7 +60,7 @@ SPAN.pwgScreen { font-style:italic; border-bottom:1px dotted #666}
 .content ul.thumbnails span.wrap1 { margin:0 12px 5px; }
 
 /* borders */ 
-fieldset { border: 1px solid #999; }
+fieldset { border: 2px solid #ddd; }
 INPUT, SELECT, TEXTAREA { border: 1px solid #999; }
 input:focus, select:focus, textarea:focus, input.focus, form .focus { background-color:#bbb;color: #666; }
 TEXTAREA { cursor:text; font-size: 13px; }
diff --git a/admin/themes/default/default-colors.css b/admin/themes/default/default-colors.css
index e45863bd3..1fc682602 100644
--- a/admin/themes/default/default-colors.css
+++ b/admin/themes/default/default-colors.css
@@ -81,5 +81,7 @@ INPUT.radio, INPUT.checkbox {
 }
 
 LEGEND {
-  font-style: italic;
+  font-weight: bold;
+  letter-spacing: 1px;
+  padding: 0 10px;
 }
\ No newline at end of file
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index f792538a5..1a8e828ce 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -517,23 +517,16 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
   margin:0;
 }
 
-.formField {
+#photosAddContent FIELDSET {
   width:650px;
   margin:0 auto 20px auto;
-  padding:10px;
-  border: 2px solid #292929;
 }
 
-.formFieldTitle {
-  font-weight:bold;
-  margin-bottom:10px;
-}
-
-.formField P {
+#photosAddContent P {
   margin:0;
 }
 
-.formField TH {
+#photosAddContent TH {
   text-align:right;
   padding-right: 5px;
 }
@@ -547,7 +540,7 @@ ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutt
 }
 
 #pwgHead {
-  background-color:#464646;
+  background-color:#222;
   height:46px;
 }
 
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 9f59c11a7..970bdf96c 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -75,6 +75,8 @@ jQuery(document).ready(function() {
   <h2>{'Upload photos'|@translate}</h2>
 </div>
 
+<div id="photosAddContent">
+
 {if count($setup_errors) > 0}
 <div class="errors">
   <ul>
@@ -105,8 +107,8 @@ jQuery(document).ready(function() {
 <input name="upload_id" value="{$upload_id}" type="hidden">
 {/if}
 
-    <div class="formField">
-      <div class="formFieldTitle">{'Drop into category'|@translate}</div>
+    <fieldset>
+      <legend>{'Drop into category'|@translate}</legend>
       
       <label><input type="radio" name="category_type" value="existing"> {'existing category'|@translate}</label>
       <label><input type="radio" name="category_type" value="new" checked="checked"> {'create a new category'|@translate}</label>
@@ -136,18 +138,18 @@ jQuery(document).ready(function() {
           </tr>
         </table>
       </div>
-    </div>
+    </fieldset>
 
-    <div class="formField">
-      <div class="formFieldTitle">{'Who can see these photos?'|@translate}</div>
+    <fieldset>
+      <legend>{'Who can see these photos?'|@translate}</legend>
 
       <select name="level" size="1">
         {html_options options=$level_options selected=$level_options_selected}
       </select>
-    </div>
+    </fieldset>
 
-    <div class="formField">
-      <div class="formFieldTitle">{'Select files'|@translate}</div>
+    <fieldset>
+      <legend>{'Select files'|@translate}</legend>
 
 {if $upload_mode eq 'html'}
     <p><a href="{$switch_url}">{'... or switch to the multiple files form'|@translate}</a></p>
@@ -159,7 +161,7 @@ jQuery(document).ready(function() {
         <a href="javascript:">{'+ Add an upload box'|@translate}</a>
       </div>
     
-    </div> <!-- formField -->
+    </fieldset>
 
     <p>
       <input class="submit" type="submit" name="submit_upload" value="{'Upload'|@translate}" {$TAG_INPUT_ENABLED}/>
@@ -175,7 +177,7 @@ jQuery(document).ready(function() {
 
     <div id="fileQueue"></div>
 
-    </div> <!-- formField -->
+    </fieldset>
     <p>
       <input class="submit" type="button" value="{'Upload'|@translate}" onclick="javascript:jQuery('#uploadify').uploadifyUpload()"/>
       <input type="submit" name="submit_upload" style="display:none"/>
@@ -183,3 +185,5 @@ jQuery(document).ready(function() {
 {/if}
 </form>
 {/if}
+
+</div> <!-- photosAddContent -->
\ No newline at end of file
diff --git a/admin/themes/default/template/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index 10e4633dd..856585404 100644
--- a/admin/themes/default/template/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
@@ -23,10 +23,12 @@ $(document).ready(function(){
   <h2>{'Upload Photos'|@translate}</h2>
 </div>
 
+<div id="photosAddContent">
+
 <form id="uploadFormSettings" enctype="multipart/form-data" method="post" action="{$F_ACTION}" class="properties">
 
-  <div class="formField">
-    <div class="formFieldTitle">{'Web size photo'|@translate}</div>
+  <fieldset>
+    <legend>{'Web size photo'|@translate}</legend>
 
     <table>
       <tr>
@@ -46,10 +48,10 @@ $(document).ready(function(){
         <td><input type="text" name="websize_quality" value="{$values.websize_quality}" size="3" maxlength="3"> %</td>
       </tr>
     </table>
-  </div>
+  </fieldset>
 
-  <div class="formField">
-    <div class="formFieldTitle">{'Thumbnail'|@translate}</div>
+  <fieldset>
+    <legend>{'Thumbnail'|@translate}</legend>
 
     <table>
       <tr>
@@ -65,10 +67,12 @@ $(document).ready(function(){
         <td><input type="text" name="thumb_quality" value="{$values.thumb_quality}" size="3" maxlength="3"> %</td>
       </tr>
     </table>
-  </div>
+  </fieldset>
 
   <p>
     <input class="submit" type="submit" name="submit" value="{'Save Settings'|@translate}"/>
   </p>
 
 </form>
+
+</div> <!-- photosAddContent -->
\ No newline at end of file
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index f5797bc3a..7a19b2be2 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -68,7 +68,7 @@ SPAN.pwgScreen { font-style:italic; border-bottom:1px dotted #666}
 /* .throw, */ td h3 {
  background-image: url(images/fillet.png); background-repeat: repeat-x; }
 /* borders */
-fieldset { border: 1px solid #666; }
+fieldset { border: 2px solid #333; }
 INPUT, SELECT, TEXTAREA { border: 1px solid #666; }
 input:focus, select:focus, textarea:focus, input.focus, form .focus { background-color:#444;color: #999; }
 TEXTAREA { cursor:text; font-size: 13px; }