diff --git a/extensions/ter_layout/Configuration/TypoScript/Ext/Solr.ts b/extensions/ter_layout/Configuration/TypoScript/Ext/Solr.ts
index 2dd0c8a3e9b961bb6f88e1db1c3a7d7daca04da2..5c3bcb040588859372b1462a99ff225df8085573 100644
--- a/extensions/ter_layout/Configuration/TypoScript/Ext/Solr.ts
+++ b/extensions/ter_layout/Configuration/TypoScript/Ext/Solr.ts
@@ -1,13 +1,5 @@
 plugin.tx_solr {
-  templateFiles {
-    search = EXT:ter_layout/Resources/Private/Ext/Solr/Search.html
-    results = EXT:ter_layout/Resources/Private/Ext/Solr/Results.html
-    pagebrowser = EXT:ter_layout/Resources/Private/Ext/Solr/Pagebrowser.html
-  }
   view {
-    templateFiles {
-      results = EXT:ter_layout/Resources/Private/Templates/Solr/Results.html
-    }
     layoutRootPaths {
       0 = EXT:solr/Resources/Private/Layouts
     }
@@ -17,9 +9,11 @@ plugin.tx_solr {
     }
     templateRootPaths {
       0 = EXT:solr/Resources/Private/Templates
+      100 = EXT:ter_layout/Resources/Private/Templates/Solr/
     }
   }
-	cssFiles.results =
+  cssFiles.results =
+  settings.maximumNumberOfLinks = 6
 }
 
 plugin.tx_solr.search {
diff --git a/extensions/ter_layout/Resources/Private/Templates/Solr/Results.html b/extensions/ter_layout/Resources/Private/Templates/Solr/Search/Results.html
similarity index 95%
rename from extensions/ter_layout/Resources/Private/Templates/Solr/Results.html
rename to extensions/ter_layout/Resources/Private/Templates/Solr/Search/Results.html
index f39e8309a860f7c24e768328629dc17756e516e7..31c435b470c5a27e01714186d8ee5885430e893b 100644
--- a/extensions/ter_layout/Resources/Private/Templates/Solr/Results.html
+++ b/extensions/ter_layout/Resources/Private/Templates/Solr/Search/Results.html
@@ -42,7 +42,7 @@
                             </f:if>
 
                             <f:if condition="{hasSearched}">
-                                <s:widget.resultPaginate resultSet="{resultSet}" configuration="{maximumNumberOfLinks: 6, templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}">
+                                <s:widget.resultPaginate resultSet="{resultSet}" configuration="{maximumNumberOfLinks: settings.maximumNumberOfLinks, templatePath:'EXT:ter_layout/Resources/Private/Templates/Solr/ViewHelpers/Widget/ResultPaginate/Index.html'}">
                                     <f:variable name="exactMatchFound" value="0" />
                                     <f:if condition="{resultSet.usedQuery.queryString -> f:format.case(mode:'lower')} == {documents.0.extensionKey_stringS}">
                                         <f:render partial="Result/Document" section="DocumentWrap" arguments="{resultSet:resultSet, document:documents.0, exactMatchFound: 1}" />