diff --git a/ritherdon-archive.asd b/ritherdon-archive.asd
index 0a5e482..f10bd69 100644
--- a/ritherdon-archive.asd
+++ b/ritherdon-archive.asd
@@ -1,23 +1,23 @@
-(defsystem "ritherdon-archive"
+(defsystem #:ritherdon-archive
   :version "0.1.0"
   :author "Craig Oates"
   :license "MIT"
-  :depends-on ("clack"
-               "lack"
-               "caveman2"
-               "envy"
-               "cl-ppcre"
-               "uiop"
+  :depends-on (#:clack
+               #:lack
+               #:caveman2
+               #:envy
+               #:cl-ppcre
+               #:uiop
 
                ;; for @route annotation
-               "cl-syntax-annot"
+               #:cl-syntax-annot
 
                ;; HTML Template
-               "djula"
+               #:djula
 
                ;; for DB
-               "datafly"
-               "sxql"
+               #:datafly
+               #:sxql
 
 	       ;;; Additional Packages (after initial Caveman set-up)
 	       #:woo            ; Alternative server to Hunchentoot
@@ -50,7 +50,7 @@
 	       (:file "config")
 	       (:file "main")	       
 	       (:file "db")
-	        
+	       
 	       ;; Ritherdon Archive Specific Files
 	       (:file "app-constants")
 	       (:file "models/user")
@@ -69,17 +69,20 @@
                ;; Caveman Files
 	       (:file "view")
 	       (:file "web"))
-	       :description "The Nicola Ellis & Ritherdon Archive."
-	       :in-order-to ((test-op (test-op "ritherdon-archive/tests"))))
+  :description "The Nicola Ellis & Ritherdon Archive."
+  :build-operation "program-op"
+  :build-pathname "clinera"
+  :entry-point "ritherdon-archive:main"
+  :in-order-to ((test-op (test-op "ritherdon-archive/tests"))))
 
 
-  (defsystem #:ritherdon-archive/tests
-    :author "Craig Oates"
-    :license "MIT"
-    :depends-on (#:ritherdon-archive
-		 #:parachute)
-    :components ((:module "tests"
-		  :components
-		  ((:file "tests"))))
-    :description "Test system for ritherdon-archive."
-    :perform (test-op (op s) (symbol-call :parachute :test :tests)))
+(defsystem #:ritherdon-archive/tests
+  :author "Craig Oates"
+  :license "MIT"
+  :depends-on (#:ritherdon-archive
+	       #:parachute)
+  :components ((:module "tests"
+		:components
+		((:file "tests"))))
+  :description "Test system for ritherdon-archive."
+  :perform (test-op (op c) (symbol-call :parachute :test :tests)))