diff --git a/Editor2DLibrary/SSG/shapes/categories.txt b/Editor2DLibrary/SSG/shapes/categories.txt
index 2437a74..76e98a2 100644
--- a/Editor2DLibrary/SSG/shapes/categories.txt
+++ b/Editor2DLibrary/SSG/shapes/categories.txt
@@ -1 +1,5 @@
-[{"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":false},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":false},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true}]}]
\ No newline at end of file
+<<<<<<< Updated upstream
+[{"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":false},{"id":"c_Omniflo","name":"Omniflo","hasShapes":false,"items":[{"id":"c_Boegen_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":false},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true}]}]
+=======
+[{"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_90","name":"Bögen 90°","hasShapes":true},{"id":"c_Boegen_45","name":"Bögen 45°","hasShapes":false},{"id":"c_Boegen_22_5","name":"Bögen 22.5°","hasShapes":true},{"id":"c_Gerade","name":"Aluprofil Gerade","hasShapes":true}]}]
+>>>>>>> Stashed changes
diff --git a/Editor2DLibrary/SSG/shapes/img/AP_32px.png b/Editor2DLibrary/SSG/shapes/img/AP_32px.png
new file mode 100644
index 0000000..e26124b
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/AP_32px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/img/AP_64px.png b/Editor2DLibrary/SSG/shapes/img/AP_64px.png
new file mode 100644
index 0000000..3b5ae48
Binary files /dev/null and b/Editor2DLibrary/SSG/shapes/img/AP_64px.png differ
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt b/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt
index 9bb631b..8ba1caf 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Bogen_22.5.txt
@@ -5,6 +5,9 @@
   "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png",
   "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png",
   "srcSVG": "SSG/shapes/svg/s_Bogen_22.5.xml",
+  "width": 317.4803,
+  "height": 1972.9134,
+  "depth": 415.748,
   "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
   "connectionPoints": [
     {
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt b/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt
index 64f9397..6b5b1e6 100644
--- a/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt
+++ b/Editor2DLibrary/SSG/shapes/props/s_Bogen_90.txt
@@ -5,6 +5,9 @@
   "icon": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_32px.png",
   "iconBig": "SSG/shapes/img/APB_110_R630_D90_800_800_821104033_64px.png",
   "srcSVG": "SSG/shapes/svg/s_Bogen_90.xml",
+  "width": 3023.622,
+  "height": 3023.622,
+  "depth": 415.748,
   "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
   "connectionPoints": [
     {
diff --git a/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt
new file mode 100644
index 0000000..c241062
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/props/s_Gerade_AP110.txt
@@ -0,0 +1,50 @@
+{
+  "shapeMode": 0,
+  "name": "AP 110",
+  "family": "Omniflo",
+  "icon": "SSG/shapes/img/AP_32px.png",
+  "iconBig": "SSG/shapes/img/AP_64px.png",
+  "srcSVG": "SSG/shapes/svg/s_Gerade_AP110.xml",
+  "width": 158.7402,
+  "height": 3779.5276,
+  "depth": 415.748,
+  "behaviour": "(NOSTRETCH)(NOSTRETCHONVIEW)(NOROTATE)(NOROTATEONVIEW)(CONTAINER)(HIDEDIMENSIONS)(HIDEROTATION)(HIDEPIN)(ALWAYSFRONT)(ORIGIN=CENTER)",
+  "connectionPoints": [
+    {
+      "id": "cp1",
+      "x": 500.0,
+      "y": 0.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 0.0,
+      "label": "",
+      "isDimension": true
+    },
+    {
+      "id": "cp2",
+      "x": 500.0,
+      "y": 1000.0,
+      "z": 0.0,
+      "xMin": "",
+      "xMax": "",
+      "xStep": "",
+      "yMin": "",
+      "yMax": "",
+      "yStep": "",
+      "zMin": "",
+      "zMax": "",
+      "zStep": "",
+      "direction": 180.0,
+      "label": "",
+      "isDimension": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/settings.txt b/Editor2DLibrary/SSG/shapes/settings.txt
index 9789f91..583db53 100644
--- a/Editor2DLibrary/SSG/shapes/settings.txt
+++ b/Editor2DLibrary/SSG/shapes/settings.txt
@@ -1 +1 @@
-{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":true},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_45":{"expanded":false},"c_Boegen_22_5":{"expanded":true}},"shapes":{}}
\ No newline at end of file
+{"categories":{"c_ILS":{"expanded":true},"c_Kreiselmodule":{"expanded":true},"c_Zusatzmodul":{"expanded":true},"c_Foerderer":{"expanded":true},"c_Kurven":{"expanded":true},"c10":{"expanded":false},"c_Background":{"expanded":false},"c_Parts":{"expanded":false},"c_Session":{"expanded":false},"c_Omniflo":{"expanded":true},"c_Boegen_90":{"expanded":true},"c_Boegen_45":{"expanded":false},"c_Boegen_22_5":{"expanded":true},"c_Gerade":{"expanded":true}},"shapes":{}}
\ No newline at end of file
diff --git a/Editor2DLibrary/SSG/shapes/svg/s_Gerade_AP110.xml b/Editor2DLibrary/SSG/shapes/svg/s_Gerade_AP110.xml
new file mode 100644
index 0000000..cc7f729
--- /dev/null
+++ b/Editor2DLibrary/SSG/shapes/svg/s_Gerade_AP110.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg">
+  <g transform="rotate(0)">
+    <svg viewBox="0 0 264.58 264.58" preserveAspectRatio="none" position="absolute" overflow="visible">
+      <path d="m132.29-2.5e-6v264.58" fill="none" stroke="#ffe31b" stroke-opacity="1" stroke-width="1px" />
+    </svg>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/SVGs/OF_Gerade.svg b/SVGs/OF_Gerade.svg
new file mode 100644
index 0000000..80aedeb
--- /dev/null
+++ b/SVGs/OF_Gerade.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="1e3" height="1e3" version="1.1" viewBox="0 0 264.58 264.58" xmlns="http://www.w3.org/2000/svg">
+ <path d="m132.29-2.5e-6v264.58" fill="none" stroke="#ffe31b" stroke-opacity="1"/>
+</svg>