diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile
index f497014..d3613ca 100644
--- a/homepage/redesign2018/markdownExperiment/Makefile
+++ b/homepage/redesign2018/markdownExperiment/Makefile
@@ -30,7 +30,7 @@ build/%.php: md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTempl
 	mkdir -p build
 	pandoc \
 		--standalone \
-		--css=css/cwsvJudo.css \
+		--css=/ressourcen/css/cwsvJudo.css \
 		--template=pandocTemplate/cwsvJudo.html5.pandocTemplate \
 		--output=$@ \
 	$< $(word 2,$^)
@@ -52,7 +52,7 @@ build/.uploadMarker/%.php: build/%.php
 	curl \
 		--upload-file $^ \
 		--user cwsvjudo:***REMOVED*** \
-		ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%.php,%.php,$^) \
+		ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%.php,%.php,$^) \
 		--ftp-create-dirs
 	touch $@
 
@@ -67,7 +67,7 @@ build/.uploadMarker/phpLib/%.php: phpLib/%.php
 	curl \
 		--upload-file $^ \
 		--user cwsvjudo:***REMOVED*** \
-		ftp://cwsvjudo.bplaced.net/ressourcen/$(patsubst build/%.php,%.php,$^) \
+		ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%.php,%.php,$^) \
 		--ftp-create-dirs
 	touch $@
 
@@ -81,7 +81,12 @@ build/.uploadMarker/css/%.css: build/css/%.css
 	curl \
 		--upload-file $^ \
 		--user cwsvjudo:***REMOVED*** \
-		ftp://cwsvjudo.bplaced.net/pages/responsive/$(patsubst build/%,%,$^) \
+		ftp://cwsvjudo.bplaced.net/www/pages/responsive/$(patsubst build/%,%,$^) \
+		--ftp-create-dirs
+	curl \
+		--upload-file $^ \
+		--user cwsvjudo:***REMOVED*** \
+		ftp://cwsvjudo.bplaced.net/www/ressourcen/$(patsubst build/%,%,$^) \
 		--ftp-create-dirs
 	touch $@
 
@@ -95,7 +100,7 @@ build/.uploadMarker/config/%: config/%
 	curl \
 		--upload-file $^ \
 		--user cwsvjudo:***REMOVED*** \
-		ftp://cwsvjudo.bplaced.net/$(patsubst build/%,%,$^) \
+		ftp://cwsvjudo.bplaced.net/www/$(patsubst build/%,%,$^) \
 		--ftp-create-dirs
 	touch $@
 
diff --git a/homepage/redesign2018/markdownExperiment/md/index.md b/homepage/redesign2018/markdownExperiment/md/index.md
index 1687e28..b1db8cd 100644
--- a/homepage/redesign2018/markdownExperiment/md/index.md
+++ b/homepage/redesign2018/markdownExperiment/md/index.md
@@ -20,7 +20,7 @@ zum Beispiel das [Programm für die Gürtelprüfungen][cwsvJudoWikiKyu].
 <?php $options['limit']=6; echoNewsTableHtml( $options );?>
 
 [cwsvHomepage]: http://www.cwsv-sport.de "Homepage des Chemnitzer Freizeit- und Wohngebietssportvereines"
-[cwsvJudoTraining]: http://cwsvjudo.bplaced.net/training "Trainingszeiten der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines
+[cwsvJudoTraining]: http://cwsvjudo.bplaced.net/trainingszeiten "Trainingszeiten der Judoka des Chemnitzer Freizeit- und Wohngebietssportvereines"
 [cwsvJudoWettkampfKalender]: http://cwsvjudo.bplaced.net/wkKalender "Wettkampfkalender der Judoka des CWSV"
 [cwsvJudoWiki]: http://cwsvjudo.bplaced.net/JudoWiki "Ein kleines Wiki über Judo"
 [cwsvJudoWikiKyu]: http://cwsvjudo.bplaced.net/JudoWiki/Kyu/Kyu "Kyuprüfungsprogramme im Judo"
diff --git a/homepage/redesign2018/markdownExperiment/md/kontakt.md b/homepage/redesign2018/markdownExperiment/md/kontakt.md
index 7ccb495..b5996ff 100644
--- a/homepage/redesign2018/markdownExperiment/md/kontakt.md
+++ b/homepage/redesign2018/markdownExperiment/md/kontakt.md
@@ -5,9 +5,6 @@ keywords:
 	- Judo
 	- Chemnitz
 	- Chemnitzer Freizeit- und Wohngebietssportverein
