diff --git a/allianceauth/custom_css/admin.py b/allianceauth/custom_css/admin.py
index 0b5f79ec..debc4f16 100644
--- a/allianceauth/custom_css/admin.py
+++ b/allianceauth/custom_css/admin.py
@@ -20,3 +20,6 @@ class CustomCSSAdmin(SingletonModelAdmin):
     """
 
     form = CustomCSSAdminForm
+
+    # Leave this here for when we decide to add syntax highlighting to the CSS editor
+    # change_form_template = 'custom_css/admin/change_form.html'
diff --git a/allianceauth/custom_css/forms.py b/allianceauth/custom_css/forms.py
index f9a1f205..6823b204 100644
--- a/allianceauth/custom_css/forms.py
+++ b/allianceauth/custom_css/forms.py
@@ -18,4 +18,12 @@ class CustomCSSAdminForm(forms.ModelForm):
     class Meta:
         model = CustomCSS
         fields = ("css",)
-        widgets = {"css": CssEditorWidget(attrs={"style": "width: 90%; height: 100%;"})}
+        widgets = {
+            "css": CssEditorWidget(
+                attrs={
+                    "style": "width: 90%; height: 100%;",
+                    "data-editor": "code-highlight",
+                    "data-language": "css",
+                }
+            )
+        }
diff --git a/allianceauth/custom_css/templates/custom_css/admin/change_form.html b/allianceauth/custom_css/templates/custom_css/admin/change_form.html
new file mode 100644
index 00000000..d8c921f2
--- /dev/null
+++ b/allianceauth/custom_css/templates/custom_css/admin/change_form.html
@@ -0,0 +1,48 @@
+{% extends "admin/change_form.html" %}
+
+{% block field_sets %}
+    {% for fieldset in adminform %}
+        <fieldset class="module aligned {{ fieldset.classes }}">
+            {% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
+
+            {% if fieldset.description %}
+                <div class="description">{{ fieldset.description|safe }}</div>
+            {% endif %}
+
+            {% for line in fieldset %}
+                <div class="form-row{% if line.fields|length == 1 and line.errors %} errors{% endif %}{% if not line.has_visible_field %} hidden{% endif %}{% for field in line %}{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% endfor %}">
+                    {% if line.fields|length == 1 %}{{ line.errors }}{% else %}<div class="flex-container form-multiline">{% endif %}
+
+                    {% for field in line %}
+                        <div>
+                            {% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
+
+                            <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
+                                {% if field.is_checkbox %}
+                                    {{ field.field }}{{ field.label_tag }}
+                                {% else %}
+                                    {{ field.label_tag }}
+                                    {% if field.is_readonly %}
+                                        <div class="readonly">{{ field.contents }}</div>
+                                    {% else %}
+                                        {{ field.field }}
+                                    {% endif %}
+                                {% endif %}
+                            </div>
+
+                            {% if field.field.help_text %}
+                                <div class="help"{% if field.field.id_for_label %} id="{{ field.field.id_for_label }}_helptext"{% endif %}>
+                                    <div>{{ field.field.help_text|safe }}</div>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endfor %}
+
+                    {% if not line.fields|length == 1 %}</div>{% endif %}
+                </div>
+            {% endfor %}
+        </fieldset>
+    {% endfor %}
+{% endblock %}
+
+{% block after_field_sets %}{% endblock %}