diff --git a/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1400_700_M_834372400.dwg b/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1400_700_M_834372400.dwg
new file mode 100644
index 0000000..2186172
Binary files /dev/null and b/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1400_700_M_834372400.dwg differ
diff --git a/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1600_800_M_834372403.dwg b/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1600_800_M_834372403.dwg
new file mode 100644
index 0000000..13399a4
Binary files /dev/null and b/CAD/OmnifloCAD/DeltaWeiche/DeltaWeiche_1600_800_M_834372403.dwg differ
diff --git a/CAD/OmnifloCAD/DeltaWeiche/StarWeiche_1400_1400_M_834372420.dwg b/CAD/OmnifloCAD/DeltaWeiche/StarWeiche_1400_1400_M_834372420.dwg
new file mode 100644
index 0000000..a4a1011
Binary files /dev/null and b/CAD/OmnifloCAD/DeltaWeiche/StarWeiche_1400_1400_M_834372420.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_T_M_834372206.dwg b/CAD/OmnifloCAD/Weiche_90Dreiwege/Weiche_90_500_600_T_M_834372206.dwg
similarity index 100%
rename from CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_T_M_834372206.dwg
rename to CAD/OmnifloCAD/Weiche_90Dreiwege/Weiche_90_500_600_T_M_834372206.dwg
diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_T_M_834372209.dwg b/CAD/OmnifloCAD/Weiche_90Dreiwege/Weiche_90_700_700_T_M_834372209.dwg
similarity index 100%
rename from CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_T_M_834372209.dwg
rename to CAD/OmnifloCAD/Weiche_90Dreiwege/Weiche_90_700_700_T_M_834372209.dwg
diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt
index 142920f..d48a4db 100644
--- a/Editor2DLibrary/SSG/shapes/categories.txt
+++ b/Editor2DLibrary/SSG/shapes/categories.txt
@@ -1 +1 @@
-[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":false},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":false},{"id":"c_Weichenkombinationen","name":"Delta Weichen","hasShapes":false},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true},{"id":"c_OmnifloTEFParts","name":"Omniflo TEF Elemente","hasShapes":true}]
\ No newline at end of file
+[{"id":"c_ILS","name":"ILS","hasShapes":false,"items":[{"id":"c_Kreiselmodule","name":"Kreisel-Module","hasShapes":true},{"id":"c_Zusatzmodul","name":"Zusatzmodul","hasShapes":true},{"id":"c_Foerderer","name":"Förderer","hasShapes":true},{"id":"c_Kurven","name":"Gefällestrecke","hasShapes":true}]},{"id":"c10","name":"PBU","hasShapes":true},{"id":"c_Background","name":"Background","hideName":true,"hasShapes":true},{"id":"c_Parts","name":"Parts","description":"Shapes used for creating new Assemblies while Session","hasShapes":true},{"id":"c_Session","name":"Session","hasShapes":true},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen","name":"Bögen","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true},{"id":"c_Weichen_90","name":"Weiche 90°","hasShapes":true},{"id":"c_Weichen_45","name":"Weiche 45°","hasShapes":false},{"id":"c_Weichenkoerper","name":"Weichenkörper","hasShapes":false},{"id":"c_Weichenkombinationen","name":"Delta Weichen","hasShapes":true},{"id":"c_TEFElemente","name":"TEF Elemente","hasShapes":true}]},{"id":"c_OmnifloBogen","name":"Omniflo Bogen","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true}]},{"id":"c_OmnifloWeiche","name":"Omniflo Weiche","hasShapes":true},{"id":"c_OmnifloTEFParts","name":"Omniflo TEF Elemente","hasShapes":true}]
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_32px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_32px.png
new file mode 100644
index 0000000..1bcbac8
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_64px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_64px.png
new file mode 100644
index 0000000..320fe63
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_M_834372400_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_32px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_32px.png
new file mode 100644
index 0000000..b219ecc
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_64px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_64px.png
new file mode 100644
index 0000000..41982a9
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1400_700_P_834372401_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_32px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_32px.png
new file mode 100644
index 0000000..388d0be
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_64px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_64px.png
new file mode 100644
index 0000000..b4d3322
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_M_834372403_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_32px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_32px.png
new file mode 100644
index 0000000..e693866
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_64px.png b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_64px.png
new file mode 100644
index 0000000..ab66acf
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/DeltaWeiche_1600_800_P_834372404_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_32px.png b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_32px.png
new file mode 100644
index 0000000..026c08c
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_64px.png b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_64px.png
new file mode 100644
index 0000000..4d3dd8e
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_M_834372420_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_32px.png b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_32px.png
new file mode 100644
index 0000000..ef65f06
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_64px.png b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_64px.png
new file mode 100644
index 0000000..932d82e
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/StarWeiche_1400_1400_P_834372421_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml
index 45ed281..b7fd684 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml
@@ -14,4 +14,10 @@
Dreiwege 90° 700/700 M
Dreiwege 90° 500/600 P
Dreiwege 90° 700/700 P
+
Delta 1400/700 M
+
Delta 1400/700 P
+
Delta 1600/800 M
+
Delta 1600/800 P
+
Star 1400/1400 M
+
Star 1400/1400 P
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Weichenkombinationen.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Weichenkombinationen.xml
new file mode 100644
index 0000000..ef82ea9
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_Weichenkombinationen.xml
@@ -0,0 +1,3 @@
+