diff --git a/system/router.php b/system/router.php
index 4fcd9627..b2d409cb 100644
--- a/system/router.php
+++ b/system/router.php
@@ -108,7 +108,9 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 	}
 
 	foreach ($routes as $route) {
-		if(!isset($isAlreadyDefined[$route[1]])) {
+		$tmp = preg_replace("/\[[^)]+\]/","", $route[1]);
+
+		if(!isset($isAlreadyDefined[$tmp])) {
 			if (strpos($route[2], '__redirect__') === false && strpos($route[2], '__database__') === false) {
 				$routesFinal[] = [$route[0], $route[1], 'system/pages/' . $route[2]];
 			}
@@ -118,7 +120,6 @@ $dispatcher = FastRoute\cachedDispatcher(function (FastRoute\RouteCollector $r)
 		}
 	}
 
-	//var_dump($routesTmp);
 	foreach ($routesFinal as $route) {
 		if ($route[0] === '*') {
 			$route[0] = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'];
diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index cb19bab1..adf8eaa8 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -23,6 +23,11 @@ class Plugins {
 
 		$routes = [];
 		foreach(self::getAllPluginsJson() as $plugin) {
+			$priority = 100;
+			if (isset($plugin['priority'])) {
+				$priority = $plugin['priority'];
+			}
+
 			//
 			// Get all plugins/*/pages/*.php pages
 			//
@@ -31,7 +36,7 @@ class Plugins {
 				$file = str_replace(PLUGINS, 'plugins/', $file);
 				$name = pathinfo($file, PATHINFO_FILENAME);
 
-				$routes[] = [['get', 'post'], $name, $file, 1000];
+				$routes[] = [['get', 'post'], $name, $file, $priority];
 			}
 
 			//
@@ -46,14 +51,14 @@ class Plugins {
 					$file = str_replace(PLUGINS, 'plugins/', $file);
 					$name = $folderName . '/' . pathinfo($file, PATHINFO_FILENAME);
 
-					$routes[] = [['get', 'post'], $name, $file, 1000];
+					$routes[] = [['get', 'post'], $name, $file, $priority];
 				}
 			}
 
 			$warningPreTitle = 'Plugin: ' . $plugin['name'] . ' - ';
 
 			if (isset($plugin['routes'])) {
-				foreach ($plugin['routes'] as $_name => $info) {
+				foreach ($plugin['routes'] as $info) {
 					// default method: get
 					$method = $info['method'] ?? ['GET'];
 					if ($method !== '*') {
@@ -106,17 +111,17 @@ class Plugins {
 				}
 			}
 		}
-		/*
-				usort($routes, function ($a, $b)
-				{
-					// key 3 is priority
-					if ($a[3] == $b[3]) {
-						return 0;
-					}
 
-					return ($a[3] > $b[3]) ? -1 : 1;
-				});
-		*/
+		usort($routes, function ($a, $b)
+		{
+			// key 3 is priority
+			if ($a[3] == $b[3]) {
+				return 0;
+			}
+
+			return ($a[3] < $b[3]) ? -1 : 1;
+		});
+
 		// cleanup before passing back
 		// priority is not needed anymore
 		foreach ($routes as &$route) {