diff --git a/modules/themefeidernd/default-disable b/modules/themefeidernd/default-disable
deleted file mode 100644
index fa0bd82e2df7bd79d57593d35bc53c1f9d3ef71f..0000000000000000000000000000000000000000
--- a/modules/themefeidernd/default-disable
+++ /dev/null
@@ -1,3 +0,0 @@
-This file indicates that the default state of this module
-is disabled. To enable, create a file named enable in the
-same directory as this file.
diff --git a/modules/themefeidernd/themes/feidernd/core/loginuserpass.php b/modules/themefeidernd/themes/feidernd/core/loginuserpass.php
deleted file mode 100644
index 77e5bdd4b6b3a4a31d4f19951a5c3dc8f8bf4b34..0000000000000000000000000000000000000000
--- a/modules/themefeidernd/themes/feidernd/core/loginuserpass.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
-<head>
-	<title><?php echo $this->t('{login:user_pass_header}'); ?></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-	<link rel='stylesheet' href="<?php echo SimpleSAML_Module::getModuleURL('themefeidernd/feidernd.css'); ?>" type='text/css' />
-	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login #login_error { margin-bottom: 10px; }</style><![endif]--><!-- Curse you, IE! -->
-
-	<script type="text/javascript">
-		function focusit() {
-			document.getElementById('username').focus();
-		}
-		window.onload = focusit;
-	</script>
-</head>
-<body class="login">
-
-<div id="login">
-
-	<form name="loginform" id="loginform" action="?" method="post">
-		
-			<img alt="logo" src="<?php echo SimpleSAML_Module::getModuleURL('themefeidernd/ssplogo-fish-only-s.png') ?>" style="float: right" />
-		
-		<p>
-			<label><?php echo $this->t('{login:username}'); ?><br />
-			<input type="text" name="username" id="username" class="input" <?php if (isset($this->data['username'])) {
-						echo 'value="' . htmlspecialchars($this->data['username']) . '"';
-					} ?> size="20" tabindex="10" /></label>
-		</p>
-		<p>
-			<label><?php echo $this->t('{login:password}'); ?><br />
-			<input type="password" name="password" id="user_pass" class="input" value="" size="20" tabindex="20" /></label>
-		</p>
-		<!-- p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> Remember me</label></p -->
-		<p class="submit">
-			<input type="submit" name="wp-submit" id="wp-submit" value="<?php echo $this->t('{login:login_button}'); ?> &raquo;" tabindex="100" />
-		</p>
-
-
-
-<?php
-if ($this->data['errorcode'] !== NULL) {
-?>
-	<div id="error">
-		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: right; margin: 15px " />
-		<h2><?php echo $this->t('{login:error_header}'); ?></h2>
-		<p style="clear: both"><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
-		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
-	</div>
-<?php
-}
-
-
-
-if(!empty($this->data['links'])) {
-	echo '<ul class="links" style="margin-top: 2em">';
-	foreach($this->data['links'] AS $l) {
-		echo '<li><a href="' . htmlspecialchars($l['href']) . '">' . htmlspecialchars($this->t($l['text'])) . '</a></li>';
-	}
-	echo '</ul>';
-}
-
-
-
-?>
-
-
-<!--
-	<?php if (isset($this->data['error'])) { ?>
-		<div id="error">
-		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
-		<h2><?php echo $this->t('{error:error_header}'); ?></h2>
-		
-		<p style="padding: .2em"><?php echo $this->t($this->data['error']); ?> </p>
-		</div>
-	<?php } ?>
-	
-	
-	
-<?php
-if ($this->data['errorcode'] !== NULL) {
-?>
-	<div id="error">
-		<img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-error.48x48.png" style="float: left; margin: 15px " />
-		<h2><?php echo $this->t('{login:error_header}'); ?>sdfsdf</h2>
-		<p><b><?php echo $this->t('{errors:title_' . $this->data['errorcode'] . '}'); ?></b></p>
-		<p><?php echo $this->t('{errors:descr_' . $this->data['errorcode'] . '}'); ?></p>
-	</div>
-<?php
-}
-?>
-		-->
-		
-<?php
-foreach ($this->data['stateparams'] as $name => $value) {
-	echo('<input type="hidden" name="' . htmlspecialchars($name) . '" value="' . htmlspecialchars($value) . '" />');
-}
-?>
-		
-	</form>
-	
-
-	
-
-	
-</div>
-
-
-<?php
-
-
-	$includeLanguageBar = TRUE;
-	if (!empty($_POST)) 
-		$includeLanguageBar = FALSE;
-	if (isset($this->data['hideLanguageBar']) && $this->data['hideLanguageBar'] === TRUE) 
-		$includeLanguageBar = FALSE;
-	
-	if ($includeLanguageBar) {
-		
-
-		echo '<div id="languagebar">';		
-		
-		// echo '<form action="' . SimpleSAML_Utilities::selfURL() . '" method="get">';
-		// echo '<select name="language">';
-		// echo '</select>';
-		// echo '</form>';
-		
-		
-
-		$languages = $this->getLanguageList();
-		$langnames = array(
-			'no' => 'BokmĂĄl',
-			'nn' => 'Nynorsk',
-			'se' => 'Sámegiella',
-			'sam' => 'Ă…arjelh-saemien giele',
-			'da' => 'Dansk',
-			'en' => 'English',
-			'de' => 'Deutsch',
-			'sv' => 'Svenska',
-			'fi' => 'Suomeksi',
-			'es' => 'Español',
-			'eu' => 'Euskara',
-			'fr' => 'Français',
-			'nl' => 'Nederlands',
-			'lb' => 'Luxembourgish', 
-			'cs' => 'Czech',
-			'sl' => 'Slovenščina', // Slovensk
-			'hr' => 'Hrvatski', // Croatian
-			'hu' => 'Magyar', // Hungarian
-			'pl' => 'Język polski', // Polish
-			'pt' => 'PortuguĂŞs', // Portuguese
-			'pt-br' => 'PortuguĂŞs brasileiro', // Portuguese
-			'tr' => 'Türkçe',
-		);
-		
-		$textarray = array();
-		foreach ($languages AS $lang => $current) {
-			if ($current) {
-				$textarray[] = $langnames[$lang];
-			} else {
-				$textarray[] = '<a href="' . htmlspecialchars(
-						SimpleSAML_Utilities::addURLparameter(
-							SimpleSAML_Utilities::selfURL(), array('language' => $lang)
-						)
-				) . '">' . $langnames[$lang] . '</a>';
-			}
-		}
-		echo join(' | ', $textarray);
-		echo '</div>';
-	}
-
-?>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/modules/themefeidernd/www/feidernd.css b/modules/themefeidernd/www/feidernd.css
deleted file mode 100644
index 562541bb2538406d6d1b94477c62820e66257701..0000000000000000000000000000000000000000
--- a/modules/themefeidernd/www/feidernd.css
+++ /dev/null
@@ -1,105 +0,0 @@
-body {
-	font-family: 'Lucida Grande', arial, sans-serif;
-	background: #eee;	
-}
-
-.error {
-	background: #FFEFF7;
-	border: 1px solid #c69;
-	margin: 1em 5% 10px;
-	padding: 0 1em 0 1em;
-}
-
-#login input.input { 
-	width: 200px;
-	font-size: large;
-
-}
-#login input {
-/*	opacity: 0.6;*/
-}
-#login h1 {
-	color: #777;
-}
-#login input#wp-submit {
-	font-size: large;
-	padding: 4px 10px;
-}
-#languagebar a {
-	color: #aaa;
-}
-#languagebar {
-
-	color: #eee;
-	font-size: 80%;
-	
-	margin: 0em auto 1em;
-	padding: 0px 40px;
-	
-	color: #000;
-	width: 425px;
-}
-div#error {
-	
-
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-	border-radius: 10px;
-	
-	border: 1px solid #999999;
-
-	background: #fff;
-	
-	margin: 10px auto 1em;
-	padding: 8px 20px;
-	
-	color: #000;
-}
-#login {
-	
-
-	-webkit-box-shadow:0px 3px 6px #333333;
-	-moz-box-shadow:0px 3px 6px #333333;	
-	box-shadow:0px 3px 6px #333333;
-	
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-	border-radius: 10px;
-	
-	border: 0px solid #999999;
-
-	background: #F2F2F2 -webkit-gradient(linear, 0% 70%, 0% 100%, from(#fefefe), to(#ddd), color-stop(.6,#f0f0f0));
-	background: #F2F2F2 -moz-linear-gradient(0% 100% 90deg,#dddddd, #f0f0f0, #FEFEFE 31%);
-
-	margin: 5em auto 1em;
-	padding: 20px 40px;
-	
-	color: #000;
-	width: 425px;
-}
-#login ul.links a {
-	text-decoration: none;
-	color: #666;
-}
-#login ul.links a:hover {
-	color: #111;
-}
-#login ul.links {
-/*	border: 1px solid #111;*/
-	font-family: 'Lucida Grande', arial, sans-serif;
-	padding: 0px;
-	font-size: 85%;
-	list-style-type:square;
-	list-style-position: inside;
-}
-#login ul.links li {
-	margin-top: .3em;
-}
-
-
-#login p label { 
-	font-size: medium;
-	color: #222;
-	font-weight: bold;
-}
-
diff --git a/modules/themefeidernd/www/ssplogo-fish-only-s.png b/modules/themefeidernd/www/ssplogo-fish-only-s.png
deleted file mode 100644
index 1f3d9dcb4b04c4eac5c5c2d3612532997a85c7fd..0000000000000000000000000000000000000000
Binary files a/modules/themefeidernd/www/ssplogo-fish-only-s.png and /dev/null differ