diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_D_M_834372106.dwg b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_D_M_834372106.dwg
new file mode 100644
index 0000000..2e32439
Binary files /dev/null and b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_D_M_834372106.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_T_M_834372206.dwg b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_T_M_834372206.dwg
new file mode 100644
index 0000000..a2c4ad0
Binary files /dev/null and b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_500_600_T_M_834372206.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_D_M_834372109.dwg b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_D_M_834372109.dwg
new file mode 100644
index 0000000..f92db33
Binary files /dev/null and b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_D_M_834372109.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_T_M_834372209.dwg b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_T_M_834372209.dwg
new file mode 100644
index 0000000..fc02ccf
Binary files /dev/null and b/CAD/OmnifloCAD/Weiche_90Doppel/Weiche_90_700_700_T_M_834372209.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_500_600_R_M_834372024.dwg b/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_500_600_R_M_834372024.dwg
index 553bfe9..db52216 100644
Binary files a/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_500_600_R_M_834372024.dwg and b/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_500_600_R_M_834372024.dwg differ
diff --git a/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_700_700_L_M_834372027.dwg b/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_700_700_L_M_834372027.dwg
index 26743ee..433730d 100644
Binary files a/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_700_700_L_M_834372027.dwg and b/CAD/OmnifloCAD/Weiche_90Einfach/Weiche_90_700_700_L_M_834372027.dwg differ
diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt
index 88b8ca3..142920f 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_OmnifloParts","name":"Omniflo Parts","hasShapes":true,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","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":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
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_32px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_32px.png
new file mode 100644
index 0000000..9e72989
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_64px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_64px.png
new file mode 100644
index 0000000..6c25951
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_M_834372206_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_32px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_32px.png
new file mode 100644
index 0000000..87563fd
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_64px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_64px.png
new file mode 100644
index 0000000..9d36d36
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_500_600_T_P_834372207_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png
new file mode 100644
index 0000000..1a2d544
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png
new file mode 100644
index 0000000..6995242
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_M_834372209_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_32px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_32px.png
new file mode 100644
index 0000000..4d7c61b
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_64px.png b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_64px.png
new file mode 100644
index 0000000..4382885
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/Weiche_90_700_700_T_P_834372210_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml
new file mode 100644
index 0000000..2c899aa
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloBogen.xml
@@ -0,0 +1,19 @@
+
APB 110 R 550/22.5 84
+
APB 110 R 400/45 400
+
APB 110 R 550/45 191
+
APB 110 R 550/45 205
+
APB 110 R 550/45 232
+
APB 110 R 630/45 400
+
APB 110 R 400/67.5 339
+
APB 110 R 550/67.5 432
+
APB 110 R 550/67.5 420
+
APB 110 R 550/67.5 L=185/170
+
APB 110 R 400/90 500/500
+
APB 110 R 500/90 550/550
+
APB 110 R 550/90 900/605
+
APB 110 R 630/90 850/690
+
APB 110 R 630/90 850/870
+
APB 110 R 630/90 850/890
+
APB 110 R 630/90 800/800
+
APB 110 R 650/180 L=150
+
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloParts.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloParts.xml
index d20051a..249626a 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloParts.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloParts.xml
@@ -16,6 +16,16 @@
APB 110 R 630/90 850/890
APB 110 R 630/90 800/800
APB 110 R 650/180 L=150
+
Einfach 90° 700/700 rechts M
+
Einfach 90° 700/700 links P
+
Einfach 90° 700/700 rechts P
+
Einfach 90° 500/600 links M
+
Einfach 90° 500/600 rechts M
+
Einfach 90° 500/600 links P
+
Einfach 90° 500/600 rechts P
+
Doppel 90° 500/600 M
+
Doppel 90° 700/700 P
+
Doppel 90° 500/600 P
TEF Bogen 90° R725
APB 110 R 630/90 800/800 mit TEF Aussen
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloTEFParts.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloTEFParts.xml
new file mode 100644
index 0000000..be92657
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloTEFParts.xml
@@ -0,0 +1,3 @@
+
APB 110 R 630/90 800/800 mit TEF Aussen
+
TEF Bogen 90° R725
+
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml
new file mode 100644
index 0000000..45ed281
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_OmnifloWeiche.xml
@@ -0,0 +1,17 @@
+
Einfach 90° 700/700 links M
+
Einfach 90° 700/700 rechts M
+
Einfach 90° 700/700 links P
+
Einfach 90° 700/700 rechts P
+
Einfach 90° 500/600 links M
+
Einfach 90° 500/600 rechts M
+
Einfach 90° 500/600 links P
+
Einfach 90° 500/600 rechts P
+
Doppel 90° 700/700 M
+
Doppel 90° 500/600 M
+
Doppel 90° 700/700 P
+
Doppel 90° 500/600 P
+
Dreiwege 90° 500/600 M
+
Dreiwege 90° 700/700 M
+
Dreiwege 90° 500/600 P
+
Dreiwege 90° 700/700 P
+
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml
index fd0b072..ab81cf8 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFElemente.xml
@@ -1,3 +1,3 @@
-
APB 110 R 630/90 800/800 mit TEF Aussen
-
TEF Bogen 90° R725
+
APB 110 R 630/90 800/800 mit TEF Aussen
+
TEF Bogen 90° R725
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_TEFFoerderer.xml b/Editor2DLibrary/SSG/shapes/palettes/c_TEFFoerderer.xml
new file mode 100644
index 0000000..56cf1e1
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_TEFFoerderer.xml
@@ -0,0 +1,3 @@
+
APB 110 R 630/90 800/800 mit TEF Aussen
+
TEF Bogen 90° R725
+
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml
index 325e600..66e4dbe 100644
--- a/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml
+++ b/Editor2DLibrary/SSG/shapes/palettes/c_Weichen_90.xml
@@ -1,13 +1,4 @@
-