diff --git a/classes/Core.class.php b/classes/Core.class.php
index 071b5f3..dd9a8f5 100644
--- a/classes/Core.class.php
+++ b/classes/Core.class.php
@@ -85,7 +85,7 @@
 			$this->modules	= new Modules($this);
 			$this->template	= new Template($this);
 			$this->router	= new Router($this);
-			$this->admin	= new CoreAdmin($this);
+			$this->admin	= new CoreAdmin($this, NULL);
 			
 			$this->router->addRoute('/', function() {
 				if(Auth::isLoggedIn()) {
diff --git a/classes/CoreAdmin.class.php b/classes/CoreAdmin.class.php
index 00c3c6d..f72f8e5 100644
--- a/classes/CoreAdmin.class.php
+++ b/classes/CoreAdmin.class.php
@@ -21,7 +21,7 @@
 					Response::redirect('/');
 				}
 				
-				$this->template->display('admin');
+				$this->getTemplate()->display('admin');
 			});
 			
 			$this->getRouter()->addRoute('^/admin(?:/([a-zA-Z0-9\-_]+))(?:/([a-zA-Z0-9\-_]+))?$', function($destination = null, $tab = NULL) {
@@ -167,14 +167,27 @@
 					case 'modules':
 						$upgradeable		= [];
 						$list				= sprintf('%s%s%s%s%s', dirname(PATH), DS, 'temp', DS, 'update.list');
+						$module				= NULL;
+						$modules			= $this->getModules();
 						
 						if(file_exists($list)) {
 							$upgradeable	= json_decode(file_get_contents($list));
 						}
 						
+						if(isset($_GET['settings'])) {
+							if($modules->hasModule($_GET['settings'])) {
+								$module = $modules->getModule($_GET['settings']);
+								
+								if(isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' && method_exists($module->getInstance(), 'onSettings')) {
+									$module->getInstance()->onSettings($_POST);
+								}
+							}
+						}
+						
+						$data['module']			= $module;
 						$data['upgradeable']	= $upgradeable;
 						$data['repositorys']	= Database::fetch('SELECT * FROM `' . DATABASE_PREFIX . 'repositorys`');
-						$data['modules']		= $this->getModules();
+						$data['modules']		= $modules;
 					break;
 				}
 
diff --git a/classes/Module.class.php b/classes/Module.class.php
index 032835c..c8c8ea0 100644
--- a/classes/Module.class.php
+++ b/classes/Module.class.php
@@ -28,6 +28,49 @@
 			return $this->path;
 		}
 		
+		public function getSettings($name, $default = NULL) {
+			$result = Database::single('SELECT * FROM `' . DATABASE_PREFIX . 'modules_settings` WHERE `module`=:module AND `key`=:key LIMIT 1', [
+				'key'		=> $name,
+				'module'	=> $this->getDirectory()
+			]);
+			
+			if(!empty($result)) {
+				if(!empty($result->value)) {
+					return $result->value;
+				}
+			}
+			
+			return $default;
+		}
+		
+		public function setSettings($name, $value = NULL) {
+			if(Database::exists('SELECT `id` FROM `' . DATABASE_PREFIX . 'modules_settings` WHERE `module`=:module AND `key`=:key LIMIT 1', [
+				'module'	=> $this->getDirectory(),
+				'key'		=> $name
+			])) {
+				Database::update(DATABASE_PREFIX . 'modules_settings', [ 'module', 'key' ], [
+					'module'		=> $this->getDirectory(),
+					'key'			=> $name,
+					'value'			=> $value
+				]);
+			} else {
+				Database::insert(DATABASE_PREFIX . 'modules_settings', [
+					'id'			=> NULL,
+					'module'		=> $this->getDirectory(),
+					'key'			=> $name,
+					'value'			=> $value
+				]);
+			}
+		}
+		
+		public function hasSettingsPath() {
+			return file_exists($this->getSettingsPath());
+		}
+		
+		public function getSettingsPath() {
+			return sprintf('%s%sadmin.php', $this->path, DS);
+		}
+		
 		public function getDirectory() {
 			return basename($this->path);
 		}
@@ -55,7 +98,7 @@
 			foreach(array_diff($new, $old) AS $class) {
 				if(is_subclass_of($class, 'fruithost\\ModuleInterface', true)) {
 					$reflect			= new \ReflectionClass($class);
-					$instance			= $reflect->newInstanceArgs([ $core ]);
+					$instance			= $reflect->newInstanceArgs([ $core, $this ]);
 					$this->instance		= $instance;
 				}
 			}
