diff --git a/src/packages.scm b/src/packages.scm
index 8de5e1b..1cb6e26 100644
--- a/src/packages.scm
+++ b/src/packages.scm
@@ -8,6 +8,7 @@
 	  create-options free-options
 	  get-option-value get-option set-option! get-options
 	  ((define-options-spec) :syntax) options-spec-union
+	  get-options-diff
 
 	  string->keys string->key key:keycode key:modifiers
 
@@ -27,7 +28,8 @@
 	  point-in-rectangle?
 
 	  maximize-window maximal-size/hints
-	  size-window desired-size/hints desired-position/hints)
+	  size-window desired-size/hints desired-position/hints
+	  install-colormaps uninstall-colormaps)
   (open scheme i/o list-lib define-record-types finite-types enum-sets
 	threads locks placeholders rendezvous
 	signals handle
@@ -84,7 +86,8 @@
 	  client? client:window client:client-window
 	  client:data set-client:data!
 	  client-name find-window-by-name get-all-window-names
-	  client-replace-window)
+	  client-replace-window
+	  client-of-window)
   (open scheme threads list-lib locks
 	xlib
 	define-record-types
@@ -134,10 +137,24 @@
   (export ((run) :syntax))
   (open scsh))
 
+(define-structure config
+  (export backup-layout
+	  restore-layout
+	  load-configuration)
+  (open scheme list-lib
+	scsh xlib
+	utils manager root-manager)
+  (files config))
+
 (define-structure root-manager
-  (export root-wm? create-root-wm)
+  (export root-wm? create-root-wm
+	  wait-for-root-wm
+	  root-wm:dpy root-wm:initial-manager root-wm:options
+	  get-manager-by-window
+	  create-new-manager
+	  root-wm-manage-window)
   (open scheme list-lib scsh-things
-	define-record-types
+	define-record-types threads
 	xlib
 	rendezvous rendezvous-channels
 	utils key-grab
@@ -150,6 +167,6 @@
   (export start)
   (open scsh scheme threads
 	xlib
-	root-manager
+	manager root-manager config
 	utils)
   (files main))