diff --git a/static/css/oml.css b/static/css/oml.css
index 946e463..375341b 100644
--- a/static/css/oml.css
+++ b/static/css/oml.css
@@ -39,3 +39,13 @@
 .OxAnnotationFolder div.OxInput {
     background-image: none;
 }
+
+.OxThemeOxlight .OxAnnotationFolder {
+    background-color: rgb(240, 240, 240);
+}
+.OxThemeOxmedium .OxAnnotationFolder {
+    background-color: rgb(144, 144, 144);
+}
+.OxThemeOxdark .OxAnnotationFolder {
+    background-color: rgb(16, 16, 16);
+}
diff --git a/static/js/fullscreenButton.js b/static/js/fullscreenButton.js
index 5ab741e..f8b49d0 100644
--- a/static/js/fullscreenButton.js
+++ b/static/js/fullscreenButton.js
@@ -16,7 +16,7 @@ oml.ui.fullscreenButton = function() {
         })
         .bindEvent({
             click: function() {
-                Ox.Fullscreen.enter(oml.$ui.viewer.find('iframe')[0]);
+                Ox.Fullscreen.enter(oml.$ui.viewer[0]);
             },
             oml_itemview: function() {
                 that.updateElement();
@@ -31,4 +31,4 @@ oml.ui.fullscreenButton = function() {
 
     return that.updateElement();
 
-};
\ No newline at end of file
+};
diff --git a/static/js/mainMenu.js b/static/js/mainMenu.js
index 039595a..f9e9388 100644
--- a/static/js/mainMenu.js
+++ b/static/js/mainMenu.js
@@ -566,7 +566,7 @@ oml.ui.mainMenu = function() {
                         ? 'openPreview' : 'closePreview'
                     ]();
                 } else if (id == 'fullscreen') {
-                    Ox.Fullscreen.enter(oml.$ui.viewer.find('iframe')[0]);
+                    Ox.Fullscreen.enter(oml.$ui.viewer[0]);
                 } else if (id == 'debugmode') {
                     if (oml.localStorage('enableDebugMode')) {
                         oml.localStorage['delete']('enableDebugMode');