diff --git a/oni/packages/emacs-config.scm b/oni/packages/emacs-config.scm
index baa0801..d974180 100644
--- a/oni/packages/emacs-config.scm
+++ b/oni/packages/emacs-config.scm
@@ -23,13 +23,13 @@
        (origin
          (method git-fetch)
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/emacs-config.git")
+               (url "git://code.ryuslash.org/emacs-config.git")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
           (base32 "0lqh3qblhlbps6742w3wv3c7nlv3mipi1cjfcbw1i3b8bsc2c6rv"))))
       (build-system emacs-build-system)
-      (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
+      (home-page "https://code.ryuslash.org/emacs-config/about/")
       (synopsis "My Emacs configuration")
       (description "This package provides my configuration for emacs")
       (license license:gpl3+))))
diff --git a/oni/packages/emacs.scm b/oni/packages/emacs.scm
index 3d6d721..591a32a 100644
--- a/oni/packages/emacs.scm
+++ b/oni/packages/emacs.scm
@@ -215,14 +215,14 @@ custom pairs?)")
       (source
        (origin
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/eshell-fringe-status.git")
+               (url "git://code.ryuslash.org/eshell-fringe-status.git")
                (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
           (base32 "0frx1lc0rf6p01m5gjyaazl64f839856qn88v263rdls5rpncmz9"))))
       (build-system emacs-build-system)
-      (home-page "https://code.ryuslash.org/ryuslash/eshell-fringe-status")
+      (home-page "https://code.ryuslash.org/eshell-fringe-status")
       (synopsis "Show last status in fringe")
       (description "Show last status in fringe")
       (license license:gpl3+))))
@@ -630,14 +630,14 @@ faster and I highly recommend its usage if your Emacs version permits.")
       (source
        (origin
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/yoshi-theme.git")
+               (url "git://code.ryuslash.org/yoshi-theme.git")
                (commit commit)))
          (method git-fetch)
          (file-name (git-file-name name version))
          (sha256
           (base32 "0bb5mf194iw72w7zcvs9jmlxx5ngvslx5i6c6rna9bj3y0zm8jlb"))))
       (build-system emacs-build-system)
-      (home-page "https://code.ryuslash.org/ryuslash/yoshi-theme")
+      (home-page "https://code.ryuslash.org/yoshi-theme")
       (synopsis "Emacs theme named after my cat")
       (description "My cat is named Yoshi and I was just working on a random new theme, which was
 new-theme for a while. I couldn't think of a name so I named it after him.")
diff --git a/oni/packages/inbox-size.scm b/oni/packages/inbox-size.scm
index e92b740..fb9fb7f 100644
--- a/oni/packages/inbox-size.scm
+++ b/oni/packages/inbox-size.scm
@@ -16,7 +16,7 @@
       (source
        (origin
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/inbox-size.git")
+               (url "git://code.ryuslash.org/util/tom/inbox-size.git")
                (commit commit)))
          (method git-fetch)
          (sha256
diff --git a/oni/packages/inkplate.scm b/oni/packages/inkplate.scm
index 0e4ce4f..50d27c4 100644
--- a/oni/packages/inkplate.scm
+++ b/oni/packages/inkplate.scm
@@ -17,7 +17,7 @@
       (origin
         (method git-fetch)
         (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/guile-inkplate/")
+               (url "git://code.ryuslash.org/guile-inkplate/")
                (commit "27cbc844dee8f9f9b8a0a175f7ebf005cb205046")))
         (file-name "guile-inkplate-0.1-checkout")
         (sha256 (base32 "00qx2d16xma19myq4lla3gnq8rljsqbns53ma5hwamkyvwwyd55s"))))
diff --git a/oni/packages/mpd-notify.scm b/oni/packages/mpd-notify.scm
index 0dbd053..44b4d25 100644
--- a/oni/packages/mpd-notify.scm
+++ b/oni/packages/mpd-notify.scm
@@ -17,7 +17,7 @@
       (source
        (origin
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/mpd-notify.git")
+               (url "git://code.ryuslash.org/util/tom/mpd-notify.git")
                (commit commit)))
          (method git-fetch)
          (sha256
diff --git a/oni/packages/utilities.scm b/oni/packages/utilities.scm
index fdffeb0..9b2cafa 100644
--- a/oni/packages/utilities.scm
+++ b/oni/packages/utilities.scm
@@ -17,7 +17,7 @@
       (source
        (origin
          (uri (git-reference
-               (url "https://code.ryuslash.org/ryuslash/inkplate-display.git")
+               (url "git://code.ryuslash.org/util/tom/inkplate-display.git")
                (commit commit)))
          (method git-fetch)
          (sha256