diff --git a/skintone/emoji.py b/skintone/emoji.py
index 2f7b2d3a4..9b084810a 100644
--- a/skintone/emoji.py
+++ b/skintone/emoji.py
@@ -108,11 +108,8 @@ class Emoji:
         # The file extension (.svg)
         fileextension = self.fextension
         base_seq = basename.split('_')
-        base_seq.insert(2, extension)
-        # Add FE0F?
-        if self.end:
-            base_seq.append('fe0f')
-        basename = '_'.join(base_seq)
+        base_seq.append(extension)
+        basename = ' '.join(base_seq)
         # Stitch it together and return the whole file path
         return os.path.join(directory, basename) + fileextension
         
diff --git a/skintone/generate_skincolor_de.py b/skintone/generate_skincolor_de.py
deleted file mode 100644
index b2bc61582..000000000
--- a/skintone/generate_skincolor_de.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import os
-import sys
-import argparse
-from modifier import *
-from emoji import *
-
-
-def main():
-    """
-    Die main-Funktion, welche die Skin-Modifier verarbeitet
-    :return: Nix
-    """
-    # Alle Kommandozeilenargumente hinzufügen
-    parser = argparse.ArgumentParser()
-    group = parser.add_mutually_exclusive_group(required = True)
-    group.add_argument('--input_file', '-i', help='Input file', metavar='ifile')
-    group.add_argument('--input_dir', '-d', help='Input directory', metavar='idir', default = '.')
-    parser.add_argument('--mod_dir', '-m', help='Modifier directory', metavar='mdir', default = './skins')
-    parser.add_argument('--base_name', '-b', help='Name of the base skin color', metavar='bname', default='base')
-    parser.add_argument('--add_end', '-e', help='Do you want to add an fe0f ZWJ-sequence?', default='n', choices=['y','n','auto'], required=False)
-    # Zu dict verarbeiten
-    args = vars(parser.parse_args())
-    end = False if args['add_end'].lower() == 'n' else (True if args['add_end'].lower() == 'y' else None)
-    # Skin-Modifier erstellen
-    modifiers = generate_modifiers(args['mod_dir'])
-    # Wurde ein Verzeichnis gewählt?
-    if args['input_dir']:
-        multi_process(args['input_dir'], modifiers, args['base_name'], end)
-    else:
-        # Erstelle ein Emoji-Objekt
-        emoji = Emoji(modifiers, args['input_file'], args['base_name'], end)
-        # Und wende die Modifier an
-        emoji.batch_modify()
-
-
-def generate_modifiers(path: str) -> dict:
-    """
-    Holt alle Skin-Modifier aus dem Ordner
-    :param path: Der Ordner mit den JSON-Dateien
-    :return: Ein dict mit name: Modifier
-    """
-    modifiers = {}
-    for file in os.listdir(path):
-        # Ist es überhaupt eine JSON-Datei?
-        if os.path.splitext(file)[-1].lower() == '.json':
-            # Erstelle aus der JSON-Datei und füge es ein
-            modifier = Modifier.generate_from_json(os.path.join(path, file))
-            modifiers.update({modifier.name: modifier})
-    return modifiers
-
-
-def multi_process(directory: str, modifiers: dict, base: str, end: bool = False):
-    """
-    Verarbeitet ein ganzes Verzeichnis mit Emojis
-    :param directory: Der Ordner
-    :param modifiers: Die Skin-Modifier
-    :param base: Der Name des Basis-Typen
-    :param end: Ob noch eine fe0f-Sequenz angefügt werden soll.
-    :return: Nix
-    """
-    files = os.listdir(directory)
-    for file in files:
-        # Nur SVG wird derzeit unterstützt
-        if os.path.splitext(file)[-1].lower() in {'.svg'}:
-            # Erstelle ein Emoji-Objekt
-            emoji = Emoji(modifiers, os.path.join(directory, file), base, end)
-            # Und wende die Modifier an
-            emoji.batch_modify()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/skintone/mixed_skintones/dark.json b/skintone/mixed_skintones/dark.json
index 94f2ce5bd..f71909d17 100644
--- a/skintone/mixed_skintones/dark.json
+++ b/skintone/mixed_skintones/dark.json
@@ -1,6 +1,6 @@
 {
   "name": "dark",
-  "extension": "1f3ff",
+  "extension": "dark skin tone",
   "colors":
   {
     "skin": "#70534a",
diff --git a/skintone/mixed_skintones/light.json b/skintone/mixed_skintones/light.json
index 18ae0dfa0..42369014d 100644
--- a/skintone/mixed_skintones/light.json
+++ b/skintone/mixed_skintones/light.json
@@ -1,6 +1,6 @@
 {
   "name": "light",
-  "extension": "1f3fb",
+  "extension": "light skin tone",
   "colors":
   {
     "skin": "#fadcbc",
diff --git a/skintone/mixed_skintones/medium.json b/skintone/mixed_skintones/medium.json
index ebc3d72f5..603126488 100644
--- a/skintone/mixed_skintones/medium.json
+++ b/skintone/mixed_skintones/medium.json
@@ -1,6 +1,6 @@
 {
   "name": "medium",
-  "extension": "1f3fd",
+  "extension": "medium skin tone",
   "colors":
   {
     "skin": "#bf8f68",
diff --git a/skintone/mixed_skintones/medium_dark.json b/skintone/mixed_skintones/medium_dark.json
index da5e38e76..24c99e0fb 100644
--- a/skintone/mixed_skintones/medium_dark.json
+++ b/skintone/mixed_skintones/medium_dark.json
@@ -1,6 +1,6 @@
 {
   "name": "medium_dark",
-  "extension": "1f3fe",
+  "extension": "medium-dark skin tone",
   "colors":
   {
     "skin": "#9b643c",
diff --git a/skintone/mixed_skintones/medium_light.json b/skintone/mixed_skintones/medium_light.json
index 110e0991c..34e4f8953 100644
--- a/skintone/mixed_skintones/medium_light.json
+++ b/skintone/mixed_skintones/medium_light.json
@@ -1,6 +1,6 @@
 {
   "name": "medium_light",
-  "extension": "1f3fc",
+  "extension": "medium-light skin tone",
   "colors":
   {
     "skin": "#e0bb95",
diff --git a/skintone/skins/dark.json b/skintone/skins/dark.json
index 94f2ce5bd..f71909d17 100644
--- a/skintone/skins/dark.json
+++ b/skintone/skins/dark.json
@@ -1,6 +1,6 @@
 {
   "name": "dark",
-  "extension": "1f3ff",
+  "extension": "dark skin tone",
   "colors":
   {
     "skin": "#70534a",
diff --git a/skintone/skins/light.json b/skintone/skins/light.json
index 71162acd0..d7cc88de7 100644
--- a/skintone/skins/light.json
+++ b/skintone/skins/light.json
@@ -1,6 +1,6 @@
 {
   "name": "light",
-  "extension": "1f3fb",
+  "extension": "light skin tone",
   "colors":
   {
     "skin": "#fadcbc",
diff --git a/skintone/skins/medium.json b/skintone/skins/medium.json
index ebc3d72f5..603126488 100644
--- a/skintone/skins/medium.json
+++ b/skintone/skins/medium.json
@@ -1,6 +1,6 @@
 {
   "name": "medium",
-  "extension": "1f3fd",
+  "extension": "medium skin tone",
   "colors":
   {
     "skin": "#bf8f68",
diff --git a/skintone/skins/medium_dark.json b/skintone/skins/medium_dark.json
index da5e38e76..24c99e0fb 100644
--- a/skintone/skins/medium_dark.json
+++ b/skintone/skins/medium_dark.json
@@ -1,6 +1,6 @@
 {
   "name": "medium_dark",
-  "extension": "1f3fe",
+  "extension": "medium-dark skin tone",
   "colors":
   {
     "skin": "#9b643c",
diff --git a/skintone/skins/medium_light.json b/skintone/skins/medium_light.json
index 110e0991c..34e4f8953 100644
--- a/skintone/skins/medium_light.json
+++ b/skintone/skins/medium_light.json
@@ -1,6 +1,6 @@
 {
   "name": "medium_light",
-  "extension": "1f3fc",
+  "extension": "medium-light skin tone",
   "colors":
   {
     "skin": "#e0bb95",
diff --git a/skintone/skins/redhead.json b/skintone/skins/redhead.json
index f8360a0d5..dd6615b28 100644
--- a/skintone/skins/redhead.json
+++ b/skintone/skins/redhead.json
@@ -1,6 +1,6 @@
 {
   "name": "redhead",
-  "extension": "1f9b0",
+  "extension": "red hair",
   "colors":
   {
     "skin": "#fac01b",
diff --git a/skintone/skins/white.json b/skintone/skins/white.json
index e27d4a12e..8d613c623 100644
--- a/skintone/skins/white.json
+++ b/skintone/skins/white.json
@@ -1,6 +1,6 @@
 {
   "name": "white",
-  "extension": "1f9b3",
+  "extension": "white hair",
   "colors":
   {
     "skin": "#fac01b",