-subNav:
-	- {caption: "Trainings&#173;zeiten", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/clockIconFriendly.svg", title: "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", url: "http://cwsvjudo.bplaced.net/training"}
-	- {caption: "Termine", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/calendarIcon.svg", url: "http://cwsvjudo.bplaced.net/wettkampfkalender"}
 ...
 # Kontakt
 
diff --git a/homepage/redesign2018/markdownExperiment/md/trainingszeiten.md b/homepage/redesign2018/markdownExperiment/md/trainingszeiten.md
index e59ebf3..0303e35 100644
--- a/homepage/redesign2018/markdownExperiment/md/trainingszeiten.md
+++ b/homepage/redesign2018/markdownExperiment/md/trainingszeiten.md
@@ -5,15 +5,6 @@ keywords:
 	- Judo
 	- Training
 	- Termine
-subNav:
-	- {caption: "Termine", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/calendarIcon.svg", url: "http://cwsvjudo.bplaced.net/wettkampfkalender"}
-	- {url: "cwsvjudo.bplaced.net/pages/desktop/verein.php", title: "Informationen über den Chemnitzer Freizeit- und Wohngeietssportverein e.&nbsp;V.", caption: "Vereinsinfos"}
-	- {caption: "Trainings&#173;zeiten", icon: "http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/clockIconFriendly.svg", title: "Trainingszeiten und -orte der Judoka des Chemnitzer WSV", url: "http://cwsvjudo.bplaced.net/training"}
-	- {title: "Wettkampfkalender der Abteilung Judo des Chemnitzer WSV", url: "cwsvjudo.bplaced.net/pages/desktop/verein.wettkampfkalender.php", caption: "Wett&shy;kampf&shy;ka&shy;len&shy;der"}
-	- {title: "Wettkampfplaner der Abteilung Judo des Chemnitzer WSV", url: "cwsvjudo.bplaced.net/pages/desktop/wkParticipo", caption: "Wett&shy;kampf&shy;pla&shy;ner"}
-	- {title: "Galerien mit Bildern der Wettkämpfe und Veranstaltungen der Abteilung Judo des Chemnitzer WSV", url: "cwsvjudo.bplaced.net/pages/desktop/verein.galerien.php", caption: "Galerien"}
-	- {url: "cwsvjudo.bplaced.net/pages/desktop/verein.feiern.php", title: "Fetengalerien der Judoka des CWSV", caption: "Feiern"}
-	- {url: "cwsvjudo.bplaced.net/pages/desktop/verein.zelten.php", title: "Zeltengalerien der Judoka des CWSV", caption: "Zelten"}
 ...
 
 # Judotraining im CWSV
diff --git a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
index cefb581..e1f5db7 100644
--- a/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
+++ b/homepage/redesign2018/markdownExperiment/pandocTemplate/cwsvJudo.html5.pandocTemplate
@@ -1,5 +1,3 @@
-<!DOCTYPE html>
-<!---
 <?php
 /// Einbinden der Konfiguration, insbesondere Basisvariablen, 
 /// relative Pfadangabe
@@ -15,12 +13,14 @@
 	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/wkKalender.php");
 	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/galTable.php");
 	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/newsTableHtml.php");
-	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/newsTableHtml.php");
+	require_once($$basePath."/ressourcen/phpLib/cwsvJudo/galleryRedirector.php");
 	require_once($$basePath."/ressourcen/phpLib/phpcount/phpcount.php");
 	
+	galleryRedirector();
+	
 	PHPCount::AddHit("$title$");
 ?>
--->
+<!DOCTYPE html>
 <html$if(lang)$ lang="$lang$"$endif$$if(dir)$ dir="$dir$"$endif$>
 	<head>
 		<meta charset="utf-8" />
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
index 1a121d9..bcf45dd 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/newsLib.php
@@ -20,7 +20,7 @@ function get_inner_html( $node ) {
 function getNews($aMysqlConn, $optionsArray = array("dbCharset" => "ISO-8859-1", "outCharset" => "UTF-8", "limit" => "1")){
 if(!$aMysqlConn) return NULL;
 
-if( empty($optionsArray['dbCharset']) ) $optionsArray['dbCharset'] = "ISO-8859-1";
+if( empty($optionsArray['dbCharset'])  ) $optionsArray['dbCharset'] = "ISO-8859-1";
 if( empty($optionsArray['outCharset']) ) $optionsArray['outCharset'] = "UTF-8";
 
 if( !is_positive_integer($optionsArray['limit']) ) $optionsArray['limit'] = "1";
@@ -35,11 +35,23 @@ $ret = array();
 	}
 // Ansonsten die aktuellsten
 	else{
+		$query = "SELECT * FROM nachrichten";
+		
+		if( is_positive_integer($optionsArray['jahr']) )
+			$query .= " WHERE DATE_FORMAT( datum, '%Y') = :jahr";
+		
+		$query .= " ORDER BY datum DESC, nr DESC LIMIT :limit;";
+		
+		//echo( $query );
+		
 		$pdoStatementForQuerryingNews = $aMysqlConn->prepare(
-			"SELECT * FROM nachrichten ORDER BY datum DESC, nr DESC LIMIT :limit;"
+			$query
+			//"SELECT * FROM nachrichten ORDER BY datum DESC, nr DESC LIMIT :limit;"
 		);
 	}
+	
 	$pdoStatementForQuerryingNews->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT);
+//	$pdoStatementForQuerryingNews->bindParam(':jahr', intval($optionsArray['jahr']), PDO::PARAM_INT);
 	$pdoStatementForQuerryingNews->execute();
 	$ret = $pdoStatementForQuerryingNews->fetchAll(PDO::FETCH_ASSOC);
 	
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index 256e446..93d9b1a 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -75,30 +75,21 @@ $ret = array();
 	if( is_positive_integer($optionsArray['wkId']) ){
 		// datenbank.tabelle könnte noch vaiabel gestaltet werden
 		$pdoStatementForQuerryingGalById = $aMysqlConn->prepare(
-			"SELECT * FROM cwsvjudo.wkGalerien WHERE wkGalerien.datum <= (SELECT wkGalerien.datum FROM wkGalerien WHERE wkGalerien.wkId = :wkId ) ORDER BY wkGalerien.datum DESC LIMIT :limit OFFSET 0;"
+			"SELECT * FROM cwsvjudo.wkGalerien WHERE wkGalerien.wkId = :wkId;"
 		);
-		$pdoStatementForQuerryingGalById->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT);
 		$pdoStatementForQuerryingGalById->bindParam(':wkId', intval($optionsArray['wkId']), PDO::PARAM_INT);
 		$pdoStatementForQuerryingGalById->execute();
 		$ret = $pdoStatementForQuerryingGalById->fetchAll(PDO::FETCH_ASSOC);
-	}
-	else{
-		$pdoStatementForQuerryingGalById = $aMysqlConn->prepare(
-			"SELECT * FROM wkGalerien ORDER BY datum DESC, id DESC LIMIT :limit;"
-		);
-		$pdoStatementForQuerryingGalById->bindParam(':limit', intval($optionsArray['limit']), PDO::PARAM_INT);
-		$pdoStatementForQuerryingGalById->execute();
-		$ret = $pdoStatementForQuerryingGalById->fetchAll(PDO::FETCH_ASSOC);
-	}
 // Zeichensatzkonvertierung
-	foreach($ret as &$entry){
-		array_walk(
-			$entry,
-			function (&$value, $key, $optionsArray) {
-				$value = iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $value);
-			},
-			$optionsArray
-		);
+		foreach($ret as &$entry){
+			array_walk(
+				$entry,
+				function (&$value, $key, $optionsArray) {
+					$value = iconv($optionsArray['dbCharset'], $optionsArray['outCharset'], $value);
+				},
+				$optionsArray
+			);
+		}
 	}
 
 return $ret;
diff --git a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml
index 8abba11..b25a2bf 100644
--- a/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml
+++ b/homepage/redesign2018/markdownExperiment/yaml/index.subNav.yaml
@@ -1,7 +1,5 @@
 ---
 subNav:
-	- *home
-	- *verein
 	- *training
 	- *wkKalender
 	- *galerien
diff --git a/homepage/redesign2018/markdownExperiment/yaml/trainingszeiten.subNav.yaml b/homepage/redesign2018/markdownExperiment/yaml/trainingszeiten.subNav.yaml
index 2ffbb84..612c7ba 100644
--- a/homepage/redesign2018/markdownExperiment/yaml/trainingszeiten.subNav.yaml
+++ b/homepage/redesign2018/markdownExperiment/yaml/trainingszeiten.subNav.yaml
@@ -3,7 +3,4 @@ subNav:
 	- *wkKalender
 	- *verein
 	- *galerien
-	- {title: "Wettkampfplaner der Abteilung Judo des Chemnitzer WSV", url: "cwsvjudo.bplaced.net/pages/desktop/wkParticipo", caption: "Wett&shy;kampf&shy;pla&shy;ner"}
-	- {url: "cwsvjudo.bplaced.net/pages/desktop/verein.feiern.php", title: "Fetengalerien der Judoka des CWSV", caption: "Feiern"}
-	- {url: "cwsvjudo.bplaced.net/pages/desktop/verein.zelten.php", title: "Zeltengalerien der Judoka des CWSV", caption: "Zelten"}
 ...