diff --git a/README.md b/README.md
index 1031a21..6cc7880 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,16 @@ For example to include the `alpha` patch then you would only need to flip this s
 
 So if you have ever been curious about trying out dwm, but have been discouraged by manual patching, then this may be a good starting point to see what a "fully fledged" dwm can look like. Want to try out the `pertag` patch? Just flip a config and recompile. 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://dwm.suckless.org/](https://dwm.suckless.org/) for details on the dwm window manager, how to install it and how it works.
 
 ---
 
 ### Changelog:
 
+2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer)
+
 2019-10-11 - Added the patch to ignore Xft errors when drawing text in the status bar
 
 2019-10-10 - Added mdpcontrol, scratchpad and spawn_cwd cpatches
diff --git a/patch/include.c b/patch/include.c
index 7d99f76..d3da45a 100644
--- a/patch/include.c
+++ b/patch/include.c
@@ -1,227 +1,171 @@
 /* Patches */
-
 #if ALPHA_PATCH
 #include "alpha.c"
 #endif
-
 #if ALTERNATIVE_TAGS_PATCH
 #include "alternativetags.c"
 #endif
-
 #if ATTACHABOVE_PATCH || ATTACHASIDE_PATCH || ATTACHBELOW_PATCH || ATTACHBOTTOM_PATCH
 #include "attachx.c"
 #endif
-
 #if AUTOSTART_PATCH
 #include "autostart.c"
 #endif
-
 #if AWESOMEBAR_PATCH
 #include "awesomebar.c"
 #endif
-
 #if CFACTS_PATCH
 #include "cfacts.c"
 #endif
-
 #if CMDCUSTOMIZE
 #include "cmdcustomize.c"
 #endif
-
 #if COMBO_PATCH
 #include "combo.c"
 #endif
-
 #if CYCLELAYOUTS_PATCH
 #include "cyclelayouts.c"
 #endif
-
 #if DWMC_PATCH
 #include "dwmc.c"
 #endif
-
 #if EWMHTAGS_PATCH
 #include "ewmhtags.c"
 #endif
-
 #if FOCUSADJACENTTAG_PATCH
 #include "focusadjacenttag.c"
 #endif
-
 #if FOCUSURGENT_PATCH
 #include "focusurgent.c"
 #endif
-
 #if FULLSCREEN_PATCH
 #include "fullscreen.c"
 #endif
-
 #if HOLDBAR_PATCH
 #include "holdbar.c"
 #endif
-
 #if KILLUNSEL_PATCH
 #include "killunsel.c"
 #endif
-
 #if MAXIMIZE_PATCH
 #include "maximize.c"
 #endif
-
 #if MDPCONTROL_PATCH
 #include "mdpcontrol.c"
 #endif
-
 #if MOVESTACK_PATCH
 #include "movestack.c"
 #endif
-
 #if PERTAG_PATCH
 #include "pertag.c"
 #endif
-
 #if PUSH_NO_MASTER_PATCH
 #include "push_no_master.c"
 #elif PUSH_PATCH
 #include "push.c"
 #endif
-
 #if RESTARTSIG_PATCH
 #include "restartsig.c"
 #endif
-
 #if ROTATESTACK_PATCH
 #include "rotatestack.c"
 #endif
-
 #if SCRATCHPAD_PATCH
 #include "scratchpad.c"
 #endif
-
 #if SELFRESTART_PATCH
 #include "selfrestart.c"
 #endif
-
 #if SETBORDERPX_PATCH
 #include "setborderpx.c"
 #endif
-
-#ifdef XINERAMA
 #if SORTSCREENS_PATCH
+#ifdef XINERAMA
 #include "sortscreens.c"
+#endif // XINERAMA
 #endif
-#endif
-
 #if STICKY_PATCH
 #include "sticky.c"
 #endif
-
 #if SYSTRAY_PATCH
 #include "systray.c"
 #endif
-
 #if SWITCHCOL_PATCH
 #include "switchcol.c"
 #endif
-
 #if TAGALL_PATCH
 #include "tagall.c"
 #endif
