diff --git a/db/pkg/ansible b/db/pkg/ansible
index 7954220..f1ed702 100644
--- a/db/pkg/ansible
+++ b/db/pkg/ansible
@@ -1 +1 @@
-https://github.com/wa/pkg-ansible
+https://github.com/pkg-gretel/pkg-ansible
diff --git a/db/pkg/copy b/db/pkg/copy
deleted file mode 100644
index 877c27d..0000000
--- a/db/pkg/copy
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-copy
diff --git a/db/pkg/direnv b/db/pkg/direnv
index c47ed5f..eefcc95 100644
--- a/db/pkg/direnv
+++ b/db/pkg/direnv
@@ -1 +1 @@
-https://github.com/wa/pkg-direnv
+https://github.com/pkg-gretel/pkg-direnv
diff --git a/db/pkg/extract b/db/pkg/extract
index 7de9aaf..3ab3099 100644
--- a/db/pkg/extract
+++ b/db/pkg/extract
@@ -1 +1 @@
-https://github.com/wa/pkg-extract
+https://github.com/pkg-gretel/pkg-extract
diff --git a/db/pkg/gi b/db/pkg/gi
index 78e91ee..73083fc 100644
--- a/db/pkg/gi
+++ b/db/pkg/gi
@@ -1 +1 @@
-https://github.com/wa/pkg-gi
+https://github.com/fishery/gi
diff --git a/db/pkg/hub b/db/pkg/hub
index 580f5a1..6a75692 100644
--- a/db/pkg/hub
+++ b/db/pkg/hub
@@ -1 +1 @@
-https://github.com/wa/pkg-hub
+https://github.com/pkg-gretel/pkg-hub
diff --git a/db/pkg/iex b/db/pkg/iex
index 89ca621..a94fd11 100644
--- a/db/pkg/iex
+++ b/db/pkg/iex
@@ -1 +1 @@
-https://github.com/belltoy/plugin-iex.git
+https://github.com/belltoy/plugin-iex
diff --git a/db/pkg/keychain b/db/pkg/keychain
index 092efd5..380e451 100644
--- a/db/pkg/keychain
+++ b/db/pkg/keychain
@@ -1 +1 @@
-https://github.com/wa/pkg-keychain
+https://github.com/pkg-gretel/pkg-keychain
diff --git a/db/pkg/limap b/db/pkg/limap
deleted file mode 100644
index 7fe58e9..0000000
--- a/db/pkg/limap
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-limap
diff --git a/db/pkg/mix b/db/pkg/mix
index 88eeab3..19a6f89 100644
--- a/db/pkg/mix
+++ b/db/pkg/mix
@@ -1 +1 @@
-https://github.com/belltoy/plugin-mix.git
+https://github.com/belltoy/plugin-mix
diff --git a/db/pkg/osx_manpath b/db/pkg/osx_manpath
deleted file mode 100644
index 0d254ad..0000000
--- a/db/pkg/osx_manpath
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-osx_manpath
diff --git a/db/pkg/peco b/db/pkg/peco
index e8d6f59..07d0694 100644
--- a/db/pkg/peco
+++ b/db/pkg/peco
@@ -1 +1 @@
-https://github.com/wa/pkg-peco
+https://github.com/pkg-gretel/pkg-peco
diff --git a/db/pkg/pyenv b/db/pkg/pyenv
deleted file mode 100644
index 6f22723..0000000
--- a/db/pkg/pyenv
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-pyenv
diff --git a/db/pkg/set_color b/db/pkg/set_color
deleted file mode 100644
index dde23ba..0000000
--- a/db/pkg/set_color
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-set_color
diff --git a/db/pkg/stamp b/db/pkg/stamp
deleted file mode 100644
index 04a9de4..0000000
--- a/db/pkg/stamp
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/pkg-stamp
diff --git a/db/pkg/tiny b/db/pkg/tiny
index 245b30f..70595d7 100644
--- a/db/pkg/tiny
+++ b/db/pkg/tiny
@@ -1 +1 @@
-https://github.com/wa/pkg-tiny
+https://github.com/fishery/tiny
diff --git a/db/pkg/title b/db/pkg/title
index 98f4db7..4f46fa1 100644
--- a/db/pkg/title
+++ b/db/pkg/title
@@ -1 +1 @@
-https://github.com/oh-my-fish/plugin-title.git
+https://github.com/oh-my-fish/plugin-title
diff --git a/db/pkg/vcs b/db/pkg/vcs
index 3cf6d06..be5237c 100644
--- a/db/pkg/vcs
+++ b/db/pkg/vcs
@@ -1 +1 @@
-https://github.com/oh-my-fish/plugin-vcs.git
+https://github.com/oh-my-fish/plugin-vcs
diff --git a/db/pkg/z b/db/pkg/z
index 2640912..1ab1353 100644
--- a/db/pkg/z
+++ b/db/pkg/z
@@ -1 +1 @@
-https://github.com/oh-my-fish/pkg-z
+https://github.com/oh-my-fish/plugin-z
diff --git a/db/themes/flash b/db/themes/flash
index 3231254..92533ff 100644
--- a/db/themes/flash
+++ b/db/themes/flash
@@ -1 +1 @@
-https://github.com/wa/theme-flash
+https://github.com/fishery/flash
diff --git a/db/themes/hogan b/db/themes/hogan
deleted file mode 100644
index bdb2642..0000000
--- a/db/themes/hogan
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/theme-hogan
diff --git a/db/themes/hulk b/db/themes/hulk
index c469b47..6c2e95d 100644
--- a/db/themes/hulk
+++ b/db/themes/hulk
@@ -1 +1 @@
-https://github.com/wa/theme-hulk
+https://github.com/fishery/hulk
diff --git a/db/themes/led b/db/themes/led
deleted file mode 100644
index 97eec2b..0000000
--- a/db/themes/led
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/theme-led
diff --git a/db/themes/lolfish b/db/themes/lolfish
index a2a175a..05d82db 100644
--- a/db/themes/lolfish
+++ b/db/themes/lolfish
@@ -1 +1 @@
-https://github.com/er0/lolfish.git
+https://github.com/er0/lolfish
diff --git a/db/themes/russell b/db/themes/russell
deleted file mode 100644
index f326949..0000000
--- a/db/themes/russell
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/wa/theme-russell