-$(call declare-playlist, btvs, B/Buffy the Vampire Slayer)
-#$(call declare-playlist, caprica, C/Caprica)
-#$(call declare-playlist, constantine, C/Constantine)
-#$(call declare-playlist, cracker, C/Cracker)
-#$(call declare-playlist, crow-stairway, C/The Crow—Stairway to Heaven)
-#$(call declare-playlist, danger-mouse, D/Danger Mouse)
-#$(call declare-playlist, dark-angel, D/Dark Angel)
-#$(call declare-playlist, the-day-today, D/The Day Today)
-#$(call declare-playlist, dexter, D/Dexter)
+$(call declare-playlist, buffyverse, B/Buffyverse)
+$(call declare-filter, btvs, buffyverse,b, B/Buffy the Vampire Slayer)
+$(call declare-filter, angel, buffyverse,a, A/Angel)
+$(call declare-playlist, caprica, C/Caprica)
+$(call declare-playlist, cracker, C/Cracker)
+$(call declare-playlist, crow-stairway, C/The Crow—Stairway to Heaven)
+$(call declare-playlist, danger-mouse, D/Danger Mouse)
+$(call declare-playlist, dark-angel, D/Dark Angel)
+$(call declare-playlist, the-day-today, D/The Day Today)
+$(call declare-playlist, dexter, D/Dexter)
+$(call declare-playlist, drwho, D/Doctor Who)
+$(call declare-filter, drwho-marco-polo, drwho,marco-polo, D/Doctor Who/S01E04 D. Marco Polo)
+$(call declare-filter, drwho-crusade, drwho,crusade, D/Doctor Who/S02E06 P. The Crusade)
+$(call declare-filter, drwho-myth-makers, drwho,myth-makers, D/Doctor Who/S03E03 U. The Myth Makers)
+$(call declare-filter, drwho-masterplan, drwho,daleks-masterplan, D/Doctor Who/S03E04 V. The Daleks' Master Plan) #'
+$(call declare-filter, drwho-massacre, drwho,massacre, D/Doctor Who/S03E05 W. The Massacre of St Bartholomew's Eve) #'
+$(call declare-filter, drwho-toymaker, drwho,toymaker, D/Doctor Who/S03E07 Y. The Celestial Toymaker)
+$(call declare-filter, drwho-savages, drwho,savages, D/Doctor Who/S03E09 AA. The Savages)
+$(call declare-filter, drwho-smugglers, drwho,smugglers, D/Doctor Who/S04E01 CC. The Smugglers)
+$(call declare-filter, drwho-highlanders, drwho,highlanders, D/Doctor Who/S04E04 FF. The Highlanders)
+$(call declare-filter, drwho-snowmen, drwho,snowmen, D/Doctor Who/S05E02 NN. The Abominable Snowmen)
+$(call declare-filter, drwho-wheel, drwho,wheel, D/Doctor Who/S05E07 SS. The Wheel in Space)
+$(call declare-filter, drwho-invasion, drwho,invasion, D/Doctor Who/S06E03 VV. The Invasion)
+$(call declare-filter, drwho-pirates, drwho,pirates, D/Doctor Who/S06E06 YY. The Space Pirates)
+$(call declare-filter, drwho-war-games, drwho,war-games, D/Doctor Who/S06E07 ZZ. The War Games)
+$(call declare-filter, drwho-silurians, drwho,silurians, D/Doctor Who/S07E02 BBB. Doctor Who and the Silurians)