-
 #if TAGALLMON_PATCH
 #include "tagallmon.c"
 #endif
-
 #if TAGGRID_PATCH
 #include "taggrid.c"
 #endif
-
 #if TAGSWAPMON_PATCH
 #include "tagswapmon.c"
 #endif
-
 #if TOGGLEFULLSCREEN_PATCH
 #include "togglefullscreen.c"
 #endif
-
 #if UNFLOATVISIBLE_PATCH
 #include "unfloatvisible.c"
 #endif
-
 #if VANITYGAPS_PATCH
 #include "vanitygaps.c"
 #endif
-
 #if WARP_PATCH
 #include "warp.c"
 #endif
-
 #if WINVIEW_PATCH
 #include "winview.c"
 #endif
-
 #if ZOOMSWAP_PATCH
 #include "zoomswap.c"
 #endif
-
 #if XRDB_PATCH
 #include "xrdb.c"
 #endif
-
 /* Layouts */
-
 #if BSTACK_LAYOUT
 #include "bstack.c"
 #endif
-
 #if BSTACKHORIZ_LAYOUT
 #include "bstackhoriz.c"
 #endif
-
 #if CENTEREDMASTER_LAYOUT
 #include "centeredmaster.c"
 #endif
-
 #if CENTEREDFLOATINGMASTER_LAYOUT
 #include "centeredfloatingmaster.c"
 #endif
-
 #if COLUMNS_LAYOUT
 #include "columns.c"
 #endif
-
 #if DECK_LAYOUT
 #include "deck.c"
 #endif
-
 #if FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT
 #include "fibonacci.c"
 #endif
-
 #if FLEXTILE_DELUXE_LAYOUT
 #include "flextile-deluxe.c"
 #endif
-
 #if GAPPLESSGRID_LAYOUT
 #include "gapplessgrid.c"
 #endif
-
 #if GRIDMODE_LAYOUT
 #include "grid.c"
 #endif
-
 #if HORIZGRID_LAYOUT
 #include "horizgrid.c"
 #endif
-
 #if MONOCLE_LAYOUT
 #include "monocle.c"
 #endif
-
 #if NROWGRID_LAYOUT
 #include "nrowgrid.c"
 #endif
-
 #if TILE_LAYOUT
 #include "tile.c"
 #endif
\ No newline at end of file
diff --git a/patch/include.h b/patch/include.h
index c2586b4..1524949 100644
--- a/patch/include.h
+++ b/patch/include.h
@@ -1,227 +1,171 @@
 /* Patches */
-
 #if ALPHA_PATCH
 #include "alpha.h"
 #endif
-
 #if ALTERNATIVE_TAGS_PATCH
 #include "alternativetags.h"
 #endif
-
 #if ATTACHABOVE_PATCH || ATTACHASIDE_PATCH || ATTACHBELOW_PATCH || ATTACHBOTTOM_PATCH
 #include "attachx.h"
 #endif
-
 #if AUTOSTART_PATCH
 #include "autostart.h"
 #endif
-
 #if AWESOMEBAR_PATCH
 #include "awesomebar.h"
 #endif
-
 #if CFACTS_PATCH
 #include "cfacts.h"
 #endif
-
 #if CMDCUSTOMIZE
 #include "cmdcustomize.h"
 #endif
-
 #if COMBO_PATCH
 #include "combo.h"
 #endif
-
 #if CYCLELAYOUTS_PATCH
 #include "cyclelayouts.h"
 #endif
-
 #if DWMC_PATCH
 #include "dwmc.h"
 #endif
-
 #if EWMHTAGS_PATCH
 #include "ewmhtags.h"
 #endif
-
 #if FOCUSADJACENTTAG_PATCH
 #include "focusadjacenttag.h"
 #endif
-
 #if FOCUSURGENT_PATCH
 #include "focusurgent.h"
 #endif
-
 #if FULLSCREEN_PATCH
 #include "fullscreen.h"
 #endif
-
 #if HOLDBAR_PATCH
 #include "holdbar.h"
 #endif
