diff --git a/.gitmodules b/.gitmodules
index 03a7fa7..61f20a1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,9 +13,6 @@
 [submodule "eink/flash"]
 	path = eink/flash
 	url = git@git.blackmark.me:avr/flash.git
-[submodule "eink/spi"]
-	path = eink/spi
-	url = git@git.blackmark.me:avr/spi.git
 [submodule "eink/avr-libstdcpp"]
 	path = eink/avr-libstdcpp
 	url = git@github.com:modm-io/avr-libstdcpp.git
diff --git a/eink/eink b/eink/eink
index 83a064d..113931f 160000
--- a/eink/eink
+++ b/eink/eink
@@ -1 +1 @@
-Subproject commit 83a064ddc1156b4d66ff8551b7c639b6432f9dd8
+Subproject commit 113931f8ba3395a9094ce8d7d23c4272458cfffb
diff --git a/eink/eink.cppproj b/eink/eink.cppproj
index 8b52696..22d0ccc 100644
--- a/eink/eink.cppproj
+++ b/eink/eink.cppproj
@@ -218,6 +218,9 @@
     <Compile Include="clock.hpp">
       <SubType>compile</SubType>
     </Compile>
+    <Compile Include="eink\eink_spi.hpp">
+      <SubType>compile</SubType>
+    </Compile>
     <Compile Include="eink\eink.hpp">
       <SubType>compile</SubType>
     </Compile>
@@ -230,18 +233,6 @@
     <Compile Include="main.cpp">
       <SubType>compile</SubType>
     </Compile>
-    <Compile Include="spi\config.hpp">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="spi\hardware.hpp">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="spi\software.hpp">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="spi\spi.hpp">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="uart\config.hpp">
       <SubType>compile</SubType>
     </Compile>
@@ -268,7 +259,6 @@
     <Folder Include="flash" />
     <Folder Include="io" />
     <Folder Include="eink" />
-    <Folder Include="spi" />
     <Folder Include="util" />
     <Folder Include="uart" />
   </ItemGroup>
diff --git a/eink/main.cpp b/eink/main.cpp
index 2a87ea7..fb99ea6 100644
--- a/eink/main.cpp
+++ b/eink/main.cpp
@@ -9,7 +9,6 @@
 #include "eink/eink.hpp"
 #include "flash/flash.hpp"
 #include "io/io.hpp"
-#include "spi/spi.hpp"
 #include "uart/uart.hpp"
 
 using uart_t = uart::Uart0<>;
@@ -300,7 +299,7 @@ constexpr auto RLE_IMAGE [[gnu::progmem]] = std::tuple{
 
 int main()
 {
-	using spi_t = spi::Software<spi::SoftwareConfig<io::P::C4, io::P::NONE, io::P::C5, io::P::C3>>;
+	using spi_t = eink::Spi<io::P::C4, io::P::C5, io::P::C3, io::P::C2>;
 
 	uart_t serial;
 	serial.init();
@@ -309,7 +308,7 @@ int main()
 
 	serial << F("e-Paper demo") << F("\r\n");
 
-	auto einkDisplay = eink::Eink<200, 200, spi_t, io::P::C1, io::P::C2, io::P::C0>{};
+	auto einkDisplay = eink::Eink<200, 200, spi_t, io::P::C1, io::P::C0>{};
 	einkDisplay.init();
 
 	serial << F("e-Paper init") << F("\r\n");
@@ -317,6 +316,9 @@ int main()
 	serial << F("e-Paper clear") << F("\r\n");
 	einkDisplay.clear();
 
+	serial << F("e-Paper autofill") << F("\r\n");
+	einkDisplay.autoPatternFill();
+
 	serial << F("e-Paper draw") << F("\r\n");
 	einkDisplay.draw(RLE_IMAGE);
 
diff --git a/eink/spi b/eink/spi
deleted file mode 160000
index 8bf3d1a..0000000
--- a/eink/spi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8bf3d1a87411d0fdade0941ff51832cd6dd0a425