diff --git a/.gitmodules b/.gitmodules
index 4c26f58..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "themes/ikistrap"]
-	path = themes/ikistrap
-	url = https://github.com/gsliepen/ikistrap.git
diff --git a/ikiwiki.setup b/ikiwiki.setup
index fde8915..2dcb2f4 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -41,18 +41,19 @@ rcs: ''
 add_plugins:
 - goodstuff
 - favicon
-- sidebar
+- sidebar2
 - highlight
 - typography
-- ikistrap
+- html
 # plugins to disable
 disable_plugins: []
+- htmlscrubber
 # additional directory to search for template files
-templatedir: ./themes/ikistrap/templates
+templatedir: ./themes/ikiwiki-bootstrap-ilot/templates
 #templatedir: /usr/share/ikiwiki/templates
 # base wiki source location
 #underlaydir: /usr/share/ikiwiki/basewiki
-underlaydir: ./themes/ikistrap/basewiki
+underlaydir: ./themes/ikiwiki-bootstrap-ilot/basewiki
 # display verbose messages?
 verbose: 1
 # log to syslog?
@@ -90,7 +91,7 @@ hardlink: 0
 # group for wrappers to run in
 #wrappergroup: ikiwiki
 # extra library and plugin directories
-libdirs: []
+libdirs: [themes/ikiwiki-bootstrap-ilot/lib]
 # extra library and plugin directory (searched after libdirs)
 libdir: ''
 # environment variables
@@ -392,3 +393,14 @@ recentchangesnum: 100
 #tag_autocreate: 1
 # commit autocreated tag pages
 #tag_autocreate_commit: 1
+
+# sidebar2 plugin
+# https://ikiwiki.info/plugins/contrib/sidebar2/
+global_sidebars:
+  - sidebar
+  - sidebar
+  - "*"
+  - footer
+  - footer
+  - "*"
+
diff --git a/themes/ikistrap b/themes/ikistrap
deleted file mode 160000
index 16bcffa..0000000
--- a/themes/ikistrap
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 16bcffa6ed030c62d8a6d0c5b25db6f5ae45999c
diff --git a/themes/ikiwiki-bootstrap-ilot b/themes/ikiwiki-bootstrap-ilot
new file mode 160000
index 0000000..6402d61
--- /dev/null
+++ b/themes/ikiwiki-bootstrap-ilot
@@ -0,0 +1 @@
+Subproject commit 6402d610d79e2db1afe56c9d3f825a1023ba529d