@@ -66,7 +109,8 @@
 						'name'		=> $this->info->getName(),
 						'icon'		=> $this->info->getIcon(),
 						'order'		=> $this->info->getOrder(),
-						'url'		=> sprintf('/module/%s', basename($this->path)),
+						'target'	=> $core->getHooks()->applyFilter('TARGET_' . $this->info->getName(), NULL),
+						'url'		=> $core->getHooks()->applyFilter('URL_' . $this->info->getName(), sprintf('/module/%s', basename($this->path))),
 						'active'	=> $core->getRouter()->is(sprintf('/module/%s', basename($this->path)))
 					];
 					
diff --git a/classes/ModuleInterface.class.php b/classes/ModuleInterface.class.php
index bf881cf..b73ce5e 100644
--- a/classes/ModuleInterface.class.php
+++ b/classes/ModuleInterface.class.php
@@ -2,10 +2,12 @@
 	namespace fruithost;
 	
 	class ModuleInterface {
-		private $core = null;
+		private $core		= null;
+		private $instance	= null;
 		
-		public function __construct($core) {
-			$this->core = $core;
+		public function __construct($core, $instance) {
+			$this->core		= $core;
+			$this->instance	= $instance;
 			
 			$this->init();
 		}
@@ -34,6 +36,18 @@
 			return $this->core;
 		}
 		
+		public function getInstance() {
+			return $this->instance;
+		}
+		
+		public function setSettings($name, $value = NULL) {
+			$this->instance->setSettings($name, $value);
+		}
+		
+		public function getSettings($name, $default = NULL) {
+			return $this->instance->getSettings($name, $default);			
+		}
+		
 		public function addButton($button) {
 			$this->addFilter('buttons', function($buttons) use($button) {
 				$buttons[] = $button;
diff --git a/classes/Session.class.php b/classes/Session.class.php
index 4659550..5f63c2f 100644
--- a/classes/Session.class.php
+++ b/classes/Session.class.php
@@ -12,6 +12,10 @@
 				]);
 			}
 		}
+				
+		public static function getID() {
+			return session_id();
+		}
 		
 		public static function get($name) {
 			self::init();
diff --git a/classes/Template.class.php b/classes/Template.class.php
index 408a83f..c8612cc 100644
--- a/classes/Template.class.php
+++ b/classes/Template.class.php
@@ -47,6 +47,10 @@
 			return $this->core;
 		}
 		
+		public function getAssigns() {
+			return $this->assigns;
+		}
+		
 		public function getFiles() {
 			return $this->files;
 		}
@@ -55,14 +59,19 @@
 			$this->assigns[$name] = $value;
 		}
 		
