diff --git a/src/ui/css/diff2html.css b/src/ui/css/diff2html.css
index 8d68682..e387989 100644
--- a/src/ui/css/diff2html.css
+++ b/src/ui/css/diff2html.css
@@ -113,8 +113,6 @@
   overflow-x: scroll;
   overflow-y: hidden;
   width: 50%;
-  margin-right: -4px;
-  margin-bottom: -8px;
 }
 
 .d2h-code-line {
diff --git a/src/ui/js/diff2html-ui-base.ts b/src/ui/js/diff2html-ui-base.ts
index 9a84326..e4f9ad5 100644
--- a/src/ui/js/diff2html-ui-base.ts
+++ b/src/ui/js/diff2html-ui-base.ts
@@ -146,6 +146,10 @@ export class Diff2HtmlUI {
 
       const language = file.getAttribute('data-lang');
 
+      if (!(this.config.highlightLanguages instanceof Map)) {
+        this.config.highlightLanguages = new Map(Object.entries(this.config.highlightLanguages));
+      }
+
       const hljsLanguage =
         language && this.config.highlightLanguages.has(language)
           ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion