diff --git a/discord/ban.go b/discord/ban.go
index 1180784..9976341 100644
--- a/discord/ban.go
+++ b/discord/ban.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"go.etztech.xyz/go-serverapi"
+	"git.birbmc.com/Etzelia/go-serverapi"
 )
 
 func init() {
diff --git a/discord/birb.go b/discord/birb.go
index 91642c3..dba4e7a 100644
--- a/discord/birb.go
+++ b/discord/birb.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.etztech.xyz/falseknees"
+	"git.birbmc.com/Etzelia/falseknees"
 )
 
 func init() {
diff --git a/discord/broadcast.go b/discord/broadcast.go
index 18de5d1..7864fcd 100644
--- a/discord/broadcast.go
+++ b/discord/broadcast.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"go.etztech.xyz/go-serverapi"
+	"git.birbmc.com/Etzelia/go-serverapi"
 )
 
 func init() {
diff --git a/discord/discord.go b/discord/discord.go
index b450a10..423087f 100644
--- a/discord/discord.go
+++ b/discord/discord.go
@@ -12,7 +12,7 @@ import (
 	"github.com/bwmarrin/discordgo"
 	"github.com/dghubble/go-twitter/twitter"
 	"github.com/dghubble/oauth1"
-	"go.etztech.xyz/go-serverapi"
+	"git.birbmc.com/Etzelia/go-serverapi"
 	"go.jolheiser.com/beaver"
 )
 
diff --git a/discord/history.go b/discord/history.go
index baa609a..a79a032 100644
--- a/discord/history.go
+++ b/discord/history.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"go.jolheiser.com/beaver"
-	"go.jolheiser.com/gojang"
-	"go.jolheiser.com/gojang/rate"
+	"gitea.com/jolheiser/gojang"
+	"gitea.com/jolheiser/gojang/rate"
 )
 
 func init() {
diff --git a/discord/inspire.go b/discord/inspire.go
index e4238ae..c622f7d 100644
--- a/discord/inspire.go
+++ b/discord/inspire.go
@@ -1,6 +1,6 @@
 package discord
 
-import "go.etztech.xyz/inspiro"
+import "git.birbmc.com/Etzelia/inspiro"
 
 func init() {
 	commands = append(commands, &command{
diff --git a/discord/register.go b/discord/register.go
index 12371a7..7a4a3e3 100644
--- a/discord/register.go
+++ b/discord/register.go
@@ -9,8 +9,8 @@ import (
 
 	"git.birbmc.com/canopeas/config"
 
-	"go.etztech.xyz/go-mcm"
-	"go.etztech.xyz/go-mcm/model/django"
+	"git.birbmc.com/Etzelia/go-mcm"
+	"git.birbmc.com/Etzelia/go-mcm/model/django"
 )
 
 const bannedPlayersFile = "banned-players.json"
diff --git a/discord/status.go b/discord/status.go
index e2afe3a..57eb5a5 100644
--- a/discord/status.go
+++ b/discord/status.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"gitea.com/jolheiser/gojang/query"
 	"github.com/bwmarrin/discordgo"
-	"go.jolheiser.com/gojang/query"
 )
 
 func init() {
@@ -18,7 +18,7 @@ func init() {
 		run: func(cmd commandInit) (string, error) {
 			server := query.NewServer(cmd.config.Server.Address, cmd.config.Server.Port)
 
-			q, err := server.Query(query.DefaultTimeout)
+			q, err := server.Query(query.DefaultTimeout, query.DefaultDeadline)
 			if err != nil {
 				return "", err
 			}
diff --git a/discord/utils.go b/discord/utils.go
index d2a5768..fcd11b2 100644
--- a/discord/utils.go
+++ b/discord/utils.go
@@ -7,7 +7,7 @@ import (
 
 	"git.birbmc.com/canopeas/database"
 
-	"go.etztech.xyz/go-serverapi"
+	"git.birbmc.com/Etzelia/go-serverapi"
 	"go.jolheiser.com/beaver"
 )
 
diff --git a/discord/xkcd.go b/discord/xkcd.go
index b498a76..d7e861c 100644
--- a/discord/xkcd.go
+++ b/discord/xkcd.go
@@ -2,11 +2,12 @@ package discord
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
 
-	"go.jolheiser.com/xkcd"
+	"gitea.com/jolheiser/xkcd"
 )
 
 func init() {
@@ -30,7 +31,7 @@ func init() {
 			} else {
 				comicNum, err := strconv.Atoi(args[1])
 				if err != nil {
-					return "", err
+					return "", errors.New("this command only accepts a number or no arguments")
 				}
 				comic, err = client.Comic(context.Background(), comicNum)
 			}
diff --git a/go.mod b/go.mod
index 5bcdb70..88ce2be 100644
--- a/go.mod
+++ b/go.mod
@@ -3,19 +3,19 @@ module git.birbmc.com/canopeas
 go 1.16
 
 require (
+	git.birbmc.com/Etzelia/falseknees v0.0.0-20210505030520-ce2b19ebd088
+	git.birbmc.com/Etzelia/go-mcm v0.0.0-20210505031740-e1ed806ef685
+	git.birbmc.com/Etzelia/go-serverapi v0.0.0-20210505031332-398feec0ab7c
+	git.birbmc.com/Etzelia/inspiro v0.0.2
+	gitea.com/jolheiser/gojang v0.0.7
+	gitea.com/jolheiser/xkcd v0.0.2
 	github.com/bwmarrin/discordgo v0.22.0
 	github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d
 	github.com/dghubble/oauth1 v0.7.0
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/pelletier/go-toml v1.8.1
 	go.etcd.io/bbolt v1.3.4
-	go.etztech.xyz/falseknees v0.0.1
-	go.etztech.xyz/go-mcm v1.3.1
-	go.etztech.xyz/go-serverapi v0.0.3
-	go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359
 	go.jolheiser.com/beaver v1.0.2
-	go.jolheiser.com/gojang v0.0.3
-	go.jolheiser.com/xkcd v0.0.1
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
 	golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5 // indirect
 )
diff --git a/go.sum b/go.sum
index 7ba0f54..82e5002 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,15 @@
+git.birbmc.com/Etzelia/falseknees v0.0.0-20210505030520-ce2b19ebd088 h1:M4ZyccJQrio2jZEehRTGDs4LQ8FXx8BF+ng346B1cvY=
+git.birbmc.com/Etzelia/falseknees v0.0.0-20210505030520-ce2b19ebd088/go.mod h1:BWmpXhZF6Cl/gCGGt0IhJpjnAWjcMBdU+m4nnBEQUk0=
+git.birbmc.com/Etzelia/go-mcm v0.0.0-20210505031740-e1ed806ef685 h1:IWiRA9U58aBa2ZW2v7cjDymaxWqr+8DVcskzo4hAU2k=
+git.birbmc.com/Etzelia/go-mcm v0.0.0-20210505031740-e1ed806ef685/go.mod h1:JXB7oUc0CS0NwuFkYcHkzbYEBEMigLldn4VLvwFIhdk=
+git.birbmc.com/Etzelia/go-serverapi v0.0.0-20210505031332-398feec0ab7c h1:S/9aOOsBbE9rJDk43Vh4HOEgHmHxqehd8VMi5fGdHdM=
+git.birbmc.com/Etzelia/go-serverapi v0.0.0-20210505031332-398feec0ab7c/go.mod h1:KH8M3zEZuJw9kNFVE+EOESZaMjSizQzSFiY8bqMd8FY=
+git.birbmc.com/Etzelia/inspiro v0.0.2 h1:/lNp4+RLfAvLGoq69cQ4enYjVNYBP7JzRmSxDvQtVWs=
+git.birbmc.com/Etzelia/inspiro v0.0.2/go.mod h1:JT9Q/xy8U2Gl/89zfW4Wnag2F1kGm5r6m4QR984lVIg=
+gitea.com/jolheiser/gojang v0.0.7 h1:Q4cG7QYiKQsJtUWgXXiolAH9DCLRoaQ4olaO9OV628U=
+gitea.com/jolheiser/gojang v0.0.7/go.mod h1:r9kj2wv/21Da7VpWz+qmxLexH85o2BAM4NMxeYgQlcY=
+gitea.com/jolheiser/xkcd v0.0.2 h1:HJP83YwSKxSYcoNfpb1ZpAfBvkUAnN+YgeukraXtfrc=
+gitea.com/jolheiser/xkcd v0.0.2/go.mod h1:aDa2vX54wLaX8Ra5CGN2GWBX13UWAGJKGGddzHl/hks=
 github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM=
 github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M=
 github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
@@ -25,22 +37,10 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
-go.etztech.xyz/falseknees v0.0.1 h1:XjlBqMyBUH5b7e/9oedEwZ9pnz3sqMhXQv6vnQocxeM=
-go.etztech.xyz/falseknees v0.0.1/go.mod h1:Acn1AwrvAArQEqhMBDlak5BvCZ3jgV8vdL8Pe5ZldRE=
-go.etztech.xyz/go-mcm v1.3.1 h1:RLdOQrMgw0eP7bsfRRbXLW8c5/RaJ5Mg7i/ESFaUwvY=
-go.etztech.xyz/go-mcm v1.3.1/go.mod h1:Hz2YULB3sN/aQA8cPSm2d6LM3E3qTMspzfRCIAD/1dc=
-go.etztech.xyz/go-serverapi v0.0.3 h1:h2Zww0x5E61cH4jXB97x3oUnbryEuLkuq+RTgIi5/U4=
-go.etztech.xyz/go-serverapi v0.0.3/go.mod h1:tq4J5zxVnAwzOiv79iLUzpfNAd7IoNirOfb0gt3/IEY=
-go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359 h1:j/ZeoAj185wHfCSYD52Kt/69i3Bzk1MXN4Qh1yP6+P4=
-go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359/go.mod h1:+fC1WzJm/oS4UEgqr1jPouWerxBys52lTTDA94/5bf8=
 go.jolheiser.com/beaver v1.0.2 h1:KA2D6iO8MQhZi1nZYi/Chak/f1Cxfrs6b1XO623+Khk=
 go.jolheiser.com/beaver v1.0.2/go.mod h1:7X4F5+XOGSC3LejTShoBdqtRCnPWcnRgmYGmG3EKW8g=
-go.jolheiser.com/gojang v0.0.3 h1:EWDLMo6X3f67DK2p/mSB680H43t8SDrDYNZnXvY7PLg=
-go.jolheiser.com/gojang v0.0.3/go.mod h1:hUBULFDoampNM97E1IaYUhkLBJ30sb7iGsoFOdDU76I=
 go.jolheiser.com/gql v0.0.1 h1:y3LGHcJUZI9otTCcMn8TVdF3aEzNX0FW6m0YUamlLto=
 go.jolheiser.com/gql v0.0.1/go.mod h1:74eYqVRIxsOFxtVl0RYGKNyYQgJYQaxOCgar7LP71Hw=
-go.jolheiser.com/xkcd v0.0.1 h1:pRNY2BXxUS+NMtKlm/ENumOr7g3k4VWY/QoDri9YSNU=
-go.jolheiser.com/xkcd v0.0.1/go.mod h1:AzWPrZToCLfpazsZBkeu/nPuIvurMqfCOptiydz7Dvk=
 golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=