diff --git a/Template/template.json b/Template/template.json
index 967efab..8e71690 100644
--- a/Template/template.json
+++ b/Template/template.json
@@ -112,54 +112,6 @@
 				}
 			]
 		},
-		{
-			"categories": [
-				"Other",
-				"Tools"
-			],
-			"description": "Embystat is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.",
-			"image": "linuxserver/embystat:latest",
-			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/embystat.png",
-			"name": "EmbyStat",
-			"note": "Access the ui at your-ip:6555. Follow the setup wizard on initial install. Then configure the required services.",
-			"platform": "linux",
-			"ports": [
-				"6555:6555/tcp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "EmbyStat",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/EmbyStat",
-					"container": "/config"
-				}
-			]
-		},
-		{
-			"categories": [
-				"Other",
-				"Tools"
-			],
-			"description": "Self-hosted snippet manager.",
-			"image": "snowmean/snibox-sqlite:latest",
-			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/snibox.png",
-			"name": "Snibox",
-			"note": "Label-oriented interface with search. Supports various programming languages, markdown, plain text.",
-			"platform": "linux",
-			"ports": [
-				"3010:3000/tcp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "Snibox",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/Snibox",
-					"container": "/app/db/database"
-				}
-			]
-		},
 		{
 			"categories": [
 				"Other",
@@ -1020,6 +972,30 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "Embystat is a personal web server that can calculate all kinds of statistics from your (local) Emby server. Just install this on your server and let him calculate all kinds of fun stuff.",
+			"image": "linuxserver/embystat:latest",
+			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/embystat.png",
+			"name": "EmbyStat",
+			"note": "Access the ui at your-ip:6555. Follow the setup wizard on initial install. Then configure the required services.",
+			"platform": "linux",
+			"ports": [
+				"6555:6555/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "EmbyStat",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/EmbyStat",
+					"container": "/config"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Other",
@@ -1656,6 +1632,49 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Downloaders",
+				"Music"
+			],
+			"description": "Lidarr is a music collection manager for Usenet and BitTorrent users.",
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "100",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"image": "linuxserver/lidarr:latest",
+			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/lidarr.png",
+			"name": "lidarr",
+			"platform": "linux",
+			"ports": [
+				"8686:8686/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "Lidarr",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/Lidarr",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Downloads",
+					"container": "/downloads"
+				},
+				{
+					"bind": "/portainer/Music",
+					"container": "/music"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Cloud",
@@ -2734,6 +2753,46 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Downloaders"
+			],
+			"description": "The qBittorrent project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.",
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "100",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"image": "linuxserver/qbittorrent:latest",
+			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/qbittorrent-icon.png",
+			"name": "qbittorrent",
+			"platform": "linux",
+			"ports": [
+				"6881:6881/tcp",
+				"6881:6881/udp",
+				"8080:8080/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "qBittorrent",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/qBittorrent",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Downloads",
+					"container": "/downloads"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Messenger"
@@ -2875,6 +2934,46 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Downloaders"
+			],
+			"description": "Popular torrent client with a webui for ease of use.",
+			"env": [
+				{
+					"default": "1000",
+					"label": "PUID",
+					"name": "PUID"
+				},
+				{
+					"default": "100",
+					"label": "PGID",
+					"name": "PGID"
+				}
+			],
+			"image": "linuxserver/rutorrent:latest",
+			"logo": "https://raw.githubusercontent.com/linuxserver/beta-templates/master/lsiodev/img/rutorrent-icon.png",
+			"name": "rutorrent",
+			"platform": "linux",
+			"ports": [
+				"80/tcp",
+				"51413:51413/tcp",
+				"6881:6881/udp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "ruTorrent",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/ruTorrent",
+					"container": "/config"
+				},
+				{
+					"bind": "/portainer/Downloads",
+					"container": "/downloads"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Downloaders"
@@ -3065,6 +3164,30 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "Self-hosted snippet manager.",
+			"image": "snowmean/snibox-sqlite:latest",
+			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/snibox.png",
+			"name": "Snibox",
+			"note": "Label-oriented interface with search. Supports various programming languages, markdown, plain text.",
+			"platform": "linux",
+			"ports": [
+				"3010:3000/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "Snibox",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "/portainer/Files/AppData/Config/Snibox",
+					"container": "/app/db/database"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Downloaders",
@@ -3622,6 +3745,33 @@
 				}
 			]
 		},
+		{
+			"categories": [
+				"Other",
+				"Tools"
+			],
+			"description": "A web interface for managing docker containers with an emphasis on templating to provide 1 click deployments. Think of it like a decentralized app store for servers that anyone can make packages for.",
+			"image": "selfhostedpro/yacht:latest",
+			"logo": "https://raw.githubusercontent.com/SelfhostedPro/Yacht/master/readme_media/Yacht_logo_1_dark.png",
+			"name": "yacht",
+			"platform": "linux",
+			"ports": [
+				"8001:8000/tcp"
+			],
+			"restart_policy": "unless-stopped",
+			"title": "Yacht",
+			"type": 1,
+			"volumes": [
+				{
+					"bind": "yacht",
+					"container": "/config"
+				},
+				{
+					"bind": "/var/run/docker.sock",
+					"container": "/var/run/docker.sock"
+				}
+			]
+		},
 		{
 			"categories": [
 				"Other",
@@ -3694,156 +3844,6 @@
 					"container": "/config"
 				}
 			]
-		},
-		{
-			"categories": [
-				"Downloaders",
-				"Music"
-			],
-			"description": "Lidarr is a music collection manager for Usenet and BitTorrent users.",
-			"env": [
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "100",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/lidarr:latest",
-			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/lidarr.png",
-			"name": "lidarr",
-			"platform": "linux",
-			"ports": [
-				"8686:8686/tcp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "lidarr",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/Lidarr",
-					"container": "/config"
-				},
-				{
-					"bind": "/portainer/Downloads",
-					"container": "/downloads"
-				},
-				{
-					"bind": "/portainer/Music",
-					"container": "/music"
-				}
-			]
-		},
-		{
-			"categories": [
-				"Downloaders"
-			],
-			"description": "The qBittorrent project aims to provide an open-source software alternative to µTorrent. qBittorrent is based on the Qt toolkit and libtorrent-rasterbar library.",
-			"env": [
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "100",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/qbittorrent:latest",
-			"logo": "https://raw.githubusercontent.com/Qballjos/portainer_templates/master/Images/qbittorrent-icon.png",
-			"name": "qbittorrent",
-			"platform": "linux",
-			"ports": [
-				"6881:6881/tcp",
-				"6881:6881/udp",
-				"8080:8080/tcp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "qBittorrent",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/qBittorrent",
-					"container": "/config"
-				},
-				{
-					"bind": "/portainer/Downloads",
-					"container": "/downloads"
-				}
-			]
-		},
-		{
-			"categories": [
-				"Other",
-				"Tools"
-			],
-			"description": "A web interface for managing docker containers with an emphasis on templating to provide 1 click deployments. Think of it like a decentralized app store for servers that anyone can make packages for.",
-			"image": "selfhostedpro/yacht:latest",
-			"logo": "https://raw.githubusercontent.com/SelfhostedPro/Yacht/master/readme_media/Yacht_logo_1_dark.png",
-			"name": "yacht",
-			"platform": "linux",
-			"ports": [
-				"8001:8000/tcp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "Yacht",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "yacht",
-					"container": "/config"
-				},
-				{
-					"bind": "/var/run/docker.sock",
-					"container": "/var/run/docker.sock"
-				}
-			]
-		},
-		{
-			"categories": [
-				"Downloaders"
-			],
-			"description": "Popular torrent client with a webui for ease of use.",
-			"env": [
-				{
-					"default": "1000",
-					"label": "PUID",
-					"name": "PUID"
-				},
-				{
-					"default": "100",
-					"label": "PGID",
-					"name": "PGID"
-				}
-			],
-			"image": "linuxserver/rutorrent:latest",
-			"logo": "https://raw.githubusercontent.com/linuxserver/beta-templates/master/lsiodev/img/rutorrent-icon.png",
-			"name": "rutorrent",
-			"platform": "linux",
-			"ports": [
-				"80/tcp",
-				"51413:51413/tcp",
-				"6881:6881/udp"
-			],
-			"restart_policy": "unless-stopped",
-			"title": "ruTorrent",
-			"type": 1,
-			"volumes": [
-				{
-					"bind": "/portainer/Files/AppData/Config/ruTorrent",
-					"container": "/config"
-				},
-				{
-					"bind": "/portainer/Downloads",
-					"container": "/downloads"
-				}
-			]
 		}
 	]
 }