diff --git a/fcore.mlb b/fcore.mlb
new file mode 100644
index 0000000..13ce9f7
--- /dev/null
+++ b/fcore.mlb
@@ -0,0 +1,62 @@
+$(SML_LIB)/basis/basis.mlb
+
+(* LIBRARIES (purely functional) *)
+lib/brolib-sml/src/line_gap.sml
+lib/brolib-sml/src/gap_set.sml
+lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
+
+(* FUNCTIONAL CORE *)
+fcore/bin-search.sml
+
+ann
+  "allowVectorExps true"
+in
+  fcore/persistent-vector.sml
+end
+fcore/search-list/dfa-gen.sml
+fcore/search-list/search-list.sml
+
+message-types/input-msg.sml
+message-types/draw-msg.sml
+message-types/mailbox-type.sml
+
+fcore/app-type.sml
+fcore/normal-mode/normal-mode-with.sml
+fcore/normal-mode/normal-search-mode-with.sml
+fcore/app-with.sml
+
+fcore/text-constants.sml
+ann
+  "allowVectorExps true"
+in
+  fcore/cursor-dfa/make-dfa-loop.sml
+  fcore/cursor-dfa/vi-word-dfa.sml
+  fcore/cursor-dfa/vi-caps-word-dfa.sml
+  fcore/cursor-dfa/vi-dlr-dfa.sml
+  fcore/cursor-dfa/vi-l-dfa.sml
+  fcore/cursor-dfa/vi-h-dfa.sml
+  fcore/rect.sml
+  fcore/pipe-cursor.sml
+end
+fcore/text-builder/text-builder-utils.sml
+fcore/text-builder/text-builder-with-cursor.sml
+fcore/text-builder/text-builder-with-highlight.sml
+fcore/text-builder/normal-mode-text-builder.sml
+fcore/text-builder/search-bar.sml
+
+fcore/cursor.sml
+fcore/text-scroll.sml
+
+fcore/normal-mode/normal-finish.sml
+fcore/normal-mode/normal-search-finish.sml
+fcore/move.sml
+
+fcore/normal-mode/normal-move.sml
+fcore/normal-mode/normal-yank.sml
+fcore/normal-mode/make-normal-delete.sml
+fcore/normal-mode/normal-delete.sml
+fcore/normal-mode/normal-yank-delete.sml
+fcore/normal-mode/normal-mode.sml
+fcore/normal-mode/normal-search-mode.sml
+
+fcore/app-update.sml
diff --git a/shf-rgfw b/shf-rgfw
index 19dce60..83eeb01 100755
Binary files a/shf-rgfw and b/shf-rgfw differ
diff --git a/shf-rgfw.mlb b/shf-rgfw.mlb
index 8891cb6..5412487 100644
--- a/shf-rgfw.mlb
+++ b/shf-rgfw.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* IMPERATIVE SHELL *)
 $(SML_LIB)/basis/mlton.mlb
diff --git a/shf-tests.mlb b/shf-tests.mlb
index d346a04..29a6c6e 100644
--- a/shf-tests.mlb
+++ b/shf-tests.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* TEST FILES *)
 $(SML_LIB)/basis/mlton.mlb
diff --git a/shf.mlb b/shf.mlb
index 047ba05..52b500a 100644
--- a/shf.mlb
+++ b/shf.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* IMPERATIVE SHELL *)
 $(SML_LIB)/basis/mlton.mlb