diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc
index 04245f68..d1612aaa 100644
--- a/configs/AppConfig.inc
+++ b/configs/AppConfig.inc
@@ -145,23 +145,29 @@
 		 * @var array
 		 */
 		public static $routes = array(
-			array('css/?(.*)',						'css/$1?layout=stylesheet',		true),
-			array('users/([^/]+)/(edit|delete)',				'users/$2/$1',				true),
-			array('users/(?!(index|login|register|logout|create|edit|delete))',	'users/user/$1',		true),
-			array('seminaries/([^/]+)/(edit|delete)',			'seminaries/$2/$1',			true),
-			array('seminaries/(?!(index|create|edit|delete))',		'seminaries/seminary/$1',		true),
-			/*// z/<Seminary>					⇒ z/seminaries/seminary/<Seminary>
-			array('^([^/]+)/*$',						'seminaries/seminary/$1',		true),
-			// z/<Seminary>/<Questgroup>				⇒ z/questgroups/questgroup/<Seminary>/<Questgroup>
-			array('^([^/]+)/([^/]+)/?$',					'questgropus/questgroup/$1/$2',		true),
-			// z/<Seminary>/<Questgroup>/<Quest>			⇒ z/quests/quest/<Seminary>/<Questgroup>/<Quest>
-			array('^([^/]+)/([^/]+)/([^/]+)/?$',				'quests/quest/$1/$2/3',			true)*/
-			array('characters/(?!(index|character|register|manage))',	'characters/index/$1',			true),
-			array('charactergroups/(?!(index|groupsgroup|group|managegroup))',	'charactergroups/index/$1',		true),
-			array('charactergroupsquests/(?!(quest))',			'charactergroupsquests/quest/$1',	true),
-			array('media/(.*)',						'media/$1?layout=binary',		false),
-			array('uploads/(.*)',						'uploads/$1?layout=binary',		false),
-			array('uploads/(?!(index|seminary))',				'uploads/index/$1',			true)
+			array('^users/([^/]+)/(edit|delete)/?$',				'users/$2/$1',			true),
+			array('^users/(?!(index|login|register|logout|create|edit|delete))/?',	'users/user/$1',		true),
+			array('^seminaries/([^/]+)/(edit|delete)/?$',				'seminaries/$2/$1',		true),
+			array('^seminaries/(?!(index|create|edit|delete))/?',			'seminaries/seminary/$1',	true),
+			array('^questgroups/([^/]+)/(create)/?$',				'questgroups/$2/$1',		true),
+			array('^questgroups/([^/]+)/([^/]+)/?$',				'questgroups/questgroup/$1/$2',	true),
+			array('^quests/([^/]+)/(create|createmedia)/?$',			'quests/$2/$1'	,		true),
+			array('^quests/([^/]+)/([^/]+)/([^/]+)/(submissions)/?$',		'quests/$4/$1/$2/$3',		true),
+			array('^quests/([^/]+)/([^/]+)/([^/]+)/(submission)/([^/]+)/?$',	'quests/$4/$1/$2/$3/$5',	true),
+			array('^quests/(?!(index|create|createmedia))/?',			'quests/quest/$1',		true),
+			array('^characters/([^/]+)/(register|manage)/?$',			'characters/$2/$1',		true),
+			array('^characters/([^/]+)/?$',						'characters/index/$1',		true),
+			array('^characters/([^/]+)/(?!(index|create|register|manage))/?',	'characters/character/$1/$2',	true),
+			array('^charactergroups/([^/]+)/?$',					'charactergroups/index/$1',	true),
+			array('^charactergroups/([^/]+)/([^/]+)/?$',				'charactergroups/groupsgroup/$1/$2',	true),
+			array('^charactergroups/([^/]+)/([^/]+)/(managegroup)/?$',		'charactergroups/$3/$1/$2',	true),
+			array('^charactergroups/([^/]+)/([^/]+)/(?!(managegroup))/?',		'charactergroups/group/$1/$2/$3',	true),
+			array('^charactergroupsquests/([^/]+)/([^/]+)/([^/]+)/?$',		'charactergroupsquests/quest/$1/$2/$3',	true),
+			array('^achievements/([^/]+)/?$',					'achievements/index/$1',	true),
+			array('^library/([^/]+)/?$',						'library/index/$1',		true),
+			array('^library/([^/]+)/([^/]+)/?$',					'library/topic/$1/$2',		true),
+			array('^media/(.*)$',							'media/$1?layout=binary',	false),
+			array('^uploads/(.*)$',							'uploads/$1?layout=binary',	false)
 		);
 
 
@@ -172,14 +178,22 @@
 		 * @var array
 		 */
 		public static $reverseRoutes = array(
-			array('users/user/(.*)',			'users/$1',			true),
-			array('users/([^/]+)/(.*)',			'users/$2/$1',			true),
-			array('seminaries/seminary/(.*)',		'seminaries/$1',		false),
-			//array('seminaries/seminary/(.*)',		'$1',				false)
-			array('characters/index/(.*)',			'characters/$1',		true),
-			array('charactergroups/index/(.*)',		'charactergroups/$1',		true),
-			array('charactergroupsquests/quest/(.*)',	'charactergroupsquests/$1',	true),
-			array('uploads/index/(.*)',			'uploads/$1',			true)
+			array('^users/user/(.*)$',			'users/$1',			true),
+			array('^users/([^/]+)/(.*)$',			'users/$2/$1',			true),
+			array('^seminaries/seminary/(.*)$',		'seminaries/$1',		false),
+			array('^questgroups/create/(.*)$',		'questgroups/$2/$1',		true),
+			array('^questgroups/questgroup/(.*)$',		'questgroups/$1',		true),
+			array('^quests/quest/(.*)$',			'quests/$1',			true),
+			array('^quests/(create|createmedia)/(.*)$',	'quests/$2/$1'	,		true),
+			array('^quests/(submissions|submission)/(.*)$',	'quests/$2/$1',			true),
+			array('^characters/(index|character)/(.*)$',	'characters/$2',		true),
+			array('^characters/(register|manage)/(.*)$',	'characters/$2/$1',		true),
+			array('^charactergroups/(index|group)/(.*)$',	'charactergroups/$2',		true),
+			array('^charactergroups/groupsgroup/(.*)$',	'charactergroups/$1',		true),
+			array('^charactergroups/(managegroup)/(.*)$',	'charactergroups/$2/$1',	true),
+			array('^charactergroupsquests/quest/(.*)$',	'charactergroupsquests/$1',	true),
+			array('^achievements/index/(.*)$',		'achievements/$1',		true),
+			array('^library/(index|topic)/(.*)$',		'library/$2',			true)
 		);