diff --git a/src/syntax/katehighlight.cpp b/src/syntax/katehighlight.cpp
--- a/src/syntax/katehighlight.cpp
+++ b/src/syntax/katehighlight.cpp
@@ -506,16 +506,16 @@
 }
 
 QVector<KTextEditor::Attribute::Ptr> KateHighlighting::attributesForDefinition()
-{
-     /**
+{    
+    /**
      * create list of all known things
      */
     QVector<KTextEditor::Attribute::Ptr> array;
     for (const auto &format : m_formats) {
         /**
-         * FIXME: atm we just set some theme here for later color generation
+         * atm we just set the current chosen theme here for later color generation
          */
-        setTheme(KateHlManager::self()->repository().defaultTheme(KSyntaxHighlighting::Repository::LightTheme));
+        setTheme(KateHlManager::self()->repository().theme(KateRendererConfig::global()->schema()));
 
         /**
          * create a KTextEditor attribute matching the given format