diff --git a/DIFFUSERS.md b/DIFFUSERS.md
index 96d36d180..d5a99b5db 100644
--- a/DIFFUSERS.md
+++ b/DIFFUSERS.md
@@ -61,6 +61,7 @@ whats implemented so far?
 - sdxl model  
 - no idea if sd21 works out-of-the-box
 - hires fix?
+- vae support
 
 ## Limitations
 
@@ -75,6 +76,7 @@ will need to handle in the code before we get out of alpha
   > sd_model.first_stage_model?.encoder?
 - dynamic-thresholding
   > AttributeError: 'DiffusionSampler' object has no attribute 'model_wrap_cfg'
+- no per-step callback  
 
 ## Performance
 
diff --git a/installer.py b/installer.py
index 220d20e93..0ebcc0680 100644
--- a/installer.py
+++ b/installer.py
@@ -402,6 +402,8 @@ def install_packages():
     # install(openclip_package, 'open-clip-torch')
     clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git")
     install(clip_package, 'clip')
+    invisiblewatermark_package = os.environ.get('INVISIBLEWATERMARK_PACKAGE', "git+https://github.com/patrickvonplaten/invisible-watermark.git@remove_onnxruntime_depedency")
+    install(invisiblewatermark_package, 'invisible-watermark')
     install('onnxruntime==1.15.1', 'onnxruntime', ignore=True)
     if args.profile:
         print_profile(pr, 'Packages')
