diff --git a/.gitmodules b/.gitmodules
index 2ff4c7c..7c13b07 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,5 +8,5 @@
 	path = dot_vim/bundle/vim-toml
 	url = https://github.com/cespare/vim-toml
 [submodule "private_dot_config/git/templates"]
-	path = private_dot_config/git/templates
+	path = private_dot_config/git/git-templates
 	url = https://github.com/fredericrous/git-templates.git
diff --git a/private_dot_config/git/config.tmpl b/private_dot_config/git/config.tmpl
index 223b7c1..a00107a 100644
--- a/private_dot_config/git/config.tmpl
+++ b/private_dot_config/git/config.tmpl
@@ -24,7 +24,7 @@
 	attributesfile = ~/.config/git/attributes
 [commit]
 	gpgsign = true
-	template = ~/.config/git/templates/message
+	template = ~/.config/git/git-templates/templates/message
 [credential]
 	helper = cache
 [diff]
@@ -48,7 +48,7 @@
 	postBuffer = 157286400
 [init]
 	defaultBranch = main
-	templatedir = ~/.config/git/templates
+	templatedir = ~/.config/git/git-templates/templates
 [merge]
 	keepBackup = false
 	tool = p4merge
@@ -64,6 +64,8 @@
 	ff = only
 [rebase]
 	autoStash = true
+[url "git@github.com:"]
+	insteadOf = https://github.com/
 [include]
 	path = alias.toml
 	path = style.toml
diff --git a/private_dot_config/git/git-templates b/private_dot_config/git/git-templates
new file mode 160000
index 0000000..51063f3
--- /dev/null
+++ b/private_dot_config/git/git-templates
@@ -0,0 +1 @@
+Subproject commit 51063f3fe52665ffe537a8a3df800fc3dddc58a0
diff --git a/private_dot_config/git/run_after_git-hooks-setup.zsh b/private_dot_config/git/run_after_git-hooks-setup.zsh
old mode 100644
new mode 100755
index 1d5b97c..8e33c9b
--- a/private_dot_config/git/run_after_git-hooks-setup.zsh
+++ b/private_dot_config/git/run_after_git-hooks-setup.zsh
@@ -1,2 +1,2 @@
 #/bin/zsh
-chmod +x "${XDG_CONFIG_HOME:-~/.config}/git/templates/hooks/*"
+chmod +x "${XDG_CONFIG_HOME:-~/.config}"/git/git-templates/templates/hooks/*
diff --git a/private_dot_config/git/templates b/private_dot_config/git/templates
deleted file mode 160000
index 7a44992..0000000
--- a/private_dot_config/git/templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a449922246347b23d10f19e0ae68130c74fbc8e