diff --git a/lib/class/update.class.php b/lib/class/update.class.php
index 819e96b5..471cf0ba 100644
--- a/lib/class/update.class.php
+++ b/lib/class/update.class.php
@@ -1668,7 +1668,7 @@ class Update
             "`date` int(11) unsigned NOT NULL DEFAULT '0'," .
             "PRIMARY KEY (`id`)," .
             "UNIQUE KEY `unique_userflag` (`user`,`object_type`,`object_id`)," .
-            "KEY `object_id` (`object_id`))";
+            "KEY `object_id` (`object_id`)) ENGINE = MYISAM";
         return Dba::write($sql);
     }
 
@@ -1949,7 +1949,7 @@ class Update
             "`date` int(11) unsigned NOT NULL DEFAULT '0'," .
             "`accepted` tinyint(1) NOT NULL DEFAULT '0'," .
             "PRIMARY KEY (`id`)," .
-            "UNIQUE KEY `unique_wanted` (`user`, `artist`,`mbid`))";
+            "UNIQUE KEY `unique_wanted` (`user`, `artist`,`mbid`)) ENGINE = MYISAM";
 
         return Dba::write($sql);
     }
@@ -1971,7 +1971,7 @@ class Update
             "`disk` int(11) NULL," .
             "`track` int(11) NULL," .
             "`file` varchar(255) CHARACTER SET utf8 NULL," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
 
         return Dba::write($sql);
     }
@@ -2118,7 +2118,7 @@ class Update
             "`lastvisit_date` int(11) unsigned NOT NULL DEFAULT '0'," .
             "`public_url` varchar(255) CHARACTER SET utf8 NULL," .
             "`description` varchar(255) CHARACTER SET utf8 NULL," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
         Dba::write($sql);
 
         $sql = "INSERT INTO `preference` (`name`,`value`,`description`,`level`,`type`,`catagory`) " .
@@ -2206,7 +2206,7 @@ class Update
             "`stream_type` varchar(8) CHARACTER SET utf8 NOT NULL DEFAULT 'mp3'," .
             "`bitrate` int(11) unsigned NOT NULL DEFAULT '128'," .
             "`pid` int(11) unsigned NOT NULL DEFAULT '0'," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
         return Dba::write($sql);
     }
 
@@ -2227,7 +2227,7 @@ class Update
             "`started` tinyint(1) unsigned NOT NULL DEFAULT '0'," .
             "`listeners` int(11) unsigned NOT NULL DEFAULT '0'," .
             "`key` varchar(32) CHARACTER SET utf8 NULL," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
         Dba::write($sql);
 
         $sql = "CREATE TABLE `player_control` (" .
@@ -2238,7 +2238,7 @@ class Update
             "`object_type` varchar(32) NOT NULL," .
             "`object_id` int(11) unsigned NOT NULL," .
             "`send_date` int(11) unsigned NOT NULL DEFAULT '0'," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
 
         return Dba::write($sql);
     }
@@ -2278,7 +2278,7 @@ class Update
             "`object_type` varchar(32) NOT NULL," .
             "`object_id` int(11) unsigned NOT NULL," .
             "`last_update` int(11) unsigned NOT NULL DEFAULT '0'," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
         Dba::write($sql);
 
         $sql = "CREATE TABLE `recommendation_item` (" .
@@ -2288,7 +2288,7 @@ class Update
             "`name` varchar(256) NULL," .
             "`rel` varchar(256) NULL," .
             "`mbid` varchar(1369) NULL," .
-            "PRIMARY KEY (`id`))";
+            "PRIMARY KEY (`id`)) ENGINE = MYISAM";
         Dba::write($sql);
 
         return true;
diff --git a/templates/show_channel_row.inc.php b/templates/show_channel_row.inc.php
index d93baed0..575fdf06 100644
--- a/templates/show_channel_row.inc.php
+++ b/templates/show_channel_row.inc.php
@@ -32,7 +32,7 @@
 <td class="cel_name"><?php echo $channel->name; ?></td>
 <td class="cel_interface"><?php echo $channel->interface; ?></td>
 <td class="cel_port"><?php echo $channel->port; ?></td>
-<td class="cel_data"><?php echo $channel->get_target_object()->f_link; ?></td>
+<td class="cel_data"><?php echo $channel->get_target_object()->f_name_link; ?></td>
 <!--<td class="cel_random"><?php echo ($channel->random ? T_('Yes') : T_('No')); ?></td>
 <td class="cel_loop"><?php echo ($channel->loop ? T_('Yes') : T_('No')); ?></td>-->
 <td class="cel_streamtype"><?php echo $channel->stream_type; ?></td>
diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php
index c8696e79..7d8ce696 100644
--- a/templates/show_playlist_songs.inc.php
+++ b/templates/show_playlist_songs.inc.php
@@ -25,28 +25,29 @@ $web_path = AmpConfig::get('web_path');
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
 <form method="post" id="reorder_playlist_<?php echo $playlist->id; ?>">
     <table id="reorder_playlist_table" class="tabledata" cellpadding="0" cellspacing="0">
-        <tr class="th-top">
-            <th class="cel_play"></th>
-            <th class="cel_song"><?php echo T_('Song Title'); ?></th>
-            <th class="cel_add"></th>
-            <th class="cel_artist"><?php echo T_('Artist'); ?></th>
-            <th class="cel_album"><?php echo T_('Album'); ?></th>
-            <th class="cel_tags"><?php echo T_('Tags'); ?></th>
-            <th class="cel_time"><?php echo T_('Time'); ?></th>
-        <?php if (AmpConfig::get('ratings')) {
-            Rating::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids));
-        ?>
-            <th class="cel_rating"><?php echo T_('Rating'); ?></th>
-        <?php } ?>
-        <?php if (AmpConfig::get('userflags')) {
-            Userflag::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids));
-        ?>
-            <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
-        <?php } ?>
-            <th class="cel_action"><?php echo T_('Action'); ?></th>
-            <th class="cel_drag"></th>
-        </tr>
-
+        <thead>
+            <tr class="th-top">
+                <th class="cel_play"></th>
+                <th class="cel_song"><?php echo T_('Song Title'); ?></th>
+                <th class="cel_add"></th>
+                <th class="cel_artist"><?php echo T_('Artist'); ?></th>
+                <th class="cel_album"><?php echo T_('Album'); ?></th>
+                <th class="cel_tags"><?php echo T_('Tags'); ?></th>
+                <th class="cel_time"><?php echo T_('Time'); ?></th>
+            <?php if (AmpConfig::get('ratings')) {
+                Rating::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids));
+            ?>
+                <th class="cel_rating"><?php echo T_('Rating'); ?></th>
+            <?php } ?>
+            <?php if (AmpConfig::get('userflags')) {
+                Userflag::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids));
+            ?>
+                <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
+            <?php } ?>
+                <th class="cel_action"><?php echo T_('Action'); ?></th>
+                <th class="cel_drag"></th>
+            </tr>
+        </thead>
         <tbody id="sortableplaylist">
             <?php foreach ($object_ids as $object) {
                     $song = new Song($object['object_id']);
@@ -58,24 +59,25 @@ $web_path = AmpConfig::get('web_path');
                     </tr>
             <?php } ?>
         </tbody>
-
-        <tr class="th-bottom">
-            <th class="cel_play"><?php echo T_('Play'); ?></th>
-            <th class="cel_song"><?php echo T_('Song Title'); ?></th>
-            <th class="cel_add"></th>
-            <th class="cel_artist"><?php echo T_('Artist'); ?></th>
-            <th class="cel_album"><?php echo T_('Album'); ?></th>
-            <th class="cel_tags"><?php echo T_('Tags'); ?></th>
-            <th class="cel_time"><?php echo T_('Time'); ?></th>
-        <?php if (AmpConfig::get('ratings')) { ?>
-            <th class="cel_rating"><?php echo T_('Rating'); ?></th>
-        <?php } ?>
-        <?php if (AmpConfig::get('userflags')) { ?>
-            <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
-        <?php } ?>
-            <th class="cel_action"><?php echo T_('Action'); ?></th>
-            <th class="cel_drag"></th>
-        </tr>
+        <tfoot>
+            <tr class="th-bottom">
+                <th class="cel_play"><?php echo T_('Play'); ?></th>
+                <th class="cel_song"><?php echo T_('Song Title'); ?></th>
+                <th class="cel_add"></th>
+                <th class="cel_artist"><?php echo T_('Artist'); ?></th>
+                <th class="cel_album"><?php echo T_('Album'); ?></th>
+                <th class="cel_tags"><?php echo T_('Tags'); ?></th>
+                <th class="cel_time"><?php echo T_('Time'); ?></th>
+            <?php if (AmpConfig::get('ratings')) { ?>
+                <th class="cel_rating"><?php echo T_('Rating'); ?></th>
+            <?php } ?>
+            <?php if (AmpConfig::get('userflags')) { ?>
+                <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
+            <?php } ?>
+                <th class="cel_action"><?php echo T_('Action'); ?></th>
+                <th class="cel_drag"></th>
+            </tr>
+        </tfoot>
     </table>
 </form>
 <?php if ($browse->get_show_header()) require AmpConfig::get('prefix') . '/templates/list_header.inc.php'; ?>
diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php
index 22dec7bd..3e3bd22a 100644
--- a/templates/show_recommended_artists.inc.php
+++ b/templates/show_recommended_artists.inc.php
@@ -24,66 +24,72 @@ $thcount = 8;
 ?>
 <?php UI::show_box_top(T_('Similar Artists'), 'info-box'); ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
-    <tr class="th-top">
-        <th class="cel_play"></th>
-        <th class="cel_artist"><?php echo T_('Artist'); ?></th>
-        <th class="cel_add"></th>
-        <th class="cel_songs"><?php echo T_('Songs');  ?></th>
-        <th class="cel_albums"><?php echo T_('Albums'); ?></th>
-        <th class="cel_time"><?php echo T_('Time'); ?></th>
-        <th class="cel_tags"><?php echo T_('Tags'); ?></th>
-    <?php if (AmpConfig::get('ratings')) { ++$thcount; ?>
-        <th class="cel_rating"><?php echo T_('Rating'); ?></th>
-    <?php } ?>
-    <?php if (AmpConfig::get('userflags')) { ++$thcount; ?>
-        <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
-    <?php } ?>
-        <th class="cel_action"> <?php echo T_('Action'); ?> </th>
-    </tr>
-    <?php
-    // Cache the ratings we are going to use
-    if (AmpConfig::get('ratings')) { Rating::build_cache('artist',$object_ids); }
-    // Cache the userflags we are going to use
-    if (AmpConfig::get('userflags')) { Userflag::build_cache('artist',$object_ids); }
+    <thead>
+        <tr class="th-top">
+            <th class="cel_play"></th>
+            <th class="cel_artist"><?php echo T_('Artist'); ?></th>
+            <th class="cel_add"></th>
+            <th class="cel_songs"><?php echo T_('Songs');  ?></th>
+            <th class="cel_albums"><?php echo T_('Albums'); ?></th>
+            <th class="cel_time"><?php echo T_('Time'); ?></th>
+            <th class="cel_tags"><?php echo T_('Tags'); ?></th>
+        <?php if (AmpConfig::get('ratings')) { ++$thcount; ?>
+            <th class="cel_rating"><?php echo T_('Rating'); ?></th>
+        <?php } ?>
+        <?php if (AmpConfig::get('userflags')) { ++$thcount; ?>
+            <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
+        <?php } ?>
+            <th class="cel_action"> <?php echo T_('Action'); ?> </th>
+        </tr>
+    </thead>
+    <tbody>
+        <?php
+        // Cache the ratings we are going to use
+        if (AmpConfig::get('ratings')) { Rating::build_cache('artist',$object_ids); }
+        // Cache the userflags we are going to use
+        if (AmpConfig::get('userflags')) { Userflag::build_cache('artist',$object_ids); }
 
