diff --git a/.devcontainer/science-ation-blank-generic.sql b/.devcontainer/science-ation-blank-generic.sql
index 9c74ea58..60401a9d 100644
--- a/.devcontainer/science-ation-blank-generic.sql
+++ b/.devcontainer/science-ation-blank-generic.sql
@@ -371,7 +371,7 @@ INSERT INTO `config` VALUES
 ('judge_scheduler_activity','Done','Judge Scheduler','','',99999,'',0),
 ('provincestate','Province','Localization','enum','Province=Province|State=State',100,'Use Province or State?',-1),
 ('postalzip','Postal Code','Localization','enum','Postal Code=Postal Code|Zip Code=Zip Code',110,'Use Postal Code or Zip Code?',-1),
-('theme','default','Global','theme','theme',850,'Theme for colours',-1),
+('theme','science_ation','Global','theme','theme',850,'Theme for colours',-1),
 ('dateformat','Y-m-d','Localization','text','',200,'Date format (<a href=\"http://www.php.net/manual/en/function.date.php\" target=\"_blank\">formatting options</a>)',-1),
 ('timeformat','H:i:s','Localization','text','',210,'Time format (<a href=\"http://www.php.net/manual/en/function.date.php\" target=\"_blank\">formatting options</a>)',-1),
 ('country','CA','Localization','text','',90,'Country code (<a href=\"http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_names_and_code_elements.htm\" target=\"_blank\">look up 2 letter code</a>)',-1),
@@ -380,7 +380,7 @@ INSERT INTO `config` VALUES
 ('judges_availability_enable','no','Judge Registration','yesno','',950,'Allow judges to specify their time availability on the fair day based on the defined judging rounds/timeslots. The scheduler will then use this judge availability data when assigning judges to teams and projects.',-1),
 ('judge_personal_fields','phonehome,phonecell,phonework,org,address,city,province,lang','Judge Registration','multisel','sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province',500,'Personal Information to ask for on the Judge personal information page (in addition to Name and Email)',-1),
 ('judge_personal_required','phonehome,address,city,province','Judge Registration','multisel','sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province',600,'Required Personal Information on the Judge personal information page (Name and Email is always required)',-1),
-('theme_icons','icons_default','Global','theme','icons',860,'Icon set',-1),
+('theme_icons','icons_science_ation','Global','theme','icons',860,'Icon set',-1),
 ('fairs_allow_login','no','Science Fairs','yesno','',200,'Allow feeder fairs to login an enter stats and winners.  If set to \'no\', they will only be able to download and upload awards using the SFIAB award download/upload mechanism.',-1),
 ('fairs_name','Science','Feeder Fairs','text','',300,'What level the feeder fairs are.  For example, \'School\' , \'Regional\', or just \'Science\' for a generic \'Science Fair\'',-1),
 ('fairs_enable','no','Science Fairs','yesno','',100,'Enable the Science Fair.  Science Fairs can download awards tagged as \'downloadable\', and can upload winners of those awards directly into this system (optionally creating accounts for all students).  There are also options to collect stats from these fairs.',-1),
@@ -475,8 +475,8 @@ INSERT INTO `config` VALUES
 ('specialawardnomination_aftersignatures','yes','Participant Registration','yesno','',2800,'Does the signature page/permission form need to be received BEFORE students are allowed to self nominate for special awards?',2025),
 ('sponsor_personal_fields','phonecell,phonework,fax,org','Sponsors','multisel','salutation=Salutation|sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province',500,'Personal Information to ask for on the Sponsor Contact profile page (in addition to Name and Email)',2025),
 ('sponsor_personal_required','','Sponsors','multisel','salutation=Salutation|sex=Gender|phonehome=Home Phone|phonework=Work Phone|phonecell=Cell Phone|fax=Fax|org=Organization|birthdate=Birthdate|lang=Preferred Language|address=Address and PostalCode|city=City|province=Province',600,'Required Personal Information on the Sponsor Contact profile page (Name and Email is always required)',2025),
-('theme','default','Global','theme','theme',850,'Theme for colours',2025),
-('theme_icons','icons_default','Global','theme','icons',860,'Icon set',2025),
+('theme','science_ation','Global','theme','theme',850,'Theme for colours',2025),
+('theme_icons','icons_science_ation','Global','theme','icons',860,'Icon set',2025),
 ('timeformat','H:i:s','Localization','text','',210,'Time format (<a href=\"http://www.php.net/manual/en/function.date.php\" target=\"_blank\">formatting options</a>)',2025),
 ('times_judged','1','Judge Scheduler','','',500,'The number of times each project must be judged by different judging teams.',2025),
 ('tours_assigner_effort','10000','Tour Assigner','enum','100=Low|1000=Medium|10000=High',99999,'This controls how long and hard the tour assigner will look for a quality solution. Low effort will finish almost instantly but give a very poor result. High effort can take several minutes to run, but it gives a very good solution. ',2025),
