diff --git a/cinera/cinera.c b/cinera/cinera.c
index 8a56577..6926b75 100644
--- a/cinera/cinera.c
+++ b/cinera/cinera.c
@@ -14,7 +14,7 @@ typedef struct
 version CINERA_APP_VERSION = {
     .Major = 0,
     .Minor = 5,
-    .Patch = 6
+    .Patch = 7
 };
 
 #define CINERA_DB_VERSION 1
@@ -1998,14 +1998,14 @@ HMMLToBuffers(buffers *CollationBuffers, char *Filename)
         int UniqueRefs = 0;
 
         CopyStringToBuffer(&CollationBuffers->Menus,
-                "        <div class=\"title %s\">\n"
+                "        <div class=\"cineraMenus %s\">\n"
                 "            <span class=\"episode_name\">", StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project);
         CopyStringToBufferHTMLSafe(&CollationBuffers->Menus, HMML.metadata.title);
         CopyStringToBuffer(&CollationBuffers->Menus, "</span>\n"
                 "            <span id=\"focus-warn\">⚠ Click here to regain focus ⚠</span>\n");
 
         CopyStringToBuffer(&CollationBuffers->Player,
-                "        <div class=\"player_container\">\n"
+                "        <div class=\"cineraPlayerContainer\">\n"
                 "            <div class=\"video_container\" data-videoId=\"%s\"></div>\n"
                 "            <div class=\"markers_container %s\">\n", HMML.metadata.id, StringsDiffer(Config.Theme, "") ? Config.Theme : HMML.metadata.project);
 
@@ -3733,9 +3733,10 @@ IndexToBuffer(buffers *CollationBuffers)
             return RC_ERROR_PROJECT;
         }
 