-		public function display($file, $arguments = []) {
+		public function display($file, $arguments = [], $basedir = true) {
 			$template	= $this;
 			
 			foreach($arguments AS $name => $value) {
 				$this->assigns[$name] = $value;
 			}
 			
-			$path		= sprintf('%1$s%2$sthemes%2$s%4$s%2$s%3$s.php', dirname(PATH), DS, $file, $this->theme);
+			if($basedir) {
+				$path		= sprintf('%1$s%2$sthemes%2$s%4$s%2$s%3$s.php', dirname(PATH), DS, $file, $this->theme);
+			} else {
+				$path		= $file;
+			}
+			
 			$handler	= sprintf('%1$s%2$shandler%2$s%3$s.php', PATH, DS, $file);
 			
 			foreach($this->assigns AS $name => $value) {
diff --git a/default/admin/modules.php b/default/admin/modules.php
index 607d0f8..ce18029 100644
--- a/default/admin/modules.php
+++ b/default/admin/modules.php
@@ -13,6 +13,61 @@
 		$template->footer();
 		exit();
 	}
+	
+	if(isset($_GET['settings'])) {
+		?>
+		<form method="post" action="<?php print $this->url('/admin/modules' . (!empty($tab) ? '/' . $tab : '') . '?settings=' . $_GET['settings']); ?>">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">
+					<a href="<?php print $this->url('/admin/modules' . (!empty($tab) ? '/' . $tab : '') . '?settings=' . $_GET['settings']); ?>">
+						<?php print (empty($module) ? 'Module error' : sprintf('Settings for %s', $module->getInfo()->getName())); ?>
+					</a>
+				</h1>
+				<div class="btn-toolbar mb-2 mb-md-0">
+					<div class="btn-group mr-2">
+						<a name="action" value="cancel" class="btn btn-sm btn-outline-danger" href="<?php print $this->url('/admin/modules' . (!empty($tab) ? '/' . $tab : '')); ?>">Cancel</a>
+						<button type="submit" name="action" value="settings" class="btn btn-sm btn-outline-success">Save</button>
+					</div>
+				</div>
+			</div>
+			<?php
+				if(!$modules->hasModule($_GET['settings'])) {
+					?>
+						<div class="alert alert-danger mt-4" role="alert">
+							<strong>Module not found!</strong>
+							<p class="pb-0 mb-0">Unknown module name. Please select an valid Module!</p>
+						</div>
+					<?php
+				} else {
+					if(!$module->hasSettingsPath()) {
+						?>
+							<div class="alert alert-danger mt-4" role="alert">
+								<strong>No Settings available!</strong>
+								<p class="pb-0 mb-0">The Module <?php print $module->getInfo()->getName(); ?> has no settings!</p>
+							</div>
+						<?php
+					} else {
+						if(isset($error)) {
+							?>
+								<div class="container">
+									<div class="alert alert-danger mt-4" role="alert"><?php print $error; ?></div>
+								</div>
+							<?php
+						} else if(isset($success)) {
+							?>
+								<div class="container">
+									<div class="alert alert-success mt-4" role="alert"><?php print $success; ?></div>
+								</div>
+							<?php
+						}
+						
+						require_once($module->getSettingsPath());
+					}
+				}
+			?>
+		</form>
+		<?php
+	} else {
 	?>
 		<form method="post" action="<?php print $this->url('/admin/modules' . (!empty($tab) ? '/' . $tab : '')); ?>">
 			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
@@ -69,110 +124,18 @@
 					<?php
 						switch($tab) {
 							case 'repositorys':
-							
 								if(count($repositorys) === 0) {
-									?>
-										<div class="jumbotron text-center bg-transparent text-muted">
-											<i class="material-icons">sentiment_very_dissatisfied</i>
-											<h2>No Repositorys available!</h2>
-											<p class="lead">Please adding some Repositorys to keep updates.</p>
-											<button type="button" name="add_repository" data-toggle="modal" data-target="#add_repository" class="btn btn-lg btn-primary mt-4">Add Repository</button>
-										</div>
-									<?php
+									require_once(dirname(dirname(__DIR__)) . '/views/admin/repository_empty.php');
 								} else {
-									?>
-										<table class="table table-sm table-striped table-hover">
-											<tr>
-												<th colspan="2">Repository</th>
-												<th>Status</th>
-												<th>Actions</th>
-											</tr>
-											<?php
-												foreach($repositorys AS $repository) {
-													?>
-													<tr>
-														<td scope="row" width="1px"><input type="checkbox" name="repository[]" value="<?php print $repository->id; ?>" /></td>
-														<td>
-															<a href="<?php print $repository->url; ?>" target="_blank"><?php print $repository->url; ?></a>
-														</td>
-														<td>
-															<?php
-																if(empty($repository->time_updated)) {
-																	print '<span class="text-warning">Never updated</span>';
-																} else {
-																	print date(Auth::getSettings('TIME_FORMAT', NULL, 'd.m.Y - H:i'), strtotime($repository->time_updated));
-																}
-															?>
-														</td>
-														<td>
-															<button class="update btn btn-sm btn-info" type="submit" name="action" value="update" id="update_<?php print $repository->id; ?>" value="<?php print $repository->id; ?>">Update</button>
-															<button class="delete btn btn-sm btn-danger" type="submit" name="action" value="delete" id="delete_<?php print $repository->id; ?>" value="<?php print $repository->id; ?>">Delete</button>
-														</td>
-													</tr>
-													<?php
-												}
-											?>
-										</table>
-									<?php
+									require_once(dirname(dirname(__DIR__)) . '/views/admin/repository_list.php');
 								}
 							break;
 							default:
-								?>
-								<table class="table table-sm table-striped table-hover">
-									<tr>
-										<th colspan="2">Module</th>
-										<th>Description</th>
-										<th>Status</th>
-									</tr>
-									<?php
-										foreach($modules->getList() AS $module) {
-											$info = $module->getInfo();
-											?>
-											<tr>
-												<td scope="row" width="1px"><input type="checkbox" name="module[]" value="<?php print $info->getName(); ?>" /></td>
-												<td>
-													<strong><?php print $info->getName(); ?></strong>
-													<p><?php
-														$links = [];
-														
-														if($module->isEnabled()) {
-															$links['disable'] = '<a href="#" class="text-warning">Disable</a>';
-															$links['settings'] = '<a href="#">Settings</a>';
-														} else {
-															$links['enable'] = '<a href="#" class="text-success">Enable</a>';
-														}
-														
-														if(isset($upgradeable->{$module->getDirectory()})) {
-															$links['upgrade'] = '<a href="#" class="text-warning font-weight-bold">Upgrade</a>';
-														}
-														
-														$links['deinstall'] = '<a href="#" class="text-danger">Deinstall</a>';
-														
-														print implode(' | ', $links);
-													?></p>
-												</td>
-												<td>
-													<?php
-														if(isset($upgradeable->{$module->getDirectory()})) {
-															$upgrade = $upgradeable->{$module->getDirectory()};
-															?>
-																<div class="alert alert-warning d-flex p-2" role="alert">
-																	<i class="material-icons text-danger p-0">autorenew</i>
-																	<p class="p-0 m-0">The module <strong><?php print $info->getName(); ?></strong> has an new upgrade to <strong>Version <?php print $upgrade->version; ?></strong>!</p>
-																</div>
-															<?php
-														}
-													?>
-													<p><?php print $info->getDescription(); ?></p>
-													<small>Version <?php print $info->getVersion(); ?> | by <a href="<?php print $info->getAuthor()->getWebsite(); ?>" target="_blank"><?php print $info->getAuthor()->getName(); ?></a></small>
-												</td>
-												<td><?php print ($module->isEnabled() ? '<span class="text-success">Enabled</span>' : '<span class="text-danger">Disabled</span>');?></td>
-											</tr>
-											<?php
-										}
-									?>
-								</table>
-								<?php
+								if(count($modules->getList()) === 0) {
+									require_once(dirname(dirname(__DIR__)) . '/views/admin/modules_empty.php');
+								} else {
+									require_once(dirname(dirname(__DIR__)) . '/views/admin/modules_list.php');
+								}
 							break;
 						}
 					?>
@@ -193,5 +156,7 @@
 			}, 500);
 		</script>
 	<?php
+	}
+	
 	$template->footer();
 ?>