diff --git a/common.inc.php b/common.inc.php
index 8718c4f4..58b208f9 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -374,7 +374,7 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 <!-- <script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/jqueryui/1.7.2/jquery-ui.min.js"></script> -->
 <script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/sfiab.js"></script>
-<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/new_default/theme-script.js"></script>
+<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/theme-script.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
         $('.tableview').tablesorter();
@@ -393,6 +393,8 @@ $(document).ready(function(){
 		echo '<img align="left" height="50" src="' . $config['SFIABDIRECTORY'] . '/data/logo-100.gif">';
 
 	echo '<h1>' . i18n($config['fairname']) . '</h1>';
+
+	
 	echo "<span id='menu-toggle-button' onClick='toggle_sidebar()' class='material-symbols-outlined'>
 menu
 </span>"
@@ -668,7 +670,7 @@ function send_popup_header($title = '')
 <script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/js/sfiab.js"></script>
 
-<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/new_default/theme-script.js"></script>
+<script type="text/javascript" src="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/theme-script.js"></script>
 <div id="notice_area" class="notice_area"></div>
 
 <?
diff --git a/theme/classic/images/ui-bg_flat_0_aaaaaa_40x100.png b/theme/classic/images/ui-bg_flat_0_aaaaaa_40x100.png
deleted file mode 100644
index 5b5dab2a..00000000
Binary files a/theme/classic/images/ui-bg_flat_0_aaaaaa_40x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_flat_0_d0d0ff_40x100.png b/theme/classic/images/ui-bg_flat_0_d0d0ff_40x100.png
deleted file mode 100644
index e53103e1..00000000
Binary files a/theme/classic/images/ui-bg_flat_0_d0d0ff_40x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_flat_0_eeeeff_40x100.png b/theme/classic/images/ui-bg_flat_0_eeeeff_40x100.png
deleted file mode 100644
index b4c9458e..00000000
Binary files a/theme/classic/images/ui-bg_flat_0_eeeeff_40x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_flat_0_ffffff_40x100.png b/theme/classic/images/ui-bg_flat_0_ffffff_40x100.png
deleted file mode 100644
index ac8b229a..00000000
Binary files a/theme/classic/images/ui-bg_flat_0_ffffff_40x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_flat_75_eeeeff_40x100.png b/theme/classic/images/ui-bg_flat_75_eeeeff_40x100.png
deleted file mode 100644
index b4c9458e..00000000
Binary files a/theme/classic/images/ui-bg_flat_75_eeeeff_40x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_glass_55_fbf9ee_1x400.png b/theme/classic/images/ui-bg_glass_55_fbf9ee_1x400.png
deleted file mode 100644
index ad3d6346..00000000
Binary files a/theme/classic/images/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_highlight-hard_75_d0d0ff_1x100.png b/theme/classic/images/ui-bg_highlight-hard_75_d0d0ff_1x100.png
deleted file mode 100644
index 5e5111ae..00000000
Binary files a/theme/classic/images/ui-bg_highlight-hard_75_d0d0ff_1x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/theme/classic/images/ui-bg_inset-soft_95_fef1ec_1x100.png
deleted file mode 100644
index 0e05810f..00000000
Binary files a/theme/classic/images/ui-bg_inset-soft_95_fef1ec_1x100.png and /dev/null differ
diff --git a/theme/classic/images/ui-icons_222222_256x240.png b/theme/classic/images/ui-icons_222222_256x240.png
deleted file mode 100644
index ee039dc0..00000000
Binary files a/theme/classic/images/ui-icons_222222_256x240.png and /dev/null differ
diff --git a/theme/classic/images/ui-icons_2e83ff_256x240.png b/theme/classic/images/ui-icons_2e83ff_256x240.png
deleted file mode 100644
index 45e8928e..00000000
Binary files a/theme/classic/images/ui-icons_2e83ff_256x240.png and /dev/null differ
diff --git a/theme/classic/images/ui-icons_454545_256x240.png b/theme/classic/images/ui-icons_454545_256x240.png
deleted file mode 100644
index 7ec70d11..00000000
Binary files a/theme/classic/images/ui-icons_454545_256x240.png and /dev/null differ
diff --git a/theme/classic/images/ui-icons_888888_256x240.png b/theme/classic/images/ui-icons_888888_256x240.png
deleted file mode 100644
index 5ba708c3..00000000
Binary files a/theme/classic/images/ui-icons_888888_256x240.png and /dev/null differ
diff --git a/theme/classic/images/ui-icons_cd0a0a_256x240.png b/theme/classic/images/ui-icons_cd0a0a_256x240.png
deleted file mode 100644
index 7930a558..00000000
Binary files a/theme/classic/images/ui-icons_cd0a0a_256x240.png and /dev/null differ
diff --git a/theme/classic/jquery-ui-1.7.2.custom.css b/theme/classic/jquery-ui-1.7.2.custom.css
deleted file mode 100644
index 70408577..00000000
--- a/theme/classic/jquery-ui-1.7.2.custom.css
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-
-/*
-* jQuery UI CSS Framework
-* Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller&ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=d0d0ff&bgTextureHeader=04_highlight_hard.png&bgImgOpacityHeader=75&borderColorHeader=a5b5c6&fcHeader=222222&iconColorHeader=222222&bgColorContent=eeeeff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=a5b5c6&fcContent=222222&iconColorContent=222222&bgColorDefault=d0d0ff&bgTextureDefault=01_flat.png&bgImgOpacityDefault=0&borderColorDefault=a5b5c6&fcDefault=000000&iconColorDefault=888888&bgColorHover=ffffff&bgTextureHover=01_flat.png&bgImgOpacityHover=0&borderColorHover=a5b5c6&fcHover=000000&iconColorHover=454545&bgColorActive=eeeeff&bgTextureActive=01_flat.png&bgImgOpacityActive=0&borderColorActive=a5b5c6&fcActive=000000&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=05_inset_soft.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-*/
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #a5b5c6; background: #eeeeff url(images/ui-bg_flat_75_eeeeff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #a5b5c6; background: #d0d0ff url(images/ui-bg_highlight-hard_75_d0d0ff_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; }
-.ui-widget-header a { color: #222222; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #a5b5c6; background: #d0d0ff url(images/ui-bg_flat_0_d0d0ff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; outline: none; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #000000; text-decoration: none; outline: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #a5b5c6; background: #ffffff url(images/ui-bg_flat_0_ffffff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; outline: none; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #000000; text-decoration: none; outline: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #a5b5c6; background: #eeeeff url(images/ui-bg_flat_0_eeeeff_40x100.png) 50% 50% repeat-x; font-weight: normal; color: #000000; outline: none; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #000000; outline: none; text-decoration: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_inset-soft_95_fef1ec_1x100.png) 50% bottom repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_888888_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
-
-/* positioning */
-.ui-icon-carat-1-n { background-position: 0 0; }
-.ui-icon-carat-1-ne { background-position: -16px 0; }
-.ui-icon-carat-1-e { background-position: -32px 0; }
-.ui-icon-carat-1-se { background-position: -48px 0; }
-.ui-icon-carat-1-s { background-position: -64px 0; }
-.ui-icon-carat-1-sw { background-position: -80px 0; }
-.ui-icon-carat-1-w { background-position: -96px 0; }
-.ui-icon-carat-1-nw { background-position: -112px 0; }
-.ui-icon-carat-2-n-s { background-position: -128px 0; }
-.ui-icon-carat-2-e-w { background-position: -144px 0; }
-.ui-icon-triangle-1-n { background-position: 0 -16px; }
-.ui-icon-triangle-1-ne { background-position: -16px -16px; }
-.ui-icon-triangle-1-e { background-position: -32px -16px; }
-.ui-icon-triangle-1-se { background-position: -48px -16px; }
-.ui-icon-triangle-1-s { background-position: -64px -16px; }
-.ui-icon-triangle-1-sw { background-position: -80px -16px; }
-.ui-icon-triangle-1-w { background-position: -96px -16px; }
-.ui-icon-triangle-1-nw { background-position: -112px -16px; }
-.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
-.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
-.ui-icon-arrow-1-n { background-position: 0 -32px; }
-.ui-icon-arrow-1-ne { background-position: -16px -32px; }
-.ui-icon-arrow-1-e { background-position: -32px -32px; }
-.ui-icon-arrow-1-se { background-position: -48px -32px; }
-.ui-icon-arrow-1-s { background-position: -64px -32px; }
-.ui-icon-arrow-1-sw { background-position: -80px -32px; }
-.ui-icon-arrow-1-w { background-position: -96px -32px; }
-.ui-icon-arrow-1-nw { background-position: -112px -32px; }
-.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
-.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
-.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
-.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
-.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
-.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
-.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
-.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
-.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
-.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
-.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
-.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
-.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
-.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
-.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
-.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
-.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
-.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
-.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
-.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
-.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
-.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
-.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
-.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
-.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
-.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
-.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
-.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
-.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
-.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
-.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
-.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
-.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
-.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
-.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
-.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
-.ui-icon-arrow-4 { background-position: 0 -80px; }
-.ui-icon-arrow-4-diag { background-position: -16px -80px; }
-.ui-icon-extlink { background-position: -32px -80px; }
-.ui-icon-newwin { background-position: -48px -80px; }
-.ui-icon-refresh { background-position: -64px -80px; }
-.ui-icon-shuffle { background-position: -80px -80px; }
-.ui-icon-transfer-e-w { background-position: -96px -80px; }
-.ui-icon-transferthick-e-w { background-position: -112px -80px; }
-.ui-icon-folder-collapsed { background-position: 0 -96px; }
-.ui-icon-folder-open { background-position: -16px -96px; }
-.ui-icon-document { background-position: -32px -96px; }
-.ui-icon-document-b { background-position: -48px -96px; }
-.ui-icon-note { background-position: -64px -96px; }
-.ui-icon-mail-closed { background-position: -80px -96px; }
-.ui-icon-mail-open { background-position: -96px -96px; }
-.ui-icon-suitcase { background-position: -112px -96px; }
-.ui-icon-comment { background-position: -128px -96px; }
-.ui-icon-person { background-position: -144px -96px; }
-.ui-icon-print { background-position: -160px -96px; }
-.ui-icon-trash { background-position: -176px -96px; }
-.ui-icon-locked { background-position: -192px -96px; }
-.ui-icon-unlocked { background-position: -208px -96px; }
-.ui-icon-bookmark { background-position: -224px -96px; }
-.ui-icon-tag { background-position: -240px -96px; }
-.ui-icon-home { background-position: 0 -112px; }
-.ui-icon-flag { background-position: -16px -112px; }
-.ui-icon-calendar { background-position: -32px -112px; }
-.ui-icon-cart { background-position: -48px -112px; }
-.ui-icon-pencil { background-position: -64px -112px; }
-.ui-icon-clock { background-position: -80px -112px; }
-.ui-icon-disk { background-position: -96px -112px; }
-.ui-icon-calculator { background-position: -112px -112px; }
-.ui-icon-zoomin { background-position: -128px -112px; }
-.ui-icon-zoomout { background-position: -144px -112px; }
-.ui-icon-search { background-position: -160px -112px; }
-.ui-icon-wrench { background-position: -176px -112px; }
-.ui-icon-gear { background-position: -192px -112px; }
-.ui-icon-heart { background-position: -208px -112px; }
-.ui-icon-star { background-position: -224px -112px; }
-.ui-icon-link { background-position: -240px -112px; }
-.ui-icon-cancel { background-position: 0 -128px; }
-.ui-icon-plus { background-position: -16px -128px; }
-.ui-icon-plusthick { background-position: -32px -128px; }
-.ui-icon-minus { background-position: -48px -128px; }
-.ui-icon-minusthick { background-position: -64px -128px; }
-.ui-icon-close { background-position: -80px -128px; }
-.ui-icon-closethick { background-position: -96px -128px; }
-.ui-icon-key { background-position: -112px -128px; }
-.ui-icon-lightbulb { background-position: -128px -128px; }
-.ui-icon-scissors { background-position: -144px -128px; }
-.ui-icon-clipboard { background-position: -160px -128px; }
-.ui-icon-copy { background-position: -176px -128px; }
-.ui-icon-contact { background-position: -192px -128px; }
-.ui-icon-image { background-position: -208px -128px; }
-.ui-icon-video { background-position: -224px -128px; }
-.ui-icon-script { background-position: -240px -128px; }
-.ui-icon-alert { background-position: 0 -144px; }
-.ui-icon-info { background-position: -16px -144px; }
-.ui-icon-notice { background-position: -32px -144px; }
-.ui-icon-help { background-position: -48px -144px; }
-.ui-icon-check { background-position: -64px -144px; }
-.ui-icon-bullet { background-position: -80px -144px; }
-.ui-icon-radio-off { background-position: -96px -144px; }
-.ui-icon-radio-on { background-position: -112px -144px; }
-.ui-icon-pin-w { background-position: -128px -144px; }
-.ui-icon-pin-s { background-position: -144px -144px; }
-.ui-icon-play { background-position: 0 -160px; }
-.ui-icon-pause { background-position: -16px -160px; }
-.ui-icon-seek-next { background-position: -32px -160px; }
-.ui-icon-seek-prev { background-position: -48px -160px; }
-.ui-icon-seek-end { background-position: -64px -160px; }
-.ui-icon-seek-first { background-position: -80px -160px; }
-.ui-icon-stop { background-position: -96px -160px; }
-.ui-icon-eject { background-position: -112px -160px; }
-.ui-icon-volume-off { background-position: -128px -160px; }
-.ui-icon-volume-on { background-position: -144px -160px; }
-.ui-icon-power { background-position: 0 -176px; }
-.ui-icon-signal-diag { background-position: -16px -176px; }
-.ui-icon-signal { background-position: -32px -176px; }
-.ui-icon-battery-0 { background-position: -48px -176px; }
-.ui-icon-battery-1 { background-position: -64px -176px; }
-.ui-icon-battery-2 { background-position: -80px -176px; }
-.ui-icon-battery-3 { background-position: -96px -176px; }
-.ui-icon-circle-plus { background-position: 0 -192px; }
-.ui-icon-circle-minus { background-position: -16px -192px; }
-.ui-icon-circle-close { background-position: -32px -192px; }
-.ui-icon-circle-triangle-e { background-position: -48px -192px; }
-.ui-icon-circle-triangle-s { background-position: -64px -192px; }
-.ui-icon-circle-triangle-w { background-position: -80px -192px; }
-.ui-icon-circle-triangle-n { background-position: -96px -192px; }
-.ui-icon-circle-arrow-e { background-position: -112px -192px; }
-.ui-icon-circle-arrow-s { background-position: -128px -192px; }
-.ui-icon-circle-arrow-w { background-position: -144px -192px; }
-.ui-icon-circle-arrow-n { background-position: -160px -192px; }
-.ui-icon-circle-zoomin { background-position: -176px -192px; }
-.ui-icon-circle-zoomout { background-position: -192px -192px; }
-.ui-icon-circle-check { background-position: -208px -192px; }
-.ui-icon-circlesmall-plus { background-position: 0 -208px; }
-.ui-icon-circlesmall-minus { background-position: -16px -208px; }
-.ui-icon-circlesmall-close { background-position: -32px -208px; }
-.ui-icon-squaresmall-plus { background-position: -48px -208px; }
-.ui-icon-squaresmall-minus { background-position: -64px -208px; }
-.ui-icon-squaresmall-close { background-position: -80px -208px; }
-.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
-.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
-.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
-.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
-.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
-.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; }
-.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
-.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-.ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; }
-.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; }
-.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; }/* Accordion
-----------------------------------*/
-.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion .ui-accordion-li-fix { display: inline; }
-.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
-.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { float:left; font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker .ui-datepicker-title select.ui-datepicker-year { float: right; }
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/* Dialog
-----------------------------------*/
-.ui-dialog { position: relative; padding: .2em; width: 300px; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em .3em .3em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .2em; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/* Progressbar
-----------------------------------*/
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }/* Resizable
-----------------------------------*/
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0px; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0px; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0px; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0px; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Slider
-----------------------------------*/
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
-.ui-tabs { padding: .2em; zoom: 1; }
-.ui-tabs .ui-tabs-nav { list-style: none; position: relative; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { position: relative; float: left; border-bottom-width: 0 !important; margin: 0 .2em -1px 0; padding: 0; }
-.ui-tabs .ui-tabs-nav li a { float: left; text-decoration: none; padding: .5em 1em; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { padding-bottom: 1px; border-bottom-width: 0; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { padding: 1em 1.4em; display: block; border-width: 0; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
diff --git a/theme/classic/sfiab.css b/theme/classic/sfiab.css
deleted file mode 100644
index 1e1fa040..00000000
--- a/theme/classic/sfiab.css
+++ /dev/null
@@ -1,444 +0,0 @@
-body
-{
-	font-family: Verdana, Arial, Sans-Serif;
-	font-size: small;
-	margin: 0;
-	padding: 0;
-	background: #E0E0FF;
-	height:100%;
-}
-
-input, textarea, select
-{
-	font-family: Verdana, Arial, Sans-Serif;
-	font-size: small;
-}
-
-td {
-	vertical-align: top;
-}
-
-
-table tr.even {
-	background: #EEEEFF;
-}
-
-table tr.odd {
-	background: #E0E0F8;
-}
-
-#header {
-	height: 50px;
-	text-align: center;
-	background: #E0E0FF;
-	padding: 10px;
-}
-
-#footer {
-	width: 100%;
-	text-align: center;
-	background-color : #5C6F90;
-	font-size: 0.8em;
-}
-
-#footer a {
-	text-decoration: none;
-	font-size: 1em;
-	color: #FFFFFF;
-}
-
-#left {
-	width: 165px;
-	background: #EEEEFF;
-	border: 2px solid Silver;
-	padding: 5px;
-	font-size: 1.0em;
-}
-
-
-#main {
-	margin-right: 10px;
-	background: #FFFFFF;
-	padding: 3px;
-	border: 2px solid Silver;
-	min-height: 600px;
-	width: 99%;
-}
-
-#mainwhere {
-    margin-right: 10px;
-    background: #EEEEFF;
-    padding: 3px;
-    border-top: 2px solid Silver;
-    border-left: 2px solid Silver;
-    border-right: 2px solid Silver;
-    font-size: 0.85em;
-	width: 99%;
-}
-
-
-#emptypopup {
-	padding: 30px;
-	text-align: center;
-}
-
-h1 {
-	font-size: 2.0em;
-	font-weight: bold;
-	margin-top: 0;
-	margin-bottom: 0;
-} 
-h2 {
-	font-size: 1.6em;
-	font-weight: bold;
-	margin-top: 0;
-	margin-bottom: .3em;
-}
-h3 {
-	font-size: 1.4em;
-	font-weight: bold;
-	margin-top: 0;
-	margin-bottom: .2em;
-}
-h4 {
-	font-size: 1.2em;
-	font-weight: bold;
-	margin-top: 0;
-	margin-bottom: .1em;
-}
-
-ul.mainnav {
-	list-style : none;
-	margin : 0;
-	padding : 0;
-	background-color : #d6d6d6;
-	width: 165px;
-}
-
-ul.mainnav li {
-	display : block;
-	border-top : 1px solid #a5b5c6;
-}
-
-ul.mainnav li a {
-	display : block;
-	margin : 0;
-	padding : 6px;
-	background-color : #5C6F90;
-	font : bold 0.9em/1.5em Arial, sans-serif;
-	color : #fff;
-	text-decoration : none;
-}
-
-ul.mainnav li a:hover {
-	background-color : #63616b;
-	color : #eee;
-	text-decoration: none;
-}
-
-.aligncenter {
-	width: 100%;
-	text-align: center;
-}
-
-a {
-	text-decoration: none;
-	font-size: 1em;
-	color: #5C6F90;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-.summarytable {
-	border-collapse: collapse;
-	border-spacing: 0px;
-	border: 2px solid black;
-	margin: 0px;
-	padding: 0px;
-	margin-left: 30px;
-	margin-right: 30px;
-	
-}
-
-.summarytable th {
-	border: 2px solid black;
-	background-color: #5C6F90;
-	padding: 5px;
-	margin: 0px;
-	font-size: 1.0em;
-	color: white;
-	font-weight: bold;
-}
-
-.summarytable th a{
-	font-size: 1.0em;
-	color: white;
-	font-weight: bold;
-}
-
-.summarytable td {
-	border: 2px solid black;
-	margin: 0px;
-	padding: 2px;
-
-}
-
-.complete {
-	color: green;
-	font-weight: bold;
-}
-
-.incomplete {
-	color: red;
-	font-weight: bold;
-
-}
-
-.error {
-	color: red;
-	font-weight: bold;
-	border: 1px solid red;
-	background: #F0DCDC;
-}
-
-
-.notice {
-	font-weight: bold;
-	border: 1px solid Silver;
-/*background: #E0E0FF; */
-	background: #FFFFE0;
-	font-size: 1em;
-}
-
-.happy {
-	color: green;
-	font-weight: bold;
-	border: 1px solid Silver;
-	background: #D0EED0;
-	font-size: 1em;
-}
-
-.caution {
-	text-decoration: none;
-	font-weight: bold;
-	font-size: 1em;
-	color: red;
-}
-
-a.caution:hover {
-	text-decoration: underline;
-}
-
-.requiredfield {
-	font-weight: bold;
-	font-size: 0.8em;
-	color: #FF0000;
-}
-
-.headertable td {
-	vertical-align: baseline;
-}
-
-hr {
-	margin-top: 2px;
-}
-
-tr.externalaward {
-	font-style: italic;
-	color: #0000AA;
-}
-
-.adminconfigtable {
-	border-collapse: collapse;
-}
-
-.adminconfigtable td {
-	text-align: center;
-	padding: 5px;
-	width: 128px;
-	color: #999999;
-}
-
-.fundraisingpending {
-	color: black;
-	border: 1px solid #FFAAAA;
-	background: #FFAAAA;
-}
-
-.fundraisingconfirmed {
-	color: black;
-	border: 1px solid #FFFFAA;
-	background: #FFFFAA;
-}
-
-
-.fundraisingreceived {
-	color: black;
-	border: 1px solid #AAFFAA;
-	background: #AAFFAA;
-}
-
-.fundraisingtable {
-	border-collapse: collapse;
-	border-spacing: 0px;
-	border: 0px;
-	margin: 0px;
-	padding: 0px;
-	margin-left: 30px;
-	margin-right: 30px;
-	font-size: 0.8em;
-	
-}
-
-.fundraisingtable th {
-	border: 1px solid black;
-	background-color: #5C6F90;
-	padding: 2px;
-	margin: 0px;
-	font-size: 1.0em;
-	color: white;
-	font-weight: bold;
-	text-align: left;
-}
-
-.fundraisingtable th a{
-	color: white;
-	font-weight: normal;
-}
-
-.fundraisingtable td {
-	border: 1px solid black;
-	margin: 0px;
-	padding: 1px;
-
-}
-
-/* Notice area floating along the top of the page */
-div.notice_area {
-	left: 0;
-	top: 0;
-	width: 100%;
-	position: fixed;
-	z-index: 9999;
-}
-
-div.notice_area div {
-	padding: 0.1em 0;
-	border: 0;
-	text-align: center;
-	position: relative;
-	font-size: 1.5em;
-	background-color: #FFFFE0;
-}
-
-div.notice_area div.notice {
-	border: 3px solid yellow;
-	color: black;
-	background-color: #FFFFE0;
-}
-
-div.notice_area div.error {
-	border: 3px solid red;
-	color: red;
-	background-color: #FF9999;
-}
-
-div.notice_area div.happy {
-/*	border: 2px solid white;
-	color: green;
-	background-color: #99FF99;*/
-	color: white;
-	background-color: green;
-}
-
-.date {
-    width: 80px;
-
-}
-
-/* The popup windows created with jquery-ui use the following classes:
- * div.ui-dialog 
- * div.ui-dialog-titlebar - includes the next 2 items in the div
- * span.ui-dialog-title-dialog - Title text
- * a.ui-dialog-titlebar-close
- * ui-dialog-content */
-
-/* Override the background colour */
-.ui-dialog {
-	background: #e0e0ff;
-}
-
-.ui-widget {
-	font-size: 1em;
-}
-
-/* Override the titlebar padding, it's too big, make the font
- * a happy size */
-.ui-dialog .ui-dialog-titlebar { 
-	padding: 0.2em 0.5em 0.2em .5em ;
-	font-size: 1.2em;
-	font-weight: bold;
-	text-align: center;
-
-}
-
-/* Required for tabs to work */
-.ui-tabs .ui-tabs-hide {
-	display: none;
-}
-
-/* Rework the tabs, the default layout with a separate div
- behind only the tabs is silly, and it looks stupid. */
-div.ui-tabs {
-	background: none;
-	border: none;
-	padding: 0;
-}
-
-div.ui-tabs div.ui-tabs-panel {
-	border: 1px solid #A5B5C6;
-	background: #eeeeff;
-}
-
-div.ui-tabs ul.ui-tabs-nav {
-	border: 0;
-	background: none;
-}
-
-/* Dump the HUGE tab border and change the font.  We need to
- * rework the fonts for ALL of sfiab.   "1em" in here is about 20pt*/
-.ui-tabs .ui-tabs-nav li a {
-	padding: 0.1em 0.3em 0.1em 0.3em;
-	font-size: 1em;
-	font-weight: bold;
-}
-
-.ui-datepicker {
-    z-index: 1003;
-}
-
-.text-link {
-	cursor: pointer;
-	color: #5C6F90;
-	text-decoration: underline;
-}
-
-.text-link-selected {
-	font-weight: bold;
-	cursor: default;
-	text-decoration: none;
-	color: #000000;
-}
-
-.text-link-disabled {
-	font-weight: none;
-	cursor: default;
-	text-decoration: none;
-	color: #c0c0c0;
-}
-
-
-
-
diff --git a/theme/classic/theme.php b/theme/classic/theme.php
deleted file mode 100644
index 1181a690..00000000
--- a/theme/classic/theme.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?
-/* 
-   This file is part of the 'Science Fair In A Box' project
-   SFIAB Website: http://www.sfiab.ca
-
-   Copyright (C) 2008 James Grant <james@lightbox.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation, version 2.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-	$theme['name']="Classic";
-	$theme['description']="A classic colour scheme";
-	$theme['author']="James Grant <james@lightbox.org>";
-
-?>
diff --git a/theme/icons_science_ation/icons.php b/theme/icons_science_ation/icons.php
index 27c8304c..f5aa2f91 100644
--- a/theme/icons_science_ation/icons.php
+++ b/theme/icons_science_ation/icons.php
@@ -21,8 +21,8 @@
 */
 
 	$theme_icons['name']="Science-ation Icons";