diff --git a/javascript/black-orange.css b/javascript/black-orange.css
index 6f07773f7..22c0e57c6 100644
--- a/javascript/black-orange.css
+++ b/javascript/black-orange.css
@@ -14,30 +14,24 @@ input[type=range]::-moz-range-thumb { box-shadow: 2px 2px 3px #111111; border: 0
 ::-webkit-scrollbar-thumb { background-color: var(--highlight-color); border-radius: 2px; border-width: 0; box-shadow: 2px 2px 3px #111111; }
 div.form { border-width: 0; box-shadow: none; background: transparent; overflow: visible; gap: 0.5em; margin-bottom: 6px; }
 
-/* main gradio components by selector */
-div.gradio-container.dark > div.w-full.flex.flex-col.min-h-screen > div { background-color: black; }
-
 /* gradio shadowroot */
 .gradio-container { font-family: var(--font); --left-column: 490px; --highlight-color: #CE6400; --inactive-color: #4E1400; }
 
+
 /* gradio style classes */
+fieldset .gr-block.gr-box, label.block span { padding: 0; margin-top: -4px; }
 .border-2 { border-width: 0; }
 .border-b-2 { border-bottom-width: 2px; border-color: var(--highlight-color) !important; padding-bottom: 2px; margin-bottom: 8px; }
-.dark .bg-white { color: lightyellow; border-radius: 0; background-color: var(--inactive-color); }
-.dark .bg-gray-200, .dark .\!bg-gray-200 { background-color: transparent; }
-.dark .dark\:bg-gray-900 { background-color: black; }
-.dark .gr-box { border-radius: 0 !important; background-color: #111111 !important; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin: 12px 0px 12px 0px }
-.dark .gr-button { border-radius: 0; font-weight: normal; box-shadow: 2px 2px 3px #111111; font-size: 0.8rem; min-width: 32px; min-height: 32px; padding: 3px; margin: 3px; }
-.dark .gr-check-radio { background-color: var(--inactive-color); border-width: 0; border-radius: 2px; box-shadow: 2px 2px 3px #111111; }
-.dark .gr-check-radio:checked { background-color: var(--highlight-color); }
-.dark .gr-compact { border-radius: 0; background-color: black; }
-.dark .gr-form { border-radius: 0; border-width: 0; }
-.dark .gr-input { background-color: #333333 !important; padding: 4px; margin: 4px; }
-.dark .gr-input-label { color: lightyellow; border-width: 0; background: transparent; padding: 2px !important; }
-.dark .gr-panel { border-radius: 0; background-color: black; }
-.dark { background-color: black; }
-.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span { padding: 0; margin-top: -4px; }
-.dark fieldset span.text-gray-500, .dark .gr-block.gr-box span.text-gray-500, .dark label.block span { border-radius: 0;}
+.bg-white { color: lightyellow; background-color: var(--inactive-color); }
+.gr-box { border-radius: 0 !important; background-color: #111111 !important; box-shadow: 2px 2px 3px #111111; border-width: 0; padding: 4px; margin: 12px 0px 12px 0px }
+.gr-button { font-weight: normal; box-shadow: 2px 2px 3px #111111; font-size: 0.8rem; min-width: 32px; min-height: 32px; padding: 3px; margin: 3px; }
+.gr-check-radio { background-color: var(--inactive-color); border-width: 0; border-radius: 2px; box-shadow: 2px 2px 3px #111111; }
+.gr-check-radio:checked { background-color: var(--highlight-color); }
+.gr-compact { background-color: black; }
+.gr-form { border-width: 0; }
+.gr-input { background-color: #333333 !important; padding: 4px; margin: 4px; }
+.gr-input-label { color: lightyellow; border-width: 0; background: transparent; padding: 2px !important; }
+.gr-panel { background-color: black; }
 .eta-bar { display: none !important }
 svg.feather.feather-image, .feather .feather-image { display: none }
 .gap-2 { padding-top: 8px; }
@@ -48,10 +42,8 @@ svg.feather.feather-image, .feather .feather-image { display: none }
 .p-2 { padding: 0; }
 .px-4 { padding-lefT: 1rem; padding-right: 1rem; }
 .py-6 { padding-bottom: 0; }
-.rounded-lg { border-radius: 0; }
 .tabs { background-color: black; }
-.gradio-button.tool { border-radius: 0; }
-.block.token-counter span { background-color: #222 !important; box-shadow: 2px 2px 2px #111; border: none !important; border-radius: 0; font-size: 0.8rem; }
+.block.token-counter span { background-color: #222 !important; box-shadow: 2px 2px 2px #111; border: none !important; font-size: 0.8rem; }
 .tab-nav { zoom: 120%; margin-bottom: 10px; border-bottom: 2px solid #CE6400 !important; padding-bottom: 2px; }
 .label-wrap { margin: 16px 0px 8px 0px; }
 .gradio-slider input[type="number"] { width: 4.5em; font-size: 0.8rem; }
@@ -68,7 +60,7 @@ svg.feather.feather-image, .feather .feather-image { display: none }
 .image-buttons { gap: 10px !important}
 
 /* gradio elements overrides */
-#div.gradio-container.dark { overflow-x: hidden; }
+#div.gradio-container { overflow-x: hidden; }
 #img2img_label_copy_to_img2img { font-weight: normal; }
 #txt2img_prompt, #txt2img_neg_prompt, #img2img_prompt, #img2img_neg_prompt { background-color: black; box-shadow: 4px 4px 4px 0px #333333  !important; }
 #txt2img_prompt > label > textarea, #txt2img_neg_prompt > label > textarea, #img2img_prompt > label > textarea, #img2img_neg_prompt > label > textarea { font-size: 1.2rem; }
@@ -104,7 +96,7 @@ svg.feather.feather-image, .feather .feather-image { display: none }
 #steps-animation, #controlnet { border-width: 0; }
 
 /* based on gradio built-in dark theme */
-.dark {
+:root, .light, .dark {
   --body-background-fill: black;
   --body-text-color: var(--neutral-100);
   --color-accent-soft: var(--neutral-700);
@@ -282,7 +274,7 @@ svg.feather.feather-image, .feather .feather-image { display: none }
   --section-header-text-weight: 400;
   --checkbox-border-radius: var(--radius-sm);
   --checkbox-label-gap: 2px;
-  --checkbox-label-padding: var(--spacing-md) calc(2 * var(--spacing-md));
+  --checkbox-label-padding: var(--spacing-md);
   --checkbox-label-shadow: var(--shadow-drop);
   --checkbox-label-text-size: var(--text-md);
   --checkbox-label-text-weight: 400;
diff --git a/javascript/style.css b/javascript/style.css
index b71b2ec8d..1a09def29 100644
--- a/javascript/style.css
+++ b/javascript/style.css
@@ -28,7 +28,7 @@ div.gradio-html.min{ min-height: 0; }
 footer { display: none; }
 
 /* general styled components */
-.gradio-button.tool{ max-width: 2.3em;  min-width: 2.3em !important; height: 2.3em; align-self: end; line-height: 1em; border-radius: 0.5em; }
+.gradio-button.tool{ max-width: 2.3em;  min-width: 2.3em !important; height: 2.3em; align-self: end; line-height: 1em }
 .gradio-button.secondary-down{ background: var(--button-secondary-background-fill); color: var(--button-secondary-text-color); }
 .gradio-button.secondary-down, .gradio-button.secondary-down:hover{ box-shadow: 1px 1px 1px rgba(0,0,0,0.25) inset, 0px 0px 3px rgba(0,0,0,0.15) inset; }
 .gradio-button.secondary-down:hover{ background: var(--button-secondary-background-fill-hover); color: var(--button-secondary-text-color-hover); }
@@ -69,7 +69,6 @@ button.custom-button{
     background: var(--input-background-fill) !important;
     box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075);
     border: 2px solid rgba(192,192,192,0.4) !important;
-    border-radius: 0.4em;
 }
 
 .block.token-counter.error span{
@@ -316,7 +315,6 @@ div#extras_scale_to_tab div.form{
     position: relative;
     height: 20px;
     background: #b4c0cc;
-    border-radius: 3px !important;
     margin-bottom: -3px;
 }
 
@@ -333,7 +331,6 @@ div#extras_scale_to_tab div.form{
     line-height: 20px;
     padding: 0 8px 0 0;
     text-align: right;
-    border-radius: 3px;
     overflow: visible;
     white-space: nowrap;
     padding: 0 0.5em;
@@ -464,14 +461,12 @@ table.settings-value-table td{
   font-weight: bold;
   font-size: 20px;
   transition: 0.6s ease;
-  border-radius: 0 3px 3px 0;
   user-select: none;
   -webkit-user-select: none;
 }
 
 .modalNext {
   right: 0;
-  border-radius: 3px 0 0 3px;
 }
 
 .modalPrev:hover, .modalNext:hover {
@@ -497,7 +492,6 @@ table.settings-value-table td{
     display:block;
     padding:0px 0;
     border:2px solid #a55000;
-    border-radius:8px;
     box-shadow:1px 1px 2px #CE6400;
     width: 200px;
 }
diff --git a/modules/ui.py b/modules/ui.py
index 32c94c98c..60ccc6cd1 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1188,12 +1188,7 @@ def html_body():
     body = ''
     inline = ''
     if opts.theme_style != 'Auto':
-        if opts.gradio_theme == 'black-orange':
-            modules.shared.log.info('Theme does not support custom mode')
-        else:
-            inline += f"set_theme('{opts.theme_style.lower()}');"
-    if opts.gradio_theme == 'black-orange':
-        inline += "set_theme('dark');"
+        inline += f"set_theme('{opts.theme_style.lower()}');"
     body += f'<script type="text/javascript">{inline}</script>\n'
     return body