diff --git a/README.md b/README.md
index 06a6e203..ccf0a3a8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # Flexi Print
 
-
 - [Forum Tracker](https://forum.osr-plastic.org/t/flexi-print/)
 
 ## References
@@ -41,16 +40,12 @@
 
 ## References - Suppliers (industrial)
 
-<<<<<<< .mine
 - [Fusion 360 - Sample Mill Turning](https://a360.co/3qdRdAo)
 
 ## Parts
 
 - [SFU2005 - 1500mm - EBay](https://www.ebay.es/itm/313477317601?var=612322375062)
 - [HGH20-1500 mm - EBay](https://www.ebay.es/itm/274741722317)
-
-
-
 - [CEAD - Extrusion Heads](https://ceadgroup.com/)
 - [Weber - Twin Extruders](https://www.hansweber.de/produkte-services/extrusion/baureihen/weber-konische-doppelschnecken)
 - [MD - MDPH2 - Pellet Head Extruder](https://massivedimension.com/products/mdphe-v1-pellet-head-extruder-system)
diff --git a/bazar/output.html b/bazar/output.html
deleted file mode 100644
index 6593ca1b..00000000
--- a/bazar/output.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<h2 id="universalgantry3dprinter">Universal Gantry 3D Printer</h2>
-<p>Robust 3D printer using a gantry style design</p>
-<p><strong>Status</strong> : In development</p>
-<h3 id="features">Features</h3>
-<ul>
-    <li>Bedsize / Print volume : 1000x1000x1000</li>
-    <li>Pellet extrusion head</li>
-    <li>Other tools as milling heads are in development</li>
-</ul>
-<p>
-    <hr />
-    Please always contact us by EMail : <b>sales@plastic-hub.com</b><br />
-</p>
-<hr />
-<p>
-    <div style="clear:both" />
-</p>
-<div style="padding:16px;text-align: center;">
-    <div class="ty-vendor-plans">
-        <div class="ty-grid-list__item" style="float: left;border: 1px gray;">
-            <h4 id="authors">Specification</h4>
-            <table style="display:table;width:auto;margin-left:auto;margin-right:auto">
-                <thead>
-                    <tr>
-                        <th />
-                        <th />
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Version</td>
-                        <td>0.2</td>
-                    </tr>
-                    <tr>
-                        <td>Variant</td>
-                        <td>150cm</td>
-                    </tr>
-                    <tr>
-                        <td>Weight</td>
-                        <td>500kG</td>
-                    </tr>
-                    <tr>
-                        <td>Screw Diameter</td>
-                        <td>20 - 30mm</td>
-                    </tr>
-                    <tr>
-                        <td>Voltage</td>
-                        <td>220V</td>
-                    </tr>
-                    <tr>
-                        <td>Input Flake Size</td>
-                        <td>Small - Medium</td>
-                    </tr>
-                    <tr>
-                        <td>License</td>
-                        <td><a href="https://ohwr.org/cernohl" style="color:#4C74B9">CERN Open Source Hardware License</a></td>
-                    </tr>
-                    <tr>
-                        <td>Firmware</td>
-                        <td>Marlin</td>
-                    </tr>
-                    <tr>
-                        <td>Breakout Board</td>
-                        <td>Bigtree Octopus Pro</td>
-                    </tr>
-                </tbody>
-            </table>
-
-        </div>
-
-        <div class="ty-grid-list__item" style="float: left;text-align: left;border: 1px gray;">
-
-            <h4 id="authors">Authors</h4>
-
-            <ul>
-
-                <li><a href="https://osr-plastic.org" style="color:#4C74B9">PlasticHub S.L.</a></li>
-
-                <li><a href="https://www.facebook.com/dan.shirley.33" style="color:#4C74B9">Dan Shirley - Timberstar</a></li>
-
-            </ul>
-
-
-
-        </div>
-    </div>
-</div>
-<pre><code>## Resources
-</code></pre>
-<ul>
-    <li><a href="https://git.osr-plastic.org/osr-plastic/flexi-print">Git Sources</a></li>
-    <li><a href="https://forum.osr-plastic.org/t/flexi-print/8540">Forum</a></li>
-</ul>
-<hr />
-<h3>Payment terms</h3>
-<p><strong>Industrial machines</strong> : 100% of the total cost of the machine(s) to be paid at the moment of the order.</p>
-<p><strong>Machines manufactured in-house</strong></p>
-<p>70% of the total cost of the machine(s) to be paid at the moment of the order.
-    The 30% left + transport fees to be paid at reception of tracking number of the shipping (no machine leaves the workshop without full
-    payment).</p>
-<hr />
-<table style="display:table;width:auto;margin-left:auto;margin-right:auto">
-    <tbody>
-        <tr>
-            <td>
-                <a href="https://www.instagram.com/osr_plastic/" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/instagram-logo.png" />
-                </a>
-            </td>
-            <td>
-                <a alt="Open Source Projects" href="https://git.osr-plastic.org/osr-plastic" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/github.png" />
-                </a>
-            </td>
-            <td>
-                <a alt="" href="tel:0034691952287" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/007-whatsapp.png" />
-                </a>
-            </td>
-            <td>
-                <a alt="" href="mailto:sales2@plastic-hub.com" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/012-mail-2.png" />
-                </a>
-            </td>
-        </tr>
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/bazar/raw.html b/bazar/raw.html
deleted file mode 100644
index 7912b576..00000000
--- a/bazar/raw.html
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-## Universal Gantry 3D Printer
-
-Robust 3D printer using a gantry style design
-
-**Status** : In development
-
-
-### Features
-
-- Bedsize / Print volume : 1000x1000x1000
-- Pellet extrusion head
-- Other tools as milling heads are in development
-
-
-<hr/>
-    Please always contact us by EMail : <b>sales@plastic-hub.com</b><br/>
-<hr/>
-
-<div style="clear:both"/><div style="padding:16px;text-align: center;">
-    <div class="ty-vendor-plans"><div class="ty-grid-list__item" style="float: left;border: 1px gray;">
-            <h4 id="authors">Specification</h4>
-            <table style="display:table;width:auto;margin-left:auto;margin-right:auto">
-<thead>
-<tr>
-<th/>
-<th/>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td>Version</td>
-<td>0.2</td>
-</tr>
-<tr>
-<td>Variant</td>
-<td>150cm</td>
-</tr>
-<tr>
-<td>Weight</td>
-<td>500kG</td>
-</tr>
-<tr>
-<td>Screw Diameter</td>
-<td>20 - 30mm</td>
-</tr>
-<tr>
-<td>Voltage</td>
-<td>220V</td>
-</tr>
-<tr>
-<td>Input Flake Size</td>
-<td>Small - Medium</td>
-</tr>
-<tr>
-<td>License</td>
-<td><a href="https://ohwr.org/cernohl" style="color:#4C74B9">CERN Open Source Hardware License</a></td>
-</tr>
-<tr>
-<td>Firmware</td>
-<td>Marlin</td>
-</tr>
-<tr>
-<td>Breakout Board</td>
-<td>Bigtree Octopus Pro</td>
-</tr>
-</tbody>
-</table>
- 
-        </div>
-        
-        <div class="ty-grid-list__item" style="float: left;text-align: left;border: 1px gray;">
-            
-    <h4 id="authors">Authors</h4>
-
-<ul>
-    
-        <li><a href="https://osr-plastic.org" style="color:#4C74B9">PlasticHub S.L.</a></li>
-    
-        <li><a href="https://www.facebook.com/dan.shirley.33" style="color:#4C74B9">Dan Shirley - Timberstar</a></li>
-    
-</ul>
-
-                     
-                 
-        </div>
-    </div>
-</div>
-
-    ## Resources
-
-- [Git Sources](https://git.osr-plastic.org/osr-plastic/flexi-print)
-- [Forum](https://forum.osr-plastic.org/t/flexi-print/8540)
-
-     
-
-<hr/>
-
-
-    
-
-
-    
-<h3>Payment terms</h3>
-
-**Industrial machines** : 100% of the total cost of the machine(s) to be paid at the moment of the order.
-
-**Machines manufactured in-house**
-
-70% of the total cost of the machine(s) to be paid at the moment of the order.
-The 30% left + transport fees to be paid at reception of tracking number of the shipping (no machine leaves the workshop without full
-payment).
-<hr/>
-
-
-
-<table style="display:table;width:auto;margin-left:auto;margin-right:auto">
-    <tbody>
-        <tr>
-            <td>
-                <a href="https://www.instagram.com/osr_plastic/" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/instagram-logo.png"/>
-                </a>
-            </td>
-            <td>
-                <a alt="Open Source Projects" href="https://git.osr-plastic.org/osr-plastic" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/github.png"/>
-                </a>
-            </td>
-            <td>
-                <a alt="" href="tel:0034691952287" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/007-whatsapp.png"/>
-                </a>
-            </td>
-            <td>
-                <a alt="" href="mailto:sales2@plastic-hub.com" style="color:#4C74B9">
-                    <img width="30px" src="https://plastic-hub.com//assets/icons/012-mail-2.png"/>
-                </a>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-
-
diff --git a/cad/storch-150/cad/Global-Storch-150.SLDASM b/cad/storch-150/cad/Global-Storch-150.SLDASM
index 497aa9d3..5a8e2f27 100644
Binary files a/cad/storch-150/cad/Global-Storch-150.SLDASM and b/cad/storch-150/cad/Global-Storch-150.SLDASM differ
diff --git a/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM b/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM
index 3780ba8a..bddc09d0 100644
Binary files a/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM and b/cad/storch-150/cad/components/axis-2005/Axis-2005.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM b/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM
index 6847f3da..d2c269a0 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/HG15-Assembly.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM b/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM
index 62ccf094..f060396c 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/HGH15CA2R1500Z0H_FILE_1.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM b/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM
index 313ef32d..2b1545d6 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/XY-Rails.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM b/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM
index e22acf40..6ec3c2e8 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/Z-Axis.SLDASM differ
diff --git a/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM b/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM
index 8ff7c3c1..1b1462ea 100644
Binary files a/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM and b/cad/storch-150/cad/components/hgr15-rails/Z-Rail.SLDASM differ
diff --git a/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT b/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT
index ca3bc3b9..77a28773 100644
Binary files a/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT and b/cad/storch-150/cad/components/z-axis/Gantry-Rib-Middle.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT b/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT
index bc4a88d3..88e06a91 100644
Binary files a/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT and b/cad/storch-150/cad/components/z-axis/Gantry.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT b/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT
index fe167256..a2ffbefb 100644
Binary files a/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT and b/cad/storch-150/cad/components/z-axis/Side-Rib-A.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT b/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT
index ef7dbb79..2bfa0798 100644
Binary files a/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT and b/cad/storch-150/cad/components/z-axis/Side-Rib-AF.SLDPRT differ
diff --git a/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT b/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT
index 29d6f35e..52a4b1a3 100644
Binary files a/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT and b/cad/storch-150/cad/components/z-axis/sfu2005/30302-J2-SKF-Block.SLDPRT differ
diff --git a/media/sel/1.jpg b/media/sel/1.jpg
index 2b96a679..ff734d59 100644
Binary files a/media/sel/1.jpg and b/media/sel/1.jpg differ
diff --git a/media/sel/DSC01797.JPG b/media/sel/DSC01797.JPG
index 06f3099a..ccca682a 100644
Binary files a/media/sel/DSC01797.JPG and b/media/sel/DSC01797.JPG differ