diff --git a/README.md b/README.md
index b5e5fef..d7ba6f8 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,18 @@ For example to include the `alpha` patch then you would only need to flip this s
 #define ALPHA_PATCH 1
 ```
 
+Once you have found out what works for you and what doesn't then you should be in a better position to choose patches should you want to start patching from scratch.
+
+Alternatively if you have found the patches you want, but don't want the rest of the flexipatch entanglement on your plate then you may want to have a look at [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer); a custom pre-processor tool that removes all the unused flexipatch code leaving you with a build that contains the patches you selected.
+
 Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the st terminal, how to install it and how it works.
 
 ---
 
 ### Changelog:
 
+2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer)
+
 2019-09-17 - Added relativeborder, fix-keyboard-input, iso14755, visualbell, right-click-to-plumb, boxdraw and keyboard-select patches
 
 2019-09-16 - Added alpha, anysize, bold-is-not-bright, clipboard, copyurl, disable-fonts, externalpipe, fixime, hidecursor, newterm, open-copied-url, vertcenter, scrollback, spoiler, themed cursor and xresources patches
diff --git a/patch/fixime_st.h b/patch/fixime_st.h
new file mode 100644
index 0000000..42038f1
--- /dev/null
+++ b/patch/fixime_st.h
@@ -0,0 +1 @@
+void xximspot(int, int);
\ No newline at end of file
diff --git a/patch/fixime.h b/patch/fixime_x.h
similarity index 100%
rename from patch/fixime.h
rename to patch/fixime_x.h
diff --git a/patch/keyboardselect.h b/patch/keyboardselect.h
deleted file mode 100644
index fa2b490..0000000
--- a/patch/keyboardselect.h
+++ /dev/null
@@ -1,3 +0,0 @@
-void toggle_winmode(int);
-void keyboard_select(const Arg *);
-int trt_kbdselect(KeySym, char *, int);
\ No newline at end of file
diff --git a/patch/keyboardselect.c b/patch/keyboardselect_st.c
similarity index 100%
rename from patch/keyboardselect.c
rename to patch/keyboardselect_st.c
diff --git a/patch/keyboardselect_st.h b/patch/keyboardselect_st.h
new file mode 100644
index 0000000..3fa1ad7
--- /dev/null
+++ b/patch/keyboardselect_st.h
@@ -0,0 +1,2 @@
+void toggle_winmode(int);
+int trt_kbdselect(KeySym, char *, int);
\ No newline at end of file
diff --git a/patch/keyboardselect_x.c b/patch/keyboardselect_x.c
new file mode 100644
index 0000000..16af3e1
--- /dev/null
+++ b/patch/keyboardselect_x.c
@@ -0,0 +1,7 @@
+void toggle_winmode(int flag) {
+        win.mode ^= flag;
+}
+
+void keyboard_select(const Arg *dummy) {
+    win.mode ^= trt_kbdselect(-1, NULL, 0);
+}
\ No newline at end of file
diff --git a/patch/keyboardselect_x.h b/patch/keyboardselect_x.h
new file mode 100644
index 0000000..6b1241a
--- /dev/null
+++ b/patch/keyboardselect_x.h
@@ -0,0 +1,2 @@
+void toggle_winmode(int);
+void keyboard_select(const Arg *);
\ No newline at end of file
diff --git a/patch/st_include.c b/patch/st_include.c
index 736b566..99e831c 100644
--- a/patch/st_include.c
+++ b/patch/st_include.c
@@ -1,29 +1,22 @@
 /* Patches */
-
 #if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
 #include "copyurl.c"
 #endif
-
 #if EXTERNALPIPE_PATCH
 #include "externalpipe.c"
 #endif
-
 #if ISO14755_PATCH
 #include "iso14755.c"
 #endif
-
 #if KEYBOARDSELECT_PATCH
-#include "keyboardselect.c"
+#include "keyboardselect_st.c"
 #endif
-
 #if RIGHTCLICKTOPLUMB_PATCH
 #include "rightclicktoplumb_st.c"
 #endif
-
 #if NEWTERM_PATCH
 #include "newterm.c"
 #endif
-
 #if SCROLLBACK_PATCH || SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
 #include "scrollback.c"
 #endif
\ No newline at end of file
diff --git a/patch/st_include.h b/patch/st_include.h
index 8c6a342..b6df8ac 100644
--- a/patch/st_include.h
+++ b/patch/st_include.h
@@ -1,33 +1,25 @@
 /* Patches */
-
 #if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
 #include "copyurl.h"
 #endif
-
 #if EXTERNALPIPE_PATCH
 #include "externalpipe.h"
 #endif
-
 #if FIXIME_PATCH
-void xximspot(int, int);
+#include "fixime_st.h"
 #endif
-
 #if ISO14755_PATCH
 #include "iso14755.h"
 #endif
-
 #if KEYBOARDSELECT_PATCH
-#include "keyboardselect.h"
+#include "keyboardselect_st.h"
 #endif
-
 #if RIGHTCLICKTOPLUMB_PATCH
 #include "rightclicktoplumb_st.h"
 #endif
-
 #if NEWTERM_PATCH
 #include "newterm.h"
 #endif
-
 #if SCROLLBACK_PATCH || SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
 #include "scrollback.h"
 #endif
\ No newline at end of file
diff --git a/patch/x_include.c b/patch/x_include.c
index 05e6f66..ac6383f 100644
--- a/patch/x_include.c
+++ b/patch/x_include.c
@@ -1,39 +1,25 @@
 /* Patches */
-
 #if BOXDRAW_PATCH
 #include "boxdraw.c"
 #endif
-
 #if OPENCOPIED_PATCH
 #include "opencopied.c"
 #endif
-
 #if FIXIME_PATCH
 #include "fixime.c"
 #endif
-
 #if FIXKEYBOARDINPUT_PATCH
 #include "fixkeyboardinput.c"
 #endif
-
 #if KEYBOARDSELECT_PATCH
-void toggle_winmode(int flag) {
-        win.mode ^= flag;
-}
-
-void keyboard_select(const Arg *dummy) {
-    win.mode ^= trt_kbdselect(-1, NULL, 0);
-}
-#endif // KEYBOARDSELECT_PATCH
-
+#include "keyboardselect_x.c"
+#endif
 #if RIGHTCLICKTOPLUMB_PATCH
 #include "rightclicktoplumb_x.c"
 #endif
-
 #if VISUALBELL_2_PATCH || VISUALBELL_3_PATCH
 #include "visualbell.c"
 #endif
-
 #if XRESOURCES_PATCH
 #include "xresources.c"
 #endif
\ No newline at end of file
diff --git a/patch/x_include.h b/patch/x_include.h
index a085995..560f4f3 100644
--- a/patch/x_include.h
+++ b/patch/x_include.h
@@ -1,25 +1,22 @@
 /* Patches */
-
 #if BOXDRAW_PATCH
 #include "boxdraw.h"
 #endif
-
 #if OPENCOPIED_PATCH
 #include "opencopied.h"
 #endif
-
 #if FIXIME_PATCH
-#include "fixime.h"
+#include "fixime_x.h"
+#endif
+#if KEYBOARDSELECT_PATCH
+#include "keyboardselect_x.h"
 #endif
-
 #if RIGHTCLICKTOPLUMB_PATCH
 #include "rightclicktoplumb_x.h"
 #endif
-
 #if VISUALBELL_2_PATCH || VISUALBELL_3_PATCH
 #include "visualbell.h"
 #endif
-
 #if XRESOURCES_PATCH
 #include "xresources.h"
 #endif
\ No newline at end of file