diff --git a/full/src/main/resources/kustvakt.conf b/full/src/main/resources/kustvakt.conf
index 3c63dcd..8f465e3 100644
--- a/full/src/main/resources/kustvakt.conf
+++ b/full/src/main/resources/kustvakt.conf
@@ -6,25 +6,21 @@
 krill.index.commit.auto = 500
 krill.index.relations.max = 100
 
-kustvakt.default.pos = tt
-kustvakt.default.lemma = tt
-kustvakt.default.token = opennlp
-kustvakt.default.dep = mate
-kustvakt.default.const = mate
+# default layers
+default.layer.p = tt
+default.layer.l = tt
+default.layer.o = opennlp
+default.layer.d = mate
+default.layer.c = corenlp
+
+# availability regex
+availability.regex.free = CC-BY.*
+availability.regex.public = ACA.*
+availability.regex.all = QAO.*
 
 kustvakt.management.registration=enable
 
-kustvakt.regex.free = CC-BY.*
-kustvakt.regex.public = ACA.*
-kustvakt.regex.all = QAO.*
-
-# server
-server.port=8089
-server.host=localhost
-
-# user configuration
-# user.config = user.conf
-
+#LDAP
 ldap.config = file-path-to-ldap-config
 
 ## options referring to the security module!
diff --git a/full/src/main/resources/log4j.properties b/full/src/main/resources/log4j.properties
index 7f9c1ca..b975c78 100644
--- a/full/src/main/resources/log4j.properties
+++ b/full/src/main/resources/log4j.properties
@@ -6,7 +6,7 @@
 
 #log4j.logger.de.ids_mannheim.korap.service.VirtualCorpusService = error, debugLog
 #log4j.logger.de.ids_mannheim.korap.web.controller.AuthenticationController = debug, debugLog, stdout
-log4j.logger.de.ids_mannheim.korap.resource.rewrite.CollectionRewrite= stdout, debugLog
+#log4j.logger.de.ids_mannheim.korap.resource.rewrite.CollectionRewrite= stdout, debugLog
 
 # Direct log messages to stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/full/src/test/resources/kustvakt-test.conf b/full/src/test/resources/kustvakt-test.conf
index 847788e..c87ecba 100644
--- a/full/src/test/resources/kustvakt-test.conf
+++ b/full/src/test/resources/kustvakt-test.conf
@@ -6,25 +6,25 @@
 krill.index.commit.auto = 500
 krill.index.relations.max = 100
 
-kustvakt.default.pos = tt
-kustvakt.default.lemma = tt
-kustvakt.default.token = opennlp
-kustvakt.default.dep = mate
-kustvakt.default.const = mate
+# default layers
+default.layer.p = tt
+default.layer.l = tt
+default.layer.o = opennlp
+default.layer.d = mate
+default.layer.c = corenlp
 
-kustvakt.management.registration=enable
-
-kustvakt.regex.free = CC-BY.*
-kustvakt.regex.public = ACA.*
-kustvakt.regex.all = QAO.*
+# availability regex
+availability.regex.free = CC-BY.*
+availability.regex.public = ACA.*
+availability.regex.all = QAO.*
 
 # port&host added 06.02.17/FB
 server.port=8089
 server.host=localhost
 
-# user configuration
-# user.config = user.conf
+kustvakt.management.registration=enable
 
+#LDAP
 ldap.config = /home/elma/.config/ldap.conf
 
 ## options referring to the security module!