diff --git a/ThinkPad-X1-Yoga/config.scm b/ThinkPad-X1-Yoga/config.scm
index 9349e13..a4cf5ce 100644
--- a/ThinkPad-X1-Yoga/config.scm
+++ b/ThinkPad-X1-Yoga/config.scm
@@ -1,7 +1,8 @@
 ;; This is an operating system configuration generated
 ;; by the graphical installer.
 
-(use-modules (gnu))
+(use-modules (gnu)
+             (gnu packages shells))
 (use-service-modules
   cups
   desktop
@@ -24,16 +25,10 @@
   (keyboard-layout (keyboard-layout "us"))
   (host-name "ThinkPad X1 Yoga")
   (users (cons* (user-account
-                  (name "root")
-                  (comment "")
-                  (group "users")
-                  (home-directory "/root")
-                  (supplementary-groups
-                    '("wheel" "netdev" "audio" "video")))
-                (user-account
                   (name "me")
                   (comment "Me")
                   (group "users")
+		  (shell (file-append fish "/bin/fish"))
                   (home-directory "/home/me")
                   (supplementary-groups
                     '("wheel" "netdev" "audio" "video")))
@@ -45,7 +40,8 @@
             (specification->package "xterm")
             (specification->package "vim")
             (specification->package "fish")
-	    (specification->package "icecat")
+	    (specification->package "openssh")
+	    (specification->package "firefox")
             (specification->package "nss-certs"))
       %base-packages))
   (services
@@ -54,7 +50,21 @@
             (set-xorg-configuration
               (xorg-configuration
                 (keyboard-layout keyboard-layout))))
-      %desktop-services))
+      (modify-services %desktop-services
+             (guix-service-type config => (guix-configuration
+               (inherit config)
+               (substitute-urls
+                (append (list "https://substitutes.nonguix.org")
+                  %default-substitute-urls))
+               (authorized-keys
+                (append (list (plain-file "non-guix.pub"
+					  "(public-key 
+                                             (ecc 
+                                               (curve Ed25519)
+                                               (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
+                                             )
+                                           )"))
+                  %default-authorized-guix-keys)))))))
   (bootloader
     (bootloader-configuration
       (bootloader grub-efi-bootloader)