diff --git a/clog.asd b/clog.asd
index 1cf335d..a04f2dc 100644
--- a/clog.asd
+++ b/clog.asd
@@ -42,4 +42,5 @@
   :depends-on (#:clog)
   :pathname "tools/"
   :components ((:file "clog-db-admin")
+	       (:file "clog-builder-settings")
 	       (:file "clog-builder")))
diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp
new file mode 100644
index 0000000..a439d16
--- /dev/null
+++ b/tools/clog-builder-settings.lisp
@@ -0,0 +1,70 @@
+(in-package :clog-tools)
+
+(defparameter supported-controls
+  (list
+   '(:name          "select"
+     :description   "Selection Tool"
+     :create         nil
+     :create-type    nil
+     :properties     nil
+     :positioning    nil
+     :events         nil)
+   '(:name           "label"
+     :description    "Text Label"
+     :clog-type      clog:clog-label
+     :create         clog:create-label
+     :create-type    :element
+     :create-content "label"
+     :properties     ((:name "text"
+		       :prop clog:text)
+		      (:name "positioning"
+		       :prop clog:positioning)
+		      (:name "color"
+		       :prop clog:color)
+		      (:name "background-color"
+		       :prop clog:background-color)))
+   '(:name            "button"
+     :description     "Button"
+     :clog-type       clog:clog-form-element
+     :create          clog:create-form-element
+     :create-type     :form
+     :create-param    :button
+     :create-value    "button"
+     :properties      ((:name "value"
+			:prop clog:value)
+		       (:name "positioning"
+			:prop clog:positioning)
+		       (:name "color"
+			:prop clog:color)
+		       (:name "background-color"
+			:prop clog:background-color)))
+   '(:name            "input"
+     :description     "Text Input"
+     :clog-type       clog:clog-form-element
+     :create          clog:create-form-element
+     :create-type     :form
+     :create-param    :input
+     :create-value    ""
+     :properties      ((:name "value"
+			:prop clog:value)
+		       (:name "positioning"
+			:prop clog:positioning)
+		       (:name "color"
+			:prop clog:color)
+		       (:name "background-color"
+			:prop clog:background-color)))
+   '(:name            "div"
+     :description     "DIV Control"
+     :clog-type       clog:clog-div
+     :create          clog:create-div
+     :create-type     :element
+     :create-content  ""
+     :properties      ((:name "text"
+			:prop clog:text)
+		       (:name "positioning"
+			:prop clog:positioning)
+		       (:name "color"
+			:prop clog:color)
+		       (:name "background-color"
+			:prop clog:background-color)))))
+
diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index 158c027..d2d4365 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -1,73 +1,5 @@
 (in-package :clog-tools)
 
-(defparameter supported-controls
-  (list
-   '(:name          "select"
-     :description   "Selection Tool"
-     :create         nil
-     :create-type    nil
-     :properties     nil
-     :positioning    nil
-     :events         nil)
-   '(:name           "label"
-     :description    "Text Label"
-     :clog-type      clog:clog-label
-     :create         clog:create-label
-     :create-type    :element
-     :create-content "label"
-     :properties     ((:name "text"
-		       :prop clog:text)
-		      (:name "positioning"
-		       :prop clog:positioning)
-		      (:name "color"
-		       :prop clog:color)
-		      (:name "background-color"
-		       :prop clog:background-color)))
-   '(:name            "button"
-     :description     "Button"
-     :clog-type       clog:clog-form-element
-     :create          clog:create-form-element
-     :create-type     :form
-     :create-param    :button
-     :create-value    "button"
-     :properties      ((:name "value"
-			:prop clog:value)
-		       (:name "positioning"
-			:prop clog:positioning)
-		       (:name "color"
-			:prop clog:color)
-		       (:name "background-color"
-			:prop clog:background-color)))
-   '(:name            "input"
-     :description     "Text Input"
-     :clog-type       clog:clog-form-element
-     :create          clog:create-form-element
-     :create-type     :form
-     :create-param    :input
-     :create-value    ""
-     :properties      ((:name "value"
-			:prop clog:value)
-		       (:name "positioning"
-			:prop clog:positioning)
-		       (:name "color"
-			:prop clog:color)
-		       (:name "background-color"
-			:prop clog:background-color)))
-   '(:name            "div"
-     :description     "DIV Control"
-     :clog-type       clog:clog-div
-     :create          clog:create-div
-     :create-type     :element
-     :create-content  ""
-     :properties      ((:name "text"
-			:prop clog:text)
-		       (:name "positioning"
-			:prop clog:positioning)
-		       (:name "color"
-			:prop clog:color)
-		       (:name "background-color"
-			:prop clog:background-color)))))
-
 (defclass builder-app-data ()
   ((copy-buf
     :accessor copy-buf