diff --git a/.editorconfig b/.editorconfig
index 439ba6b..9de26e0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,3 +13,6 @@ indent_size = 2
 [*.{yml,yaml}]
 indent_style = space
 indent_size = 2
+
+[*.scm]
+indent_style = space
\ No newline at end of file
diff --git a/README.md b/README.md
index dcfe162..8377927 100644
--- a/README.md
+++ b/README.md
@@ -22,20 +22,6 @@ Commits with breaking qml api changes will contain a `!` at the end of the scope
 
 # Installation
 
-## Guix
-This repo works as a channel. Add the following to your channel list:
-
-```scheme
-(channel
-  (name 'outfoxxed-quickshell)
-  (url "https://git.outfoxxed.me/outfoxxed/quickshell")
-  (branch "master"))
-```
-
-You can also clone the repository and use `guix shell -f outfoxxed-quickshell.scm` to try out the package.
-
-Quickshell will be packaged upstream after the first versioned release.
-
 ## Nix
 This repo has a nix flake you can use to install the package directly:
 
@@ -92,6 +78,20 @@ It is not managed by us and should be looked over before use.
 
 [Fedora COPR package]: https://copr.fedorainfracloud.org/coprs/errornointernet/quickshell
 
+## Guix
+This repo works as a channel. Add the following to your channel list:
+
+```scheme
+(channel
+  (name quickshell)
+  (url "https://git.outfoxxed.me/outfoxxed/quickshell")
+  (branch "master"))
+```
+
+Then, you can install the package via `guix install quickshell-git` or by adding `quickshell-git` to your system or home definition.
+
+You can also clone the repository and use `guix shell -f quickshell.scm` to try out the package.
+
 ## Anything else
 See [BUILD.md](BUILD.md) for instructions on building and packaging quickshell.
 
diff --git a/outfoxxed-quickshell.scm b/quickshell.scm
similarity index 76%
rename from outfoxxed-quickshell.scm
rename to quickshell.scm
index 73681a3..612754b 100644
--- a/outfoxxed-quickshell.scm
+++ b/quickshell.scm
@@ -1,4 +1,4 @@
-(define-module (outfoxxed-quickshell)
+(define-module (quickshell)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages freedesktop)
@@ -25,17 +25,17 @@
     (name "quickshell")
     (version "git")
     (source (local-file "." "quickshell-checkout"
-			#:recursive? #t
-			#:select? (or (git-predicate (current-source-directory))
-				      (const #t))))
+                        #:recursive? #t
+                        #:select? (or (git-predicate (current-source-directory))
+                                      (const #t))))
     (build-system cmake-build-system)
     (propagated-inputs (list qtbase qtdeclarative qtsvg))
     (native-inputs (list ninja
+                         gcc-14
                          pkg-config
                          qtshadertools
                          spirv-tools
-			 wayland-protocols
-                         gcc-14))
+                         wayland-protocols))
     (inputs (list cli11
                   jemalloc
                   libdrm
@@ -44,24 +44,26 @@
                   linux-pam
                   mesa
                   pipewire
+                  qtbase
                   qtdeclarative
                   qtwayland
                   vulkan-headers
-                  wayland
-                  qtbase))
+                  wayland))
     (arguments
      (list #:tests? #f
-           #:configure-flags #~(list "-GNinja"
-                                     "-DDISTRIBUTOR=\"GNU Guix\""
-                                     "-DDISTRIBUTOR_DEBUGINFO_AVAILABLE=NO"
-                                     "-DCRASH_REPORTER=OFF") ;no breakpad
+           #:configure-flags
+	   #~(list "-GNinja"
+                   "-DDISTRIBUTOR=\"In-tree Guix channel\""
+                   "-DDISTRIBUTOR_DEBUGINFO_AVAILABLE=NO"
+		   ;; Breakpad is not currently packaged for Guix.
+                   "-DCRASH_REPORTER=OFF")
            #:phases #~(modify-phases %standard-phases
                         (replace 'build
                           (lambda* (#:key parallel-build? #:allow-other-keys)
                             (invoke "cmake" "--build" ".")))
                         (replace 'install
                           (lambda _ (invoke "cmake" "--install" "."))))))
-    (home-page "https://git.outfoxxed.me/quickshell/quickshell")
+    (home-page "https://quickshell.outfoxxed.me")
     (synopsis "QtQuick-based desktop shell toolkit")
     (description
      "Quickshell is a flexible QtQuick-based toolkit for creating and