-        char queryContainer[512];
+        int ThemeStringLength = StringsDiffer(Config.Theme, "") ? (StringLength(Config.Theme) * 2) : (StringLength(Config.ProjectID) * 2);
+        char queryContainer[512 + ThemeStringLength];
         CopyString(queryContainer,
-                "<div class=\"queryContainer %s\">\n"
+                "<div class=\"cineraQueryContainer %s\">\n"
                 "            <label for=\"query\">Query:</label>\n"
                 "            <div class=\"inputContainer\">\n"
                 "                <input type=\"text\" id=\"query\" autofocus=\"\">\n"
@@ -3744,8 +3745,8 @@ IndexToBuffer(buffers *CollationBuffers)
                 "                </div>\n"
                 "            </div>\n"
                 "        </div>\n"
-                "        <div id=\"resultsSummary\">Found: 0 episodes, 0 markers, 0h 0m 0s total.</div>\n"
-                "        <div id=\"results\"></div>\n"
+                "        <div id=\"cineraResultsSummary\">Found: 0 episodes, 0 markers, 0h 0m 0s total.</div>\n"
+                "        <div id=\"cineraResults\"></div>\n"
                 "\n"
                 "        <dl id=\"cineraIndex\" class=\"%s\">\n",
                 StringsDiffer(Config.Theme, "") ? Config.Theme : Config.ProjectID,
diff --git a/cinera/cinera.css b/cinera/cinera.css
index 1c63cb9..d151f59 100644
--- a/cinera/cinera.css
+++ b/cinera/cinera.css
@@ -1,27 +1,27 @@
 /* Index */
 
-.queryContainer {
+.cineraQueryContainer {
     width: 1024px;
     margin: 15px auto;
     display: flex;
     flex-direction: horizontal;
 }
 
-.queryContainer label {
+.cineraQueryContainer label {
     flex-grow: 0;
     flex-shrink: 0;
 }
 
-.queryContainer .inputContainer {
+.cineraQueryContainer .inputContainer {
     flex-grow: 1;
     position: relative;
 }
 
-#query {
+.cineraQueryContainer #query {
     width: 100%;
 }
 
-.spinner {
+.cineraQueryContainer .inputContainer .spinner {
     position: absolute;
     top: 2px;
     right: 5px;
@@ -30,17 +30,17 @@
     display: none;
 }
 
-.spinner.show {
+.cineraQueryContainer .inputContainer .spinner.show {
     display: block;
 }
 
-#results,
+#cineraResults,
 #cineraIndex {
     width: 800px;
     margin: 0 auto;
 }
 
-.dayName {
+#cineraResults .dayContainer .dayName {
     width: 200px;
     display: inline-block;
     vertical-align: top;
@@ -56,14 +56,14 @@
     text-decoration: none;
 }
 
-.markerList {
+#cineraResults .markerList {
     display: inline-block;
     width: 600px;
     box-sizing: border-box;
     vertical-align: top;
 }
 
-.markerList > .marker {
+#cineraResults .markerList > .marker {
     padding: 10px 5px;
     cursor: pointer;
     border-top: 1px solid;
@@ -71,11 +71,11 @@
     text-decoration: none;
 }
 
-.markerList > .marker:first-child {
+#cineraResults .markerList > .marker:first-child {
     border: none;
 }
 
-#resultsSummary {
+#cineraResultsSummary {
     text-align: center;
     margin: 10px 0;
 }
@@ -84,35 +84,35 @@
 
 /* Structure */
 
-.title,
-.title > .menu > .refs .ref,
-.title > .menu > .credits_container .credit {
+.cineraMenus,
+.cineraMenus > .menu > .refs .ref,
+.cineraMenus > .menu > .credits_container .credit {
     border-bottom: 1px solid;
     display: flex;
     text-decoration: none;
 }
 
-.title > *,
-.title > .menu > .refs .ref,
-.title > .menu > .credits_container .credit .person {
+.cineraMenus > *,
+.cineraMenus > .menu > .refs .ref,
+.cineraMenus > .menu > .credits_container .credit .person {
     padding: 10px;
 }
 
-.title .episode_name {
+.cineraMenus .episode_name {
     flex: 1;
 }
 
-.title > #focus-warn {
+.cineraMenus > #focus-warn {
     color: #F00;
     flex: 1;
     margin: auto;
 }
 
-.title > .menu {
+.cineraMenus > .menu {
     position: relative;
 }
 
-.title > .menu .mouse_catcher {
+.cineraMenus > .menu .mouse_catcher {
     position: absolute;
     height: 100%;
     width: 100%;
@@ -120,16 +120,16 @@
     right: 0;
 }
 
-.title > .menu.filter.responsible,
-.title .filter_content.responsible,
-.title .filter_content.responsible .text,
-.title > .menu > .filter_container .filter_mode.responsible {
+.cineraMenus > .menu.filter.responsible,
+.cineraMenus .filter_content.responsible,
+.cineraMenus .filter_content.responsible .text,
+.cineraMenus > .menu > .filter_container .filter_mode.responsible {
     animation-duration: 8s;
     animation-timing-function: ease-out;
     animation-iteration-count: 1;
 }
 
-.help_key {
+.cineraMenus .help .help_container .help_key {
     font-family: Inconsolata;
     font-size: 16px;
     border: 1px solid;
@@ -143,45 +143,45 @@
     margin: 2px;
 }
 
-.help_key.unavailable,
-.help_text.unavailable,
-.help_container h2 .unavailable {
+.cineraMenus .help .help_container .help_key.unavailable,
+.cineraMenus .help .help_container .help_text.unavailable,
+.cineraMenus .help .help_container h2 .unavailable {
     opacity: 0.32;
 }
 
-.key_block {
+.cineraMenus .help .help_container .key_block {
     display: inline-flex;
     align-items: flex-end;
     flex-direction: row;
     margin: 8px;
 }
 
-.help_text {
+.cineraMenus .help .help_container .help_text {
     margin: 0 8px 0 2px;
 }
 
 
-.help_container h1 {
+.cineraMenus .help .help_container h1 {
     display: inline;
     margin-left: 4px;
 }
 
-.help_container h1:after {
+.cineraMenus .help .help_container h1:after {
     content: "\a";
 }
 
 
-.help_container h2 {
+.cineraMenus .help .help_container h2 {
     font-size: 16px;
     margin-bottom: 8px;
 }
 
-.help_paragraph {
+.cineraMenus .help .help_container .help_paragraph {
     display: inline-flex;
     align-items: center;
 }
 
-.title > .help {
+.cineraMenus > .help {
     cursor: default;
     border: 1px solid;
     border-radius: 4px;
@@ -195,12 +195,12 @@
     text-align: center;
 }
 
-.help_grid {
+.cineraMenus .help .help_container .help_grid {
     display: inline-flex;
     flex-direction: column;
 }
 
-.help_container {
+.cineraMenus .help .help_container {
     background-color: black; /* Per project */
     color: #EEE; /* Per project */
     display: none;
@@ -213,13 +213,13 @@
     top: 42px;
 }
 
-.help_container.visible {
+.cineraMenus .help .help_container.visible {
     display: block;
 }
 
-.title > .menu .refs,
-.title > .menu .filter_container,
-.title > .menu .credits_container{
+.cineraMenus > .menu .refs,
+.cineraMenus > .menu .filter_container,
+.cineraMenus > .menu .credits_container{
     border: 1px solid;
     border-top: none;
     display: none;
@@ -232,181 +232,181 @@
     z-index: 1;
 }
 
-.title > .menu .refs,
-.title > .menu .filter_container {
+.cineraMenus > .menu .refs,
+.cineraMenus > .menu .filter_container {
     width: 350px;
 }
 
-.title > .menu .credits_container {
+.cineraMenus > .menu .credits_container {
     min-width: 240px;
 }
 
 /*.title > .menu:hover .refs,*/
-.title > .menu.quotes .refs.visible,
-.title > .menu.references .refs.visible,
+.cineraMenus > .menu.quotes .refs.visible,
+.cineraMenus > .menu.references .refs.visible,
 /*.title > .menu:hover .filter_container,*/
-.title > .menu.filter .filter_container.visible,
-.title > .menu.credits .credits_container.visible {
+.cineraMenus > .menu.filter .filter_container.visible,
+.cineraMenus > .menu.credits .credits_container.visible {
 /*.title > .menu:hover .credits_container {*/
     display: block;
 }
 
-.title > .menu > .refs .ref {
+.cineraMenus > .menu > .refs .ref {
     flex-direction: column;
 }
 
-.title > .menu > .credits_container .credit {
+.cineraMenus > .menu > .credits_container .credit {
     cursor: default;
 }
 
-.title > .menu > .credits_container .credit .person {
+.cineraMenus > .menu > .credits_container .credit .person {
     flex-grow: 1;
     text-decoration: none;
 }
 
-.title > .menu > .credits_container .credit .support {
+.cineraMenus > .menu > .credits_container .credit .support {
     padding: 16px;
 }
 
-.title > .menu > .credits_container .credit .support .support_icon {
+.cineraMenus > .menu > .credits_container .credit .support .support_icon {
     height: 16px;
     width: 16px;
 }
 
-.title > .menu > .refs .ref:last-child,
-.title > .menu > .credits_container .credit:last-child {
+.cineraMenus > .menu > .refs .ref:last-child,
+.cineraMenus > .menu > .credits_container .credit:last-child {
     border: none;
 }
 
-.title > .menu > .refs .ref .timecode,
-.title > .menu > .filter_container .filter_mode {
+.cineraMenus > .menu > .refs .ref .timecode,
+.cineraMenus > .menu > .filter_container .filter_mode {
     font-size: 12px;
 }
 
-.title > .menu > .refs .ref .timecode {
+.cineraMenus > .menu > .refs .ref .timecode {
     cursor: pointer;
     display: inline-block;
     padding: 0;
 }
 
-.title > .menu > .refs .ref .timecode:hover {
+.cineraMenus > .menu > .refs .ref .timecode:hover {
     /* TODO(matt): background-image "play" symbol, right aligned */
 }
 
-.title > .menu > .refs .ref .ref_content,
-.title > .menu > .filter_content {
+.cineraMenus > .menu > .refs .ref .ref_content,
+.cineraMenus > .menu > .filter_content {
     margin-bottom: 8px;
     width: 100%;
 }
 
-.title > .menu > .refs .ref .source,
-.title > .menu > .refs .ref .quote_byline,
-.title > .menu > .filter_container .filter_title,
-.title > .menu > .credits_container .credit .role {
+.cineraMenus > .menu > .refs .ref .source,
+.cineraMenus > .menu > .refs .ref .quote_byline,
+.cineraMenus > .menu > .filter_container .filter_title,
+.cineraMenus > .menu > .credits_container .credit .role {
     font-size: 10px;
 }
 
-.title > .menu > .refs .ref .source,
-.title > .menu > .refs .ref .quote_byline,
-.title > .menu > .credits_container .credit .role {
+.cineraMenus > .menu > .refs .ref .source,
+.cineraMenus > .menu > .refs .ref .quote_byline,
+.cineraMenus > .menu > .credits_container .credit .role {
     line-height: 8px;
 }
 
-.title > .menu > .refs .ref .quote_byline,
-.title > .menu > .refs .ref .ref_indices {
+.cineraMenus > .menu > .refs .ref .quote_byline,
+.cineraMenus > .menu > .refs .ref .ref_indices {
     width: 100%;
 }
 
-.title > .menu > .refs .ref .quote_byline {
+.cineraMenus > .menu > .refs .ref .quote_byline {
     text-align: right;
 }
 
-.title > .menu > .refs .ref .ref_indices {
+.cineraMenus > .menu > .refs .ref .ref_indices {
     text-align: center;
 }
 
-.title > .menu > .refs .ref .ref_indices .timecode:first-child::before {
+.cineraMenus > .menu > .refs .ref .ref_indices .timecode:first-child::before {
     content: "";
 }
 
-.title > .menu > .refs .ref .ref_indices .timecode::before {
+.cineraMenus > .menu > .refs .ref .ref_indices .timecode::before {
     content: "•";
     margin: 0 4px;
 }
 
-.title > .menu > .refs .ref .timecode .ref_index {
+.cineraMenus > .menu > .refs .ref .timecode .ref_index {
     margin-right: 4px;
 }
 
-.title > .menu > .filter_container .filter_mode {
+.cineraMenus > .menu > .filter_container .filter_mode {
     cursor: pointer;
     border-bottom: 1px solid;
     text-align: center;
 }
 
-.title > .menu > .filter_container .filter_mode.exclusive:after {
+.cineraMenus > .menu > .filter_container .filter_mode.exclusive:after {
     content: "exclusive";
 }
 
-.title > .menu > .filter_container .filter_mode.inclusive:after {
+.cineraMenus > .menu > .filter_container .filter_mode.inclusive:after {
     content: "inclusive";
 }
 
-.title > .menu > .filter_container .filter_title {
+.cineraMenus > .menu > .filter_container .filter_title {
     text-align: center;
 }
 
-.title > .menu > .filter_container .filters {
+.cineraMenus > .menu > .filter_container .filters {
     display: flex;
     flex-flow: row nowrap;
 }
 
-.title > .menu > .filter_container .filters > * {
+.cineraMenus > .menu > .filter_container .filters > * {
     width: 50%;
 }
 
-.title > .menu > .filter_container .filter_content {
+.cineraMenus > .menu > .filter_container .filter_content {
     cursor: pointer;
 }
 
-.title > .menu > .filter_container .filter_content .icon {
+.cineraMenus > .menu > .filter_container .filter_content .icon {
     margin: 0 4px;
 }
 
-.title > .menu > .filter_container .filter_content.off .icon {
+.cineraMenus > .menu > .filter_container .filter_content.off .icon {
     background: transparent;
 }
 
-.title > .menu > .filter_container .filter_content.rant .icon {
+.cineraMenus > .menu > .filter_container .filter_content.rant .icon {
     color: #F00;
 }
 
-.title > .menu > .filter_container .filter_media .filter_content.off .icon {
+.cineraMenus > .menu > .filter_container .filter_media .filter_content.off .icon {
     opacity: 0.32;
 }
 
-.title > .menu > .filter_container .filter_content.rant .text,
-.markers_container > .marker.rant .content,
-.markers_container > .marker.off_rant .content {
+.cineraMenus > .menu > .filter_container .filter_content.rant .text,
+.cineraPlayerContainer .markers_container > .marker.rant .content,
+.cineraPlayerContainer .markers_container > .marker.off_rant .content {
     font-variant: small-caps;
 }
 
-.player_container {
+.cineraPlayerContainer {
     display: flex;
     flex-direction: row;
 }
 
-.video_container {
+.cineraPlayerContainer .video_container {
     flex-grow: 1;
     overflow: hidden;
 }
 
-.markers_container {
+.cineraPlayerContainer .markers_container {
     overflow-y: scroll;
     position: relative;
 }
 
-.markers_container > .marker {
+.cineraPlayerContainer .markers_container > .marker {
     border-bottom: 1px solid;
     position: relative;
     cursor: pointer;
@@ -414,13 +414,13 @@
     transition: max-height .32s;
 }
 
-.markers_container > .marker.skip {
+.cineraPlayerContainer .markers_container > .marker.skip {
     max-height: 0;
     transition: max-height .32s;
     overflow: hidden;
 }
 
-.markers_container > .marker .content {
+.cineraPlayerContainer .markers_container > .marker .content {
     box-sizing: border-box;
     display: block;
     font-size: 14px;
@@ -429,31 +429,31 @@
     word-wrap: break-word;
 }
 
-.markers_container > .marker.authored .content .author,
-.markers_container > .marker.off_authored .content .author {
+.cineraPlayerContainer .markers_container > .marker.authored .content .author,
+.cineraPlayerContainer .markers_container > .marker.off_authored .content .author {
     font-style: normal;
     font-variant: normal;
     font-weight: bold;
 }
 
-.title > .menu > .refs .ref .ref_title,
-.title .filter_content.authored .text,
-.markers_container > .marker.authored,
-.markers_container > .marker.off_authored {
+.cineraMenus > .menu > .refs .ref .ref_title,
+.cineraMenus .filter_content.authored .text,
+.cineraPlayerContainer .markers_container > .marker.authored,
+.cineraPlayerContainer .markers_container > .marker.off_authored {
     font-style: oblique;
 }
 
-.markers_container > .marker.off_authored,
-.markers_container > .marker.off_rant {
+.cineraPlayerContainer .markers_container > .marker.off_authored,
+.cineraPlayerContainer .markers_container > .marker.off_rant {
     opacity: 0.5;
 }
 
-.markers_container > .marker .content sup {
+.cineraPlayerContainer .markers_container > .marker .content sup {
     font-style: normal;
     font-variant: normal;
 }
 
-.markers_container > .marker .progress {
+.cineraPlayerContainer .markers_container > .marker .progress {
     position: absolute;
     top: 0;
     left: 0;
@@ -462,7 +462,7 @@
     overflow: hidden;
 }
 
-.markers_container > .marker .timecode {
+.cineraPlayerContainer .markers_container > .marker .timecode {
     font-size: 9px;
     font-style: normal;
     padding-right: 8px;
@@ -470,32 +470,32 @@
     top: -2px;
 }
 
-.markers_container > .marker .content .categories {
+.cineraPlayerContainer .markers_container > .marker .content .categories {
     display: inline-flex;
     margin: 4px;
 }
 
-.title > .menu > .filter_container .filter_content {
+.cineraMenus > .menu > .filter_container .filter_content {
     display: flex;
 }
 
-.title > .menu > .filter_container .filter_content .category,
-.markers_container > .marker .content .categories .category {
+.cineraMenus > .menu > .filter_container .filter_content .category,
+.cineraPlayerContainer .markers_container > .marker .content .categories .category {
     border-radius: 50%;
     height: 5px;
     width: 5px;
 }
 
-.title > .menu > .filter_container .filter_content .category.off,
-.markers_container > .marker .content .categories .category.off {
+.cineraMenus > .menu > .filter_container .filter_content .category.off,
+.cineraPlayerContainer .markers_container > .marker .content .categories .category.off {
     background: transparent;
 }
 
-.markers_container > .marker .content .categories .category {
+.cineraPlayerContainer .markers_container > .marker .content .categories .category {
     margin-left: 2px;
 }
 
-.title > .menu > .filter_container .filter_content .icon {
+.cineraMenus > .menu > .filter_container .filter_content .icon {
     margin-right: 8px;
 }
 
diff --git a/cinera/cinera__hero.css b/cinera/cinera__hero.css
deleted file mode 100644
index 1c42056..0000000
--- a/cinera/cinera__hero.css
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Search */
-
-.dayContainer.hero,
-#cineraIndex.hero dt {
-    background-color: #161616;
-}
-
-.dayContainer:nth-child(2n).hero,
-#cineraIndex.hero dt:nth-child(2n) {
-    background-color: #303030;
-}
-
-.dayContainer.hero > .dayName,
-#cineraIndex.hero dt a {
-    color: #8A877D;
-}
-
-.markerList.hero > .marker
-{
-    border-color: rgba(255, 255, 255, 0.1);
-    color: #ddd;
-}
-
-.markerList.hero > .marker b {
-    color: black;
-    background-color: rgb(255, 155, 0);
-}
-
-.markerList.hero > .marker:hover {
-    background-color: #444;
-}
-
-/* Player */
-
-.title.hero,
-.title.hero .menu .refs,
-.title.hero .menu > .refs .ref,
-.markers_container.hero,
-.markers_container.hero > .marker {
-    background-color: #161616;
-    border-color: #000;
-}
-
-.title.hero,
-.title.hero .menu > .refs .ref,
-.markers_container.hero > .marker > .content {
-    color: #8A877D;
-}
-
-.title.hero .menu {
-    transition: box-shadow 800ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-    box-shadow: inset 0 0 0 #B57714;
-}
-
-.title.hero .menu:hover,
-.title.hero .menu > .refs .ref:hover,
-.markers_container.hero > .marker:hover > .content {
-
-    background-color: #222;
-}
-
-.title.hero .menu.current {
-    box-shadow: inset 0px 0px 30px #B57714;
-}
-
-.title.hero .menu > .refs .ref.current,
-.markers_container.hero > .marker .progress .content {
-    background-color: #8B3D23;
-    color: #000;
-}
-
-.title.hero .menu > .refs .ref .source,
-.title.hero .menu > .refs .ref .quote_byline {
-    color: #6B3E0B;
-}
-
-.title.hero .menu > .refs .ref.current .source,
-.title.hero .menu > .refs .ref.current .quote_byline {
-    color: #111;
-}
-
-.title.hero .menu > .refs .ref.current:hover,
-.markers_container.hero > .marker:hover .faded .content {
-    background-color: rgba(139, 61, 35, 0.7);
-}
-
-.title.hero .menu > .refs .ref .timecode:hover {
-    color: #FFF;
-}
-
-/* Regular */
-.markers_container.hero > .marker.current > .content {
-    color: #B57714;
-}
-
-/* Blackboard */
-.markers_container.hero > .marker.blackboard {
-    background: #000;
-    border-color: #161616;
-}
-
-.markers_container.hero > .marker.blackboard > .content {
-    color: #D7BA82;
-}
-
-.markers_container.hero > .marker:hover.blackboard > .content {
-    background: #111;
-}
-
-/* Run */
-.markers_container.hero > .marker.run > .content,
-.markers_container.hero > .marker.run > .progress .content,
-.markers_container.hero > .marker:hover.run > .faded .content {
-    background: hsla(128, 16%, 64%, .2);
-    background-image: linear-gradient(to right, blue 4%, black 4%, black 96%, red 4%),
-                      linear-gradient(to bottom, blue 4%, black 4%, black 96%, red 4%),
-    /*#236a58*/
-}
-
-.markers_container.hero > .marker.run > .content {
-    color: #D7BA82;
-}
-
-.markers_container.hero > .marker:hover.run > .content {
-    background: #111;
-}
-
-.markers_container.hero > .marker.run > .progress .content {
-    color: #D7BA82;
-}
-
-.markers_container.hero > .marker:hover.run > .faded .content {
-    background: #111;
-}
diff --git a/cinera/cinera__riscy.css b/cinera/cinera__riscy.css
deleted file mode 100644
index 604e4b8..0000000
--- a/cinera/cinera__riscy.css
+++ /dev/null
@@ -1,175 +0,0 @@
-.dayContainer.riscy,
-#cineraIndex.riscy dt,
-
-.title.riscy,
-.title.riscy > .menu .refs,
-.title.riscy > .menu .filter_container,
-.title.riscy > .menu > .refs .ref,
-.title.riscy > .menu > .filter_container .filter_mode,
-.title.riscy > .menu > .credits_container,
-.title.riscy > .menu > .credits_container .credit,
-.markers_container.riscy,
-.markers_container.riscy > .marker {
-    background-color: #EEE;
-}
-
-.dayContainer:nth-child(2n).riscy,
-#cineraIndex.riscy dt:nth-child(2n) {
-    background-color: #FFF;
-}
-
-.markerList.riscy > .marker,
-
-.title.riscy,
-.title.riscy > .menu .refs,
-.title.riscy > .menu .filter_container,
-.title.riscy > .menu > .refs .ref,
-.title.riscy > .menu > .filter_container .filter_mode,
-.title.riscy > .menu > .credits_container,
-.title.riscy > .menu > .credits_container .credit,
-.markers_container.riscy,
-.markers_container.riscy > .marker {
-    border-color: rgba(246, 178, 26, 0.8);
-}
-
-.dayContainer.riscy > .dayName,
-.markerList.riscy > .marker,
-#cineraIndex.riscy dt a,
-
-.title.riscy,
-.title.riscy > .menu > .refs .ref,
-/*.title.riscy > .menu > .refs .ref .timecode:hover:before,*/
-.title.riscy > .menu > .refs .ref .timecode.focused:before,
-.title.riscy > .menu > .credits_container .credit .name,
-.markers_container.riscy > .marker > .content {
-    color: #000;
-}
-
-.title.riscy > .menu {
-    transition: box-shadow 800ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
-    box-shadow: inset 0 0 0 #2A3172;
-}
-
-.title.riscy > .menu.current {
-    box-shadow: inset 0px 0px 30px #2A3172;
-}
-
-/*.title.riscy > .menu > .refs .ref .ref_indices .timecode:hover,*/
-.title.riscy > .menu > .refs .ref .ref_indices .timecode.focused,
-.markers_container.riscy > .marker.current > .content {
-    color: #2A3172;
-}
-
-.title.riscy > .menu > .refs .ref.current .ref_indices .timecode.focused {
-    color: rgb(246, 178, 26);
-}
-
-.markerList.riscy > .marker:hover,
-#cineraIndex.riscy dt:hover,
-
-/*.title.riscy > .menu:hover,*/
-.title.riscy > .menu.visible,
-/*.title.riscy > .menu > .refs .ref:hover,*/
-.title.riscy > .menu > .quotes_container .ref.focused,
-.title.riscy > .menu > .references_container .ref.focused,
-.title.riscy > .menu > .filter_container .filter_mode:hover,
-/*.title.riscy > .menu > .filter_container .filter_content:hover,*/
-.title.riscy > .menu > .filter_container .filter_content.focused,
-/*.title.riscy > .menu > .credits_container .credit *:hover,*/
-.title.riscy > .menu > .credits_container .credit *.focused,
-.markers_container.riscy > .marker:hover > .content {
-    background-color: #FFF8E7;
-}
-
-.title.riscy > .menu > .refs .ref.current .source,
-.title.riscy > .menu > .refs .ref.current .quote_byline,
-.title.riscy > .menu > .refs .ref.current .ref_indices .timecode.focused:before {
-    color: #FFF8E7;
-}
-
-.markerList.riscy > .marker b,
-
-.title.riscy > .menu > .refs .ref.current,
-/*.title.riscy > .menu > .refs .ref.current .timecode:hover:before,*/
-.markers_container.riscy > .marker > .progress .content {
-    background-color: rgb(42, 49, 114);
-    color: #FFF;
-}
-
-/*.title.riscy > .menu > .refs .ref.current:hover,*/
-.markers_container.riscy > .marker:hover > .faded .content {
-    background-color: rgba(42, 49, 114, 0.7);
-}
-
-.title.riscy > .menu > .refs .ref .source,
-.title.riscy > .menu > .refs .ref .quote_byline,
-.title.riscy > .menu > .filter_container .filter_content.off .text,
-.title.riscy > .menu > .credits_container .credit .role {
-    color: #888;
-}
-
-/* Blackboard */
-.title.riscy .filter_content.blackboard,
-.markers_container.riscy .blackboard > .content,
-.markers_container.riscy .off_blackboard > .content,
-.markers_container.riscy > .marker.blackboard > .progress .content,
-.markers_container.riscy > .marker:hover.blackboard > .faded .content {
-    background-size: 12px 12px;
-    background-position: center;
-}
-
-.title.riscy .filter_content.blackboard,
-.markers_container.riscy .blackboard > .content {
-    background-image: linear-gradient(to right , rgba(51, 153, 255, .16) 1px, transparent 1px),
-                      linear-gradient(to bottom, rgba(51, 153, 255, .16) 1px, transparent 1px);
-}
-
-.markers_container.riscy .off_blackboard > .content {
-    background-image: linear-gradient(to right , rgba(51, 153, 255, .08) 1px, transparent 1px),
-                      linear-gradient(to bottom, rgba(51, 153, 255, .08) 1px, transparent 1px);
-}
-
-.markers_container.riscy > .marker.blackboard > .progress .content {
-    background-image: linear-gradient(to right , rgba(255, 255, 255, .16) 1px, transparent 1px),
-                      linear-gradient(to bottom, rgba(255, 255, 255, .16) 1px, transparent 1px);
-}
-
-.markers_container.riscy > .marker:hover.blackboard > .faded .content {
-    background-image: linear-gradient(to right , rgba(0, 0, 0, .16) 1px, transparent 1px),
-                      linear-gradient(to bottom, rgba(0, 0, 0, .16) 1px, transparent 1px);
-}
-
-/* TODO(matt):
- *
- * .markers_container.riscy > marker.run
- */
-
-@keyframes riscy_fade_mode {
-    0% { color: #FFF; }
-    100% { color: #000; }
-}
-
-@keyframes riscy_fade_text {
-    0% { color: #000; }
-    100% { color: #888; }
-}
-
-@keyframes riscy_fade_background {
-    0% { background-color: rgba(246, 178, 26, 0.8);}
-    100% { background-color: #EEE; }
-}
-
-/* TODO(matt): Get this to work! */
-.title.riscy > .menu > .filter_container .filter_mode.responsible {
-    animation-name: riscy_fade_mode;
-}
-
-.title.riscy .filter_content.responsible .text {
-    animation-name: riscy_fade_text;
-}
-
-.title.riscy > .menu.filter.responsible,
-.title.riscy .filter_content.responsible,
-.title.riscy > .menu > .filter_container .filter_mode.responsible {
-    animation-name: riscy_fade_background;
-}
diff --git a/cinera/cinera_player_post.js b/cinera/cinera_player_post.js
index a145e3f..82c2589 100644
--- a/cinera/cinera_player_post.js
+++ b/cinera/cinera_player_post.js
@@ -1,5 +1,5 @@
 var menuState = [];
-var titleBar = document.querySelector(".title");
+var titleBar = document.querySelector(".cineraMenus");
 var quotesMenu = titleBar.querySelector(".quotes_container");
 if(quotesMenu)
 {
@@ -143,7 +143,7 @@ helpButton.addEventListener("click", function(ev) {
 var focusedElement = null;
 var focusedIdentifier = null;
 
-var playerContainer = document.querySelector(".player_container")
+var playerContainer = document.querySelector(".cineraPlayerContainer")
 var player = new Player(playerContainer, onRefChanged);
 window.addEventListener("resize", function() { player.updateSize(); });
 document.addEventListener("keydown", function(ev) {
diff --git a/cinera/cinera_search.js b/cinera/cinera_search.js
index a0b97b1..b5b103c 100644
--- a/cinera/cinera_search.js
+++ b/cinera/cinera_search.js
@@ -12,7 +12,7 @@ var lastQuery = null;
 var resultsToRender = [];
 var resultsIndex = 0;
 var resultsMarkerIndex = 0;
-var resultsContainer = document.getElementById("results");
+var resultsContainer = document.getElementById("cineraResults");
 var rendering = false;
 
 var dayContainerPrototype = document.createElement("DIV");
@@ -118,7 +118,7 @@ function runSearch() {
 
     var totalTime = Math.floor(totalSeconds/60/60) + "h " + Math.floor(totalSeconds/60)%60 + "m " + totalSeconds%60 + "s ";
 
-    document.getElementById("resultsSummary").textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
+    document.getElementById("cineraResultsSummary").textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
 }
 
 function renderMatches(renderStart) {
@@ -133,7 +133,7 @@ function renderMatches(renderStart) {
         dayName.textContent = episode.day + ": " + episode.title;
         resultsContainer.appendChild(dayContainer);
     } else {
-        markerList = document.querySelector("#results > .dayContainer:nth-child(" + (resultsIndex+1) + ") .markerList");
+        markerList = document.querySelector("#cineraResults > .dayContainer:nth-child(" + (resultsIndex+1) + ") .markerList");
     }
 
     do {