diff --git a/README.md b/README.md
index d36e78b..b8e0757 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,8 @@ Online 3D Viewer (https://3dviewer.net) is a free and open source web solution t
 
 ## Supported file formats
 
-* **Import**: obj, 3ds, stl, ply, gltf, glb, off, 3dm, fbx, dae, wrl, 3mf, amf, ifc, brep, step, iges, fcstd, bim.
-* **Export**: obj, stl, ply, gltf, glb, off, 3dm, bim.
+* **Import**: 3dm, 3ds, 3mf, amf, bim, brep, dae, fbx, fcstd, gltf, ifc, iges, step, stl, obj, off, ply, wrl.
+* **Export**: 3dm, bim, gltf, obj, off, stl, ply.
 
 ## External Libraries
 
diff --git a/package.json b/package.json
index 8e8c4b3..69bf320 100644
--- a/package.json
+++ b/package.json
@@ -10,25 +10,24 @@
 		"3d",
 		"viewer",
 		"cad",
-		"obj",
-		"3ds",
-		"stl",
-		"ply",
-		"gltf",
-		"glb",
-		"off",
 		"3dm",
-		"fbx",
-		"dae",
-		"wrl",
+		"3ds",
 		"3mf",
 		"amf",
-		"ifc",
+		"bim",
 		"brep",
-		"step",
-		"iges",
+		"dae",
+		"fbx",
 		"fcstd",
-		"bim"
+		"gltf",
+		"ifc",
+		"iges",
+		"step",
+		"stl",
+		"obj",
+		"off",
+		"ply",
+		"wrl"
 	],
 	"files": [
 		"build/engine/o3dv.min.js",
diff --git a/website/index.html b/website/index.html
index e45c94d..dcfa68e 100644
--- a/website/index.html
+++ b/website/index.html
@@ -73,24 +73,24 @@
             <div class="intro_formats">
                 <div class="intro_formats_title">Check an example file:</div>
                 <div class="intro_file_formats">
-                    <a href="#model=assets/models/solids.obj,assets/models/solids.mtl">obj</a>
-                    <a href="#model=assets/models/cubes.3ds,assets/models/texture.png">3ds</a>
-                    <a href="#model=assets/models/utah_teapot.stl">stl</a>
-                    <a href="#model=assets/models/cow.ply">ply</a>
-                    <a href="#model=assets/models/DamagedHelmet.glb">gltf</a>
-                    <a href="#model=assets/models/cube.off">off</a>
                     <a href="#model=assets/models/RhinoLogo.3dm">3dm</a>
-                    <a href="#model=assets/models/Y_Bot.fbx">fbx</a>
-                    <a href="#model=assets/models/X_Bot.dae">dae</a>
-                    <a href="#model=assets/models/extrusion3.wrl">wrl</a>
+                    <a href="#model=assets/models/cubes.3ds,assets/models/texture.png">3ds</a>
                     <a href="#model=assets/models/rhombicuboctahedron.3mf">3mf</a>
                     <a href="#model=assets/models/rook.amf">amf</a>
-                    <a href="#model=assets/models/haus.ifc">ifc</a>
-                    <a href="#model=assets/models/as1_pe_203.brep">brep</a>
-                    <a href="#model=assets/models/as1_pe_203.stp">step</a>
-                    <a href="#model=assets/models/as1_pe_203.igs">iges</a>
-                    <a href="#model=assets/models/ArchDetail.FCStd">fcstd</a>
                     <a href="#model=assets/models/MultipleMeshes.bim">bim</a>
+                    <a href="#model=assets/models/as1_pe_203.brep">brep</a>
+                    <a href="#model=assets/models/X_Bot.dae">dae</a>
+                    <a href="#model=assets/models/Y_Bot.fbx">fbx</a>
+                    <a href="#model=assets/models/ArchDetail.FCStd">fcstd</a>
+                    <a href="#model=assets/models/DamagedHelmet.glb">gltf</a>
+                    <a href="#model=assets/models/haus.ifc">ifc</a>
+                    <a href="#model=assets/models/as1_pe_203.igs">iges</a>
+                    <a href="#model=assets/models/as1_pe_203.stp">step</a>
+                    <a href="#model=assets/models/utah_teapot.stl">stl</a>
+                    <a href="#model=assets/models/solids.obj,assets/models/solids.mtl">obj</a>
+                    <a href="#model=assets/models/cube.off">off</a>
+                    <a href="#model=assets/models/cow.ply">ply</a>
+                    <a href="#model=assets/models/extrusion3.wrl">wrl</a>
                 </div>
             </div>
         </div>
diff --git a/website/info/index.html b/website/info/index.html
index 6456f44..2f8f7e0 100644
--- a/website/info/index.html
+++ b/website/info/index.html
@@ -30,7 +30,7 @@
 		<p>
 			This is the user manual of <a href="https://3dviewer.net">3dviewer.net</a>.
 			The website can open several 3D file formats and visualize them in your browser.
-			It supports obj, 3ds, stl, ply, gltf, glb, off, 3dm, fbx, and much more.
+			It supports the following file formats: 3dm, 3ds, 3mf, amf, bim, brep, dae, fbx, fcstd, gltf, ifc, iges, step, stl, obj, off, ply, wrl.
 		</p>
 		<h1 id="supported_formats">Supported formats</h2>
 		<p>
@@ -48,12 +48,12 @@
 					<th>Source</th>
 				</tr>
 				<tr>
-					<td>Wavefront</td>
-					<td>obj</td>
-					<td>text</td>
+					<td>Rhinoceros 3D</td>
+					<td>3dm</td>
+					<td>binary</td>
 					<td class="center green">&#x2713</td>
 					<td class="center green">&#x2713</td>
-					<td>Native</td>
+					<td><a href="https://github.com/mcneel/rhino3dm">rhino3dm</a></td>
 				</tr>
 				<tr>
 					<td>3D Studio</td>
@@ -63,6 +63,110 @@
 					<td class="center red">&#x2717</td>
 					<td>Native</td>
 				</tr>
+				<tr>
+					<td>3D Manufacturing Format</td>
+					<td>3mf</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+				</tr>
+				<tr>
+					<td>Additive Manufacturing Format</td>
+					<td>amf</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+				</tr>
+				<tr>
+					<td>Dotbim</td>
+					<td>bim</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center green">&#x2713</td>
+					<td>Native</td>
+				</tr>
+				<tr>
+					<td>BREP</td>
+					<td>brep</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
+				</tr>
+				<tr>
+					<td>Collada</td>
+					<td>dae</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+				</tr>
+				<tr>
+					<td rowspan="2">Filmbox</td>
+					<td rowspan="2">fbx</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+				</tr>
+				<tr>
+					<td class="hidden"></td>
+					<td class="hidden"></td>
+					<td>binary</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+				</tr>
+				<tr>
+					<td>FreeCAD Standard file format</td>
+					<td>FCStd</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
+				</tr>
+				<tr>
+					<td rowspan="2">glTF</td>
+					<td>gltf</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center green">&#x2713</td>
+					<td>Native</td>
+				</tr>
+				<tr>
+					<td class="hidden"></td>
+					<td>glb</td>
+					<td>binary</td>
+					<td class="center green">&#x2713</td>
+					<td class="center green">&#x2713</td>
+					<td>Native</td>
+				</tr>
+				<tr>
+					<td>Industry Foundation Classes</td>
+					<td>ifc</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/tomvandig/web-ifc">web-ifc</a></td>
+				</tr>
+				<tr>
+					<td>IGES</td>
+					<td>iges</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
+				</tr>
+				<tr>
+					<td>STEP</td>
+					<td>step</td>
+					<td>text</td>
+					<td class="center green">&#x2713</td>
+					<td class="center red">&#x2717</td>
+					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
+				</tr>
 				<tr>
 					<td rowspan="2">Stereolithography</td>
 					<td rowspan="2">stl</td>
@@ -80,37 +184,13 @@
 					<td>Native</td>
 				</tr>
 				<tr>
-					<td rowspan="2">Polygon File Format</td>
-					<td rowspan="2">ply</td>
+					<td>Wavefront</td>
+					<td>obj</td>
 					<td>text</td>
 					<td class="center green">&#x2713</td>
 					<td class="center green">&#x2713</td>
 					<td>Native</td>
 				</tr>
-				<tr>
-					<td class="hidden"></td>
-					<td class="hidden"></td>
-					<td>binary</td>
-					<td class="center green">&#x2713</td>
-					<td class="center green">&#x2713</td>
-					<td>Native</td>
-				</tr>
-				<tr>
-					<td rowspan="2">glTF</td>
-					<td>gltf</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center green">&#x2713</td>
-					<td>Native</td>
-				</tr>
-				<tr>
-					<td class="hidden"></td>
-					<td>glb</td>
-					<td>binary</td>
-					<td class="center green">&#x2713</td>
-					<td class="center green">&#x2713</td>
-					<td>Native</td>
-				</tr>
 				<tr>
 					<td rowspan="2">Object File Format</td>
 					<td rowspan="2">off</td>
@@ -128,44 +208,20 @@
 					<td>Native</td>
 				</tr>
 				<tr>
-					<td>Dotbim</td>
-					<td>bim</td>
+					<td rowspan="2">Polygon File Format</td>
+					<td rowspan="2">ply</td>
 					<td>text</td>
 					<td class="center green">&#x2713</td>
 					<td class="center green">&#x2713</td>
 					<td>Native</td>
 				</tr>
-				<tr>
-					<td>Rhinoceros 3D</td>
-					<td>3dm</td>
-					<td>binary</td>
-					<td class="center green">&#x2713</td>
-					<td class="center green">&#x2713</td>
-					<td><a href="https://github.com/mcneel/rhino3dm">rhino3dm</a></td>
-				</tr>
-				<tr>
-					<td rowspan="2">Filmbox</td>
-					<td rowspan="2">fbx</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
-				</tr>
 				<tr>
 					<td class="hidden"></td>
 					<td class="hidden"></td>
 					<td>binary</td>
 					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
-				</tr>
-				<tr>
-					<td>Collada</td>
-					<td>dae</td>
-					<td>text</td>
 					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
+					<td>Native</td>
 				</tr>
 				<tr>
 					<td>Virtual Reality Modeling Language</td>
@@ -175,62 +231,6 @@
 					<td class="center red">&#x2717</td>
 					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
 				</tr>
-				<tr>
-					<td>3D Manufacturing Format</td>
-					<td>3mf</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
-				</tr>
-				<tr>
-					<td>Additive Manufacturing Format</td>
-					<td>amf</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/mrdoob/three.js">three.js</a></td>
-				</tr>
-				<tr>
-					<td>BREP</td>
-					<td>brep</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
-				</tr>
-				<tr>
-					<td>STEP</td>
-					<td>step</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
-				</tr>
-				<tr>
-					<td>IGES</td>
-					<td>iges</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
-				</tr>
-				<tr>
-					<td>FreeCAD Standard file format</td>
-					<td>FCStd</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/kovacsv/occt-import-js">occt-import-js</a></td>
-				</tr>
-				<tr>
-					<td>Industry Foundation Classes</td>
-					<td>ifc</td>
-					<td>text</td>
-					<td class="center green">&#x2713</td>
-					<td class="center red">&#x2717</td>
-					<td><a href="https://github.com/tomvandig/web-ifc">web-ifc</a></td>
-				</tr>
 			</table>
 		</p>
 		<h1 id="loading_models">Loading models</h1>