diff --git a/notes2web.py b/notes2web.py
index b3a582e..dde8f18 100755
--- a/notes2web.py
+++ b/notes2web.py
@@ -343,9 +343,9 @@ def main(args):
         for entry in indexentries:
             html += (
                     '<li class="article">'
-                        f'<a href="{entry["path"]}">'
+                        f'<a href="{entry["path"]}"><p>'
                             f'{entry["title"]}{"/" if entry["isdirectory"] else ""}'
-                        '</a>'
+                        '</p></a>'
                     '</li>'
             )
         html += INDEX_TEMPLATE_FOOT
diff --git a/styles.css b/styles.css
index d8b4b63..c2856b3 100644
--- a/styles.css
+++ b/styles.css
@@ -1,4 +1,6 @@
 @import url("https://styles.alv.cx/base.css");
+@import url("https://styles.alv.cx/modules/search.css");
+@import url("https://styles.alv.cx/modules/buttonlist.css");
 
 html {
   scroll-behavior: smooth;
@@ -18,29 +20,6 @@ body {
 	margin: 1em;
 }
 
-#searchWrapper > input {
-	padding: 1em;
-	margin: 1em 0.5em 1em 0.5em;
-	font-size: 1em;
-	min-width: 0;
-}
-
-#searchWrapper {
-	display: flex
-}
-
-#search { flex-grow: 9; }
-
-#sidebar #search {
-	flex-grow: 0;
-	padding: 1em;
-	margin: 0 1em 1em 1em;
-}
-
-#results {
-	overflow-x: scroll;
-}
-
 .smallText {
 	font-size: 0.7em;
 }
@@ -76,16 +55,6 @@ body {
 	padding-right: 1em;
 }
 
-#toc {
-	overflow-y: scroll;
-	overflow-x: visible;
-	max-width: 100%;
-}
-
-li {
-	margin: 0;
-}
-
 #content {
 	margin: 0 auto;
 	width: 60em;
@@ -94,6 +63,12 @@ li {
 
 #commitlog, #license { padding: 0; }
 
+#toc {
+	overflow-y: scroll;
+	overflow-x: visible;
+	max-width: 100%;
+}
+
 #sidebar,
 #toc li > a { 
 	color: #656565;
@@ -103,6 +78,7 @@ li {
 #toc ul, ul#articlelist { margin-left: 0.75em ; padding-left: 0.75em; }
 #toc ul, ul#articlelist { border-left: 1px solid #b3b3b3;}
 #toc > ul { padding; none; padding: 0; margin: 0; border: none;max-width: 100%;}
+li { padding: 0 !important; }
 
 #toc li > a,
 ul#articlelist > a{
diff --git a/templates/indexhead.html b/templates/indexhead.html
index 2641f22..e968a9c 100644
--- a/templates/indexhead.html
+++ b/templates/indexhead.html
@@ -10,5 +10,5 @@
 	<div id="content">
 	<h1>$title$</h1>
 	$extra_content$
-	<ul id="articlelist">
+	<ul class="buttonlist">
 	<li class="article"><a href="..">../</a></li>
diff --git a/templates/listitem.html b/templates/listitem.html
deleted file mode 100644
index c744b58..0000000
--- a/templates/listitem.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<li>
-	<a href="$filepath$"> $if(title)$
-$title$
-$else$
-no title ($filepath$)
-$endif$</a>
-</li>