\ No newline at end of file
diff --git a/default/header.php b/default/header.php
index 5b12132..4561e39 100644
--- a/default/header.php
+++ b/default/header.php
@@ -1,4 +1,5 @@
 <?php
+	use fruithost\Router;
 	use fruithost\Auth;
 ?>
 <!DOCTYPE html>
@@ -66,7 +67,7 @@
 															foreach($category->getEntries() AS $entry) {
 																?>
 																	<ul class="nav flex-column mb-2">
-																		<li class="nav-item" style="order: <?php print $entry->order; ?>;"><a class="nav-link<?php print ($entry->active ? ' active' : ''); ?>" href="<?php print $template->url($entry->url); ?>"><?php print $entry->icon; ?> <?php print $entry->name; ?></a></li>
+																		<li class="nav-item" style="order: <?php print $entry->order; ?>;"><a class="nav-link<?php print ($entry->active ? ' active' : ''); ?>" href="<?php print (preg_match('/^(http|https):\/\//Uis', $entry->url) ? $entry->url : $template->url($entry->url)); ?>"<?php print (isset($entry->target) ? sprintf(' target="%s"', $entry->target) : ''); ?>><?php print $entry->icon; ?> <?php print $entry->name; ?></a></li>
 																	</ul>
 																<?php
 															}
@@ -79,7 +80,7 @@
 								</div>
 							</nav>
 							<?php
