diff --git a/.editorconfig b/.editorconfig
index b80fdccd2..83a30861f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,7 +11,7 @@ indent_style = tab
 
 # Autogenerated files with tabs below this line.
 
-[kitty/{unicode-data.c,emoji.h,wcwidth-std.h}]
+[kitty/char-props-data.h]
 indent_style = tab
 
 [kittens/unicode_input/names.h]
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2653aba57..392c606f4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -1,49 +1,49 @@
 name: "Code scanning - action"
 
 on:
-  push:
-    branches: [master, ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 22 * * 5'
+    push:
+        branches: [master, ]
+    pull_request:
+        # The branches below must be a subset of the branches above
+        branches: [master]
+    schedule:
+        - cron: '0 22 * * 5'
 
 permissions:
-  contents: read # to fetch code (actions/checkout)
+    contents: read # to fetch code (actions/checkout)
 
 jobs:
-  CodeQL-Build:
+    CodeQL-Build:
 
-    permissions:
-      contents: read # to fetch code (actions/checkout)
-      security-events: write # to upload SARIF results (github/codeql-action/analyze)
+        permissions:
+            contents: read # to fetch code (actions/checkout)
+            security-events: write # to upload SARIF results (github/codeql-action/analyze)
 
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
 
-    steps:
+        steps:
 
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+        - name: Checkout repository
+          uses: actions/checkout@v3
+          with:
+              # We must fetch at least the immediate parents so that if this is
+              # a pull request then we can checkout the head.
+              fetch-depth: 2
 
-    - name: Install Go
-      uses: actions/setup-go@v3
-      with:
-        go-version-file: go.mod
+        - name: Install Go
+          uses: actions/setup-go@v3
+          with:
+              go-version-file: go.mod
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: python, c
-        setup-python-dependencies: false
+        # Initializes the CodeQL tools for scanning.
+        - name: Initialize CodeQL
+          uses: github/codeql-action/init@v3
+          with:
+              languages: python, c
+              setup-python-dependencies: false
 
-    - name: Build kitty
-      run: python3 .github/workflows/ci.py build
+        - name: Build kitty
+          run: python3 .github/workflows/ci.py build
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+        - name: Perform CodeQL Analysis
+          uses: github/codeql-action/analyze@v3