diff --git a/.gitmodules b/.gitmodules
index 75f6a0c0db..af8a770278 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -184,7 +184,7 @@
 	url = https://github.com/gwalborn/UrWeb-Language-Definition.git
 [submodule "vendor/grammars/VBDotNetSyntax"]
 	path = vendor/grammars/VBDotNetSyntax
-	url = https://github.com/angryant0007/VBDotNetSyntax
+	url = https://github.com/peters-ben-0007/VBDotNetSyntax.git
 [submodule "vendor/grammars/Vala-TMBundle"]
 	path = vendor/grammars/Vala-TMBundle
 	url = https://github.com/technosophos/Vala-TMBundle
diff --git a/script/add-grammar b/script/add-grammar
index 97b970aa97..92743fafcc 100755
--- a/script/add-grammar
+++ b/script/add-grammar
@@ -99,7 +99,7 @@ url=`script/normalise-url --protocol=https "$1"`
 # Make sure it's not already registered
 path="vendor/grammars/${url##*/}"
 path="${path%.git}"
-if [ -e "$path" ]; then
+if [ -e "$path" ] && [ -z "$replace" ]; then
 	warn "Submodule '$path' already exists. Did you forget the '--replace' option?"
 	warn "Run '$0 --help' for invocation advice"
 	exit 1
diff --git a/vendor/README.md b/vendor/README.md
index a9b0d6a0d0..4a7210e00a 100644
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -150,7 +150,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Forth:** [textmate/forth.tmbundle](https://github.com/textmate/forth.tmbundle)
 - **Fortran:** [textmate/fortran.tmbundle](https://github.com/textmate/fortran.tmbundle)
 - **Fortran Free Form:** [textmate/fortran.tmbundle](https://github.com/textmate/fortran.tmbundle)
-- **FreeBasic:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
+- **FreeBasic:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
 - **FreeMarker:** [freemarker/FreeMarker.tmbundle](https://github.com/freemarker/FreeMarker.tmbundle)
 - **Frege:** [atom-haskell/language-haskell](https://github.com/atom-haskell/language-haskell)
 - **Futhark:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc)
@@ -383,7 +383,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **R:** [textmate/r.tmbundle](https://github.com/textmate/r.tmbundle)
 - **RAML:** [atom/language-yaml](https://github.com/atom/language-yaml)
 - **RDoc:** [joshaven/RDoc.tmbundle](https://github.com/joshaven/RDoc.tmbundle)
-- **REALbasic:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
+- **REALbasic:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
 - **REXX:** [mblocker/rexx-sublime](https://github.com/mblocker/rexx-sublime)
 - **RMarkdown:** [atom/language-gfm](https://github.com/atom/language-gfm)
 - **RPC:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle)
@@ -486,8 +486,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **UnrealScript:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **UrWeb:** [gwalborn/UrWeb-Language-Definition](https://github.com/gwalborn/UrWeb-Language-Definition)
 - **V:** [0x9ef/vscode-vlang](https://github.com/0x9ef/vscode-vlang)
-- **VBA:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
-- **VBScript:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
+- **VBA:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
+- **VBScript:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
 - **VCL:** [brandonwamboldt/sublime-varnish](https://github.com/brandonwamboldt/sublime-varnish)
 - **VHDL:** [textmate/vhdl.tmbundle](https://github.com/textmate/vhdl.tmbundle)
 - **Vala:** [technosophos/Vala-TMBundle](https://github.com/technosophos/Vala-TMBundle)
@@ -496,7 +496,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Vim Help File:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml)
 - **Vim Script:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml)
 - **Vim Snippet:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml)
-- **Visual Basic .NET:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax)
+- **Visual Basic .NET:** [peters-ben-0007/VBDotNetSyntax](https://github.com/peters-ben-0007/VBDotNetSyntax)
 - **Volt:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle)
 - **Vue:** [vuejs/vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight)
 - **Wavefront Material:** [Alhadis/language-wavefront](https://github.com/Alhadis/language-wavefront)