-								if(isset($module) && method_exists($module->getInstance(), 'frame') && !empty($module->getInstance()->frame())) {
+								if(isset($module) && method_exists($module->getInstance(), 'frame') && !empty($module->getInstance()->frame()) && !$template->getCore()->getRouter()->startsWith('/admin')) {
 									?>
 										<main role="main" class="frame col-md-9 ml-sm-auto col-lg-10 px-4">
 									<?php
diff --git a/views/admin/modules_empty.php b/views/admin/modules_empty.php
new file mode 100644
index 0000000..0517beb
--- /dev/null
+++ b/views/admin/modules_empty.php
@@ -0,0 +1,5 @@
+<div class="jumbotron text-center bg-transparent text-muted">
+	<i class="material-icons">sentiment_very_dissatisfied</i>
+	<h2>No Modules available!</h2>
+	<p class="lead">Please install some Modules.</p>
+</div>
\ No newline at end of file
diff --git a/views/admin/modules_list.php b/views/admin/modules_list.php
new file mode 100644
index 0000000..cde9e1f
--- /dev/null
+++ b/views/admin/modules_list.php
@@ -0,0 +1,57 @@
+<table class="table table-sm table-striped table-hover">
+	<tr>
+		<th colspan="2">Module</th>
+		<th>Description</th>
+		<th>Status</th>
+	</tr>
+	<?php
+		foreach($modules->getList() AS $module) {
+			$info = $module->getInfo();
+			?>
+			<tr>
+				<td scope="row" width="1px"><input type="checkbox" name="module[]" value="<?php print $info->getName(); ?>" /></td>
+				<td>
+					<strong><?php print $info->getName(); ?></strong>
+					<p><?php
+						$links = [];
+						
+						if($module->isEnabled()) {
+							$links['disable'] = '<a href="#" class="text-warning">Disable</a>';
+						} else {
+							$links['enable'] = '<a href="#" class="text-success">Enable</a>';
+						}
+						
+						if($module->hasSettingsPath()) {
+							$links['settings'] = sprintf('<a href="%s" class="text-primary">Settings</a>', $this->url('/admin/modules/?settings=' . $module->getDirectory()));
+						}
+						
+						if(isset($upgradeable->{$module->getDirectory()})) {
+							$links['upgrade'] = '<a href="#" class="text-warning font-weight-bold">Upgrade</a>';
+						}
+						
+						$links['deinstall'] = '<a href="#" class="text-danger">Deinstall</a>';
+						
+						print implode(' | ', $links);
+					?></p>
+				</td>
+				<td>
+					<?php
+						if(isset($upgradeable->{$module->getDirectory()})) {
+							$upgrade = $upgradeable->{$module->getDirectory()};
+							?>
+								<div class="alert alert-warning d-flex p-2" role="alert">
+									<i class="material-icons text-danger p-0">autorenew</i>
+									<p class="p-0 m-0">The module <strong><?php print $info->getName(); ?></strong> has an new upgrade to <strong>Version <?php print $upgrade->version; ?></strong>!</p>
+								</div>
+							<?php
+						}
+					?>
+					<p><?php print $info->getDescription(); ?></p>
+					<small>Version <?php print $info->getVersion(); ?> | by <a href="<?php print $info->getAuthor()->getWebsite(); ?>" target="_blank"><?php print $info->getAuthor()->getName(); ?></a></small>
+				</td>
+				<td><?php print ($module->isEnabled() ? '<span class="text-success">Enabled</span>' : '<span class="text-danger">Disabled</span>');?></td>
+			</tr>
+			<?php
+		}
+	?>
+</table>
\ No newline at end of file
diff --git a/views/admin/repository_empty.php b/views/admin/repository_empty.php
new file mode 100644
index 0000000..e26f0da
--- /dev/null
+++ b/views/admin/repository_empty.php
@@ -0,0 +1,6 @@
+<div class="jumbotron text-center bg-transparent text-muted">
+	<i class="material-icons">sentiment_very_dissatisfied</i>
+	<h2>No Repositorys available!</h2>
+	<p class="lead">Please adding some Repositorys to keep updates.</p>
+	<button type="button" name="add_repository" data-toggle="modal" data-target="#add_repository" class="btn btn-lg btn-primary mt-4">Add Repository</button>
+</div>
\ No newline at end of file
diff --git a/views/admin/repository_list.php b/views/admin/repository_list.php
new file mode 100644
index 0000000..d64da30
--- /dev/null
+++ b/views/admin/repository_list.php
@@ -0,0 +1,35 @@
+<?php
+	use fruithost\Auth;
+?>
+<table class="table table-sm table-striped table-hover">
+	<tr>
+		<th colspan="2">Repository</th>
+		<th>Status</th>
+		<th>Actions</th>
+	</tr>
+	<?php
+		foreach($repositorys AS $repository) {
+			?>
+			<tr>
+				<td scope="row" width="1px"><input type="checkbox" name="repository[]" value="<?php print $repository->id; ?>" /></td>
+				<td>
+					<a href="<?php print $repository->url; ?>" target="_blank"><?php print $repository->url; ?></a>
+				</td>
+				<td>
+					<?php
+						if(empty($repository->time_updated)) {
+							print '<span class="text-warning">Never updated</span>';
+						} else {
+							print date(Auth::getSettings('TIME_FORMAT', NULL, 'd.m.Y - H:i'), strtotime($repository->time_updated));
+						}
+					?>
+				</td>
+				<td>
+					<button class="update btn btn-sm btn-info" type="submit" name="action" value="update" id="update_<?php print $repository->id; ?>" value="<?php print $repository->id; ?>">Update</button>
+					<button class="delete btn btn-sm btn-danger" type="submit" name="action" value="delete" id="delete_<?php print $repository->id; ?>" value="<?php print $repository->id; ?>">Delete</button>
+				</td>
+			</tr>
+			<?php
+		}
+	?>
+</table>
\ No newline at end of file