-	$theme_icons['description']="KDE4 icons";
-	$theme_icons['author']="James Grant <james@lightbox.org>";
+	$theme_icons['description']="Google Material Icons";
+	$theme_icons['author']="AlgoLibre Inc. <contact@science-ation.ca>";
 
 	//COMMITTEE MAIN ICONS (that are not used in admin/config already)
 	$theme_icons['icons']['change_password']="encrypted.png";
diff --git a/theme/new_default/images/ui-bg_flat_55_999999_40x100.png b/theme/science_ation/images/ui-bg_flat_55_999999_40x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_flat_55_999999_40x100.png
rename to theme/science_ation/images/ui-bg_flat_55_999999_40x100.png
diff --git a/theme/new_default/images/ui-bg_flat_75_aaaaaa_40x100.png b/theme/science_ation/images/ui-bg_flat_75_aaaaaa_40x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_flat_75_aaaaaa_40x100.png
rename to theme/science_ation/images/ui-bg_flat_75_aaaaaa_40x100.png
diff --git a/theme/new_default/images/ui-bg_glass_45_0078ae_1x400.png b/theme/science_ation/images/ui-bg_glass_45_0078ae_1x400.png
similarity index 100%
rename from theme/new_default/images/ui-bg_glass_45_0078ae_1x400.png
rename to theme/science_ation/images/ui-bg_glass_45_0078ae_1x400.png
diff --git a/theme/new_default/images/ui-bg_glass_55_f8da4e_1x400.png b/theme/science_ation/images/ui-bg_glass_55_f8da4e_1x400.png
similarity index 100%
rename from theme/new_default/images/ui-bg_glass_55_f8da4e_1x400.png
rename to theme/science_ation/images/ui-bg_glass_55_f8da4e_1x400.png
diff --git a/theme/new_default/images/ui-bg_glass_75_79c9ec_1x400.png b/theme/science_ation/images/ui-bg_glass_75_79c9ec_1x400.png
similarity index 100%
rename from theme/new_default/images/ui-bg_glass_75_79c9ec_1x400.png
rename to theme/science_ation/images/ui-bg_glass_75_79c9ec_1x400.png
diff --git a/theme/new_default/images/ui-bg_gloss-wave_45_e14f1c_500x100.png b/theme/science_ation/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
rename to theme/science_ation/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
diff --git a/theme/new_default/images/ui-bg_gloss-wave_50_6eac2c_500x100.png b/theme/science_ation/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
rename to theme/science_ation/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
diff --git a/theme/new_default/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/theme/science_ation/images/ui-bg_gloss-wave_75_2191c0_500x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_gloss-wave_75_2191c0_500x100.png
rename to theme/science_ation/images/ui-bg_gloss-wave_75_2191c0_500x100.png
diff --git a/theme/new_default/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/theme/science_ation/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
similarity index 100%
rename from theme/new_default/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
rename to theme/science_ation/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/theme/new_default/images/ui-icons_0078ae_256x240.png b/theme/science_ation/images/ui-icons_0078ae_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_0078ae_256x240.png
rename to theme/science_ation/images/ui-icons_0078ae_256x240.png
diff --git a/theme/new_default/images/ui-icons_056b93_256x240.png b/theme/science_ation/images/ui-icons_056b93_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_056b93_256x240.png
rename to theme/science_ation/images/ui-icons_056b93_256x240.png
diff --git a/theme/new_default/images/ui-icons_d8e7f3_256x240.png b/theme/science_ation/images/ui-icons_d8e7f3_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_d8e7f3_256x240.png
rename to theme/science_ation/images/ui-icons_d8e7f3_256x240.png
diff --git a/theme/new_default/images/ui-icons_e0fdff_256x240.png b/theme/science_ation/images/ui-icons_e0fdff_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_e0fdff_256x240.png
rename to theme/science_ation/images/ui-icons_e0fdff_256x240.png
diff --git a/theme/new_default/images/ui-icons_f5e175_256x240.png b/theme/science_ation/images/ui-icons_f5e175_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_f5e175_256x240.png
rename to theme/science_ation/images/ui-icons_f5e175_256x240.png
diff --git a/theme/new_default/images/ui-icons_f7a50d_256x240.png b/theme/science_ation/images/ui-icons_f7a50d_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_f7a50d_256x240.png
rename to theme/science_ation/images/ui-icons_f7a50d_256x240.png
diff --git a/theme/new_default/images/ui-icons_fcd113_256x240.png b/theme/science_ation/images/ui-icons_fcd113_256x240.png
similarity index 100%
rename from theme/new_default/images/ui-icons_fcd113_256x240.png
rename to theme/science_ation/images/ui-icons_fcd113_256x240.png
diff --git a/theme/new_default/jquery-ui-1.7.2.custom.css b/theme/science_ation/jquery-ui-1.7.2.custom.css
similarity index 100%
rename from theme/new_default/jquery-ui-1.7.2.custom.css
rename to theme/science_ation/jquery-ui-1.7.2.custom.css
diff --git a/theme/new_default/sfiab.css b/theme/science_ation/sfiab.css
similarity index 100%
rename from theme/new_default/sfiab.css
rename to theme/science_ation/sfiab.css
diff --git a/theme/new_default/theme-script.js b/theme/science_ation/theme-script.js
similarity index 100%
rename from theme/new_default/theme-script.js
rename to theme/science_ation/theme-script.js
diff --git a/theme/new_default/theme.php b/theme/science_ation/theme.php
similarity index 93%
rename from theme/new_default/theme.php
rename to theme/science_ation/theme.php
index 79371567..fd2dbdec 100644
--- a/theme/new_default/theme.php
+++ b/theme/science_ation/theme.php
@@ -22,6 +22,6 @@
 
 	$theme['name']="Science-ation";
 	$theme['description']="The default theme";
-	$theme['author']="James Grant <james@lightbox.org>";
+	$theme['author']="AlgoLibre Inc. <contact@science-ation.ca>";
 
 ?>