--- programs/mythfrontend/videolist.cpp	2015-02-21 12:58:37.948741594 -0500
+++ programs/mythfrontend/videolist.cpp	2015-02-23 20:40:18.366453701 -0500
@@ -955,23 +955,65 @@
     smart_dir_node vdn = video_root->addSubDir(QObject::tr("Movies"));
     meta_dir_node* movie_node = vdn.get();
 
+    smart_dir_node mdn = video_root->addSubDir(QObject::tr("Music Videos"));
+    meta_dir_node* musicvideo_node = mdn.get();
+
+    smart_dir_node hdn = video_root->addSubDir(QObject::tr("Home Videos"));
+    meta_dir_node* homemovie_node = hdn.get();
+
+    smart_dir_node adn = video_root->addSubDir(QObject::tr("Adult"));
+    meta_dir_node* adult_node = adn.get();
+
+    smart_dir_node udn = video_root->addSubDir(QObject::tr("Unknown"));
+    meta_dir_node* unknownvideo_node = udn.get();
+
     for (metadata_view_list::iterator p = mlist.begin(); p != mlist.end(); ++p)
     {
         VideoMetadata *data = *p;
 
-        if (((*p)->GetSeason() > 0) || ((*p)->GetEpisode() > 0))
+        if ((*p)->GetContentType() == kContentTelevision)
         {
             smart_dir_node sdn = television_node->addSubDir((*p)->GetTitle());
             meta_dir_node* title_node = sdn.get();
 
+            if ((*p)->GetSeason() > 0)
+	    {
             smart_dir_node ssdn = title_node->addSubDir(
                 QObject::tr("Season %1").arg((*p)->GetSeason()));
             meta_dir_node* season_node = ssdn.get();
 
             season_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	    }
+
+	    else title_node->addEntry(smart_meta_node(new meta_data_node(data)));
         }
+	else if ((*p)->GetContentType() == kContentMovie)
+	{
+/*	    if ((*p)->GetCollectionref > 0)
+            {
+            smart_dir_node cdn = movie_node->addSubDir(
+	        QObject::tr("Collection %1").arg((*p)->GetCollectionref()));
+	     meta_dir_node* collection_node = cdn.get();
+
+	    collection_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	    }
+
+            else */ movie_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	}
+	else if ((*p)->GetContentType() == kContentMusicVideo)
+	{
+            musicvideo_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	}
+	else if ((*p)->GetContentType() == kContentHomeMovie)
+	{
+            homemovie_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	}
+	else if ((*p)->GetContentType() == kContentAdult)
+	{
+            adult_node->addEntry(smart_meta_node(new meta_data_node(data)));
+	}
         else
-            movie_node->addEntry(smart_meta_node(new meta_data_node(data)));
+            unknownvideo_node->addEntry(smart_meta_node(new meta_data_node(data)));
     }
 }