-
 #if KILLUNSEL_PATCH
 #include "killunsel.h"
 #endif
-
 #if MAXIMIZE_PATCH
 #include "maximize.h"
 #endif
-
 #if MDPCONTROL_PATCH
 #include "mdpcontrol.h"
 #endif
-
 #if MOVESTACK_PATCH
 #include "movestack.h"
 #endif
-
 #if PERTAG_PATCH
 #include "pertag.h"
 #endif
-
 #if PUSH_NO_MASTER_PATCH
 #include "push_no_master.h"
 #elif PUSH_PATCH
 #include "push.h"
 #endif
-
 #if RESTARTSIG_PATCH
 #include "restartsig.h"
 #endif
-
 #if ROTATESTACK_PATCH
 #include "rotatestack.h"
 #endif
-
 #if SCRATCHPAD_PATCH
 #include "scratchpad.h"
 #endif
-
 #if SELFRESTART_PATCH
 #include "selfrestart.h"
 #endif
-
 #if SETBORDERPX_PATCH
 #include "setborderpx.h"
 #endif
-
-#ifdef XINERAMA
 #if SORTSCREENS_PATCH
+#ifdef XINERAMA
 #include "sortscreens.h"
+#endif // XINERAMA
 #endif
-#endif
-
 #if STICKY_PATCH
 #include "sticky.h"
 #endif
-
 #if SYSTRAY_PATCH
 #include "systray.h"
 #endif
-
 #if SWITCHCOL_PATCH
 #include "switchcol.h"
 #endif
-
 #if TAGALL_PATCH
 #include "tagall.h"
 #endif
-
 #if TAGALLMON_PATCH
 #include "tagallmon.h"
 #endif
-
 #if TAGGRID_PATCH
 #include "taggrid.h"
 #endif
-
 #if TAGSWAPMON_PATCH
 #include "tagswapmon.h"
 #endif
-
 #if TOGGLEFULLSCREEN_PATCH
 #include "togglefullscreen.h"
 #endif
-
 #if UNFLOATVISIBLE_PATCH
 #include "unfloatvisible.h"
 #endif
-
 #if VANITYGAPS_PATCH
 #include "vanitygaps.h"
 #endif
-
 #if WARP_PATCH
 #include "warp.h"
 #endif
-
 #if WINVIEW_PATCH
 #include "winview.h"
 #endif
-
 #if ZOOMSWAP_PATCH
 #include "zoomswap.h"
 #endif
-
 #if XRDB_PATCH
 #include "xrdb.h"
 #endif
-
 /* Layouts */
-
 #if BSTACK_LAYOUT
 #include "bstack.h"
 #endif
-
 #if BSTACKHORIZ_LAYOUT
 #include "bstackhoriz.h"
 #endif
-
 #if CENTEREDMASTER_LAYOUT
 #include "centeredmaster.h"
 #endif
-
 #if CENTEREDFLOATINGMASTER_LAYOUT
 #include "centeredfloatingmaster.h"
 #endif
-
 #if COLUMNS_LAYOUT
 #include "columns.h"
 #endif
-
 #if DECK_LAYOUT
 #include "deck.h"
 #endif
-
 #if FIBONACCI_DWINDLE_LAYOUT || FIBONACCI_SPIRAL_LAYOUT
 #include "fibonacci.h"
 #endif
-
 #if FLEXTILE_DELUXE_LAYOUT
 #include "flextile-deluxe.h"
 #endif
-
 #if GAPPLESSGRID_LAYOUT
 #include "gapplessgrid.h"
 #endif
-
 #if GRIDMODE_LAYOUT
 #include "grid.h"
 #endif
-
 #if HORIZGRID_LAYOUT
 #include "horizgrid.h"
 #endif
-
 #if MONOCLE_LAYOUT
 #include "monocle.h"
 #endif
-
 #if NROWGRID_LAYOUT
 #include "nrowgrid.h"
 #endif
-
 #if TILE_LAYOUT
 #include "tile.h"
 #endif
\ No newline at end of file