-    /* Foreach through every artist that has been passed to us */
-    foreach ($object_ids as $artist_id) {
-            $artist = new Artist($artist_id);
-            $artist->format();
-    ?>
-    <tr id="artist_<?php echo $artist->id; ?>" class="<?php echo UI::flip_class(); ?>">
-        <?php require AmpConfig::get('prefix') . '/templates/show_artist_row.inc.php'; ?>
-    </tr>
-    <?php } ?>
-    <?php
-    /* Foreach through every missing artist that has been passed to us */
-    foreach ($missing_objects as $missing) {
-    ?>
-    <tr id="missing_artist_<?php echo $missing['mbid']; ?>" class="<?php echo UI::flip_class(); ?>">
-        <td></td>
-        <td colspan="<?php echo ($thcount - 1); ?>"><a class="missing_album" href="<?php echo AmpConfig::get('web_path'); ?>/artists.php?action=show_missing&mbid=<?php echo $missing['mbid']; ?>" title="<?php echo scrub_out($missing['name']); ?>"><?php echo scrub_out($missing['name']); ?></a></td>
-    </tr>
-    <?php } ?>
-    <?php if ((!$object_ids || !count($object_ids)) && (!$missing_objects || !count($missing_objects))) { ?>
-    <tr class="<?php echo UI::flip_class(); ?>">
-        <td colspan="<?php echo $thcount; ?>"><span class="nodata"><?php echo T_('No similar artist found'); ?></span></td>
-    </tr>
-    <?php } ?>
-    <tr class="th-bottom">
-        <th class="cel_play"></th>
-        <th class="cel_artist"><?php echo T_('Artist'); ?></th>
-        <th class="cel_add"></th>
-        <th class="cel_songs"> <?php echo T_('Songs');  ?> </th>
-        <th class="cel_albums"> <?php echo T_('Albums'); ?> </th>
-        <th class="cel_time"> <?php echo T_('Time'); ?> </th>
-        <th class="cel_tags"><?php echo T_('Tags'); ?></th>
-    <?php if (AmpConfig::get('ratings')) { ?>
-        <th class="cel_rating"><?php echo T_('Rating'); ?></th>
-    <?php } ?>
-    <?php if (AmpConfig::get('userflags')) { ?>
-        <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
-    <?php } ?>
-        <th class="cel_action"> <?php echo T_('Action'); ?> </th>
-    </tr>
+        /* Foreach through every artist that has been passed to us */
+        foreach ($object_ids as $artist_id) {
+                $artist = new Artist($artist_id);
+                $artist->format();
+        ?>
+        <tr id="artist_<?php echo $artist->id; ?>" class="<?php echo UI::flip_class(); ?>">
+            <?php require AmpConfig::get('prefix') . '/templates/show_artist_row.inc.php'; ?>
+        </tr>
+        <?php } ?>
+        <?php
+        /* Foreach through every missing artist that has been passed to us */
+        foreach ($missing_objects as $missing) {
+        ?>
+        <tr id="missing_artist_<?php echo $missing['mbid']; ?>" class="<?php echo UI::flip_class(); ?>">
+            <td></td>
+            <td colspan="<?php echo ($thcount - 1); ?>"><a class="missing_album" href="<?php echo AmpConfig::get('web_path'); ?>/artists.php?action=show_missing&mbid=<?php echo $missing['mbid']; ?>" title="<?php echo scrub_out($missing['name']); ?>"><?php echo scrub_out($missing['name']); ?></a></td>
+        </tr>
+        <?php } ?>
+        <?php if ((!$object_ids || !count($object_ids)) && (!$missing_objects || !count($missing_objects))) { ?>
+        <tr class="<?php echo UI::flip_class(); ?>">
+            <td colspan="<?php echo $thcount; ?>"><span class="nodata"><?php echo T_('No similar artist found'); ?></span></td>
+        </tr>
+        <?php } ?>
+    </tbody>
+    <tfoot>
+        <tr class="th-bottom">
+            <th class="cel_play"></th>
+            <th class="cel_artist"><?php echo T_('Artist'); ?></th>
+            <th class="cel_add"></th>
+            <th class="cel_songs"> <?php echo T_('Songs');  ?> </th>
+            <th class="cel_albums"> <?php echo T_('Albums'); ?> </th>
+            <th class="cel_time"> <?php echo T_('Time'); ?> </th>
+            <th class="cel_tags"><?php echo T_('Tags'); ?></th>
+        <?php if (AmpConfig::get('ratings')) { ?>
+            <th class="cel_rating"><?php echo T_('Rating'); ?></th>
+        <?php } ?>
+        <?php if (AmpConfig::get('userflags')) { ?>
+            <th class="cel_userflag"><?php echo T_('Flag'); ?></th>
+        <?php } ?>
+            <th class="cel_action"> <?php echo T_('Action'); ?> </th>
+        </tr>
+    </tfoot>
 </table>
 <?php UI::show_box_bottom(); ?>
diff --git a/themes/classic/preview.png b/themes/classic/preview.png
new file mode 100644
index 00000000..8ca9a46d
Binary files /dev/null and b/themes/classic/preview.png differ
diff --git a/themes/fresh/preview.png b/themes/fresh/preview.png
new file mode 100644
index 00000000..529c901e
Binary files /dev/null and b/themes/fresh/preview.png differ
diff --git a/themes/greysme/preview.png b/themes/greysme/preview.png
new file mode 100644
index 00000000..567bfeb2
Binary files /dev/null and b/themes/greysme/preview.png differ
diff --git a/themes/penguin/preview.png b/themes/penguin/preview.png
new file mode 100644
index 00000000..e19981a5
Binary files /dev/null and b/themes/penguin/preview.png differ
diff --git a/themes/reborn/preview.png b/themes/reborn/preview.png
new file mode 100644
index 00000000..6d67de24
Binary files /dev/null and b/themes/reborn/preview.png differ