diff --git a/texmf/tex/latex/mycustomstyles/auto/komageneral.el b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
index b194c7df..9947422a 100644
--- a/texmf/tex/latex/mycustomstyles/auto/komageneral.el
+++ b/texmf/tex/latex/mycustomstyles/auto/komageneral.el
@@ -1,50 +1,45 @@
+;; -*- lexical-binding: t; -*-
+
 (TeX-add-style-hook
  "komageneral"
  (lambda ()
    (setq TeX-command-extra-options
          "-shell-escape")
-   (TeX-add-to-alist 'LaTeX-provided-class-options
-                     '(("scrartcl" "a4paper" "10pt" "captions=tableheading" "twoside=false")))
    (TeX-add-to-alist 'LaTeX-provided-package-options
-                     '(("microtype" "expansion" "protrusion=true") ("ulem" "normalem") ("adjustbox" "Export")))
-   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "path")
+                     '(("fontspec" "") ("geometry" "") ("scrlayer-scrpage" "") ("enumitem" "") ("caption" "") ("microtype" "expansion" "protrusion=true") ("polyglossia" "") ("biblatex" "") ("float" "") ("xcolor" "") ("listings" "") ("booktabs" "") ("grffile" "") ("unicode-math" "") ("adjustbox" "Export") ("etoolbox" "")))
+   (add-to-list 'LaTeX-verbatim-environments-local "lstlisting")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "href")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperimage")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperbaseurl")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "nolinkurl")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "lstinline")
    (add-to-list 'LaTeX-verbatim-macros-with-braces-local "url")
+   (add-to-list 'LaTeX-verbatim-macros-with-braces-local "path")
+   (add-to-list 'LaTeX-verbatim-macros-with-delims-local "lstinline")
    (add-to-list 'LaTeX-verbatim-macros-with-delims-local "path")
-   (add-to-list 'LaTeX-verbatim-macros-with-delims-local "url")
    (TeX-run-style-hooks
-    "latex2e"
     "fontspec"
     "geometry"
     "scrlayer-scrpage"
-    "titlesec"
     "enumitem"
     "caption"
-    "fancyhdr"
     "microtype"
+    "polyglossia"
     "biblatex"
     "float"
     "xcolor"
     "listings"
-    "longtable"
-    "wrapfig"
-    "rotating"
-    "ulem"
-    "amsmath"
-    "amssymb"
-    "capt-of"
-    "hyperref"
     "booktabs"
-    "polyglossia"
     "grffile"
     "unicode-math"
     "adjustbox"
-    "graphicx"
-    "scrartcl"
-    "scrartcl10"
     "etoolbox")
    (TeX-add-symbols
     '("TitlePage" 3)
     '("code" 1)
-    '("important" 1)))
+    '("important" 1))
+   (LaTeX-add-polyglossia-langs
+    '("english" "defaultlanguage" "")
+    '("german" "otherlanguages" "")))
  :latex)
 
diff --git a/texmf/tex/latex/mycustomstyles/komageneral.sty b/texmf/tex/latex/mycustomstyles/komageneral.sty
index ef6f1f8e..b5be85dc 100644
--- a/texmf/tex/latex/mycustomstyles/komageneral.sty
+++ b/texmf/tex/latex/mycustomstyles/komageneral.sty
@@ -12,19 +12,19 @@
 \usepackage{float}
 \usepackage{xcolor}
 \usepackage{listings}
-\usepackage{longtable}
-\usepackage{wrapfig}
-\usepackage{rotating}
-\usepackage[normalem]{ulem}
-\usepackage{amsmath}
-\usepackage{amssymb}
-\usepackage{capt-of}
-\usepackage{hyperref}
 \usepackage{booktabs}
 \usepackage{grffile}
 \usepackage{unicode-math}
 \usepackage[Export]{adjustbox}
-\usepackage{graphicx}
+% \usepackage{longtable}
+% \usepackage{wrapfig}
+% \usepackage{rotating}
+% \usepackage[normalem]{ulem}
+% \usepackage{amsmath}
+% \usepackage{amssymb}
+% \usepackage{capt-of}
+% \usepackage{hyperref}
+% \usepackage{graphicx}
 
 \setdefaultlanguage{english}
 \setotherlanguages{german}