diff --git a/cmd/cmd.go b/cmd/cmd.go
index b0af64c..33ff1ff 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -67,7 +67,7 @@ func getToken(name string) string {
 
 func getClient(ctx *cli.Context, requireToken bool) (*gitea.Client, error) {
 	if ctx.IsSet("token") {
-		return gitea.NewClient(ctx.String("url"), getToken(ctx.String("token"))), nil
+		return gitea.NewClient(ctx.String("url"), gitea.SetToken(getToken(ctx.String("token"))))
 	}
 
 	var token string
@@ -93,7 +93,7 @@ func getClient(ctx *cli.Context, requireToken bool) (*gitea.Client, error) {
 		token = tokenMap[answer].Token
 	}
 
-	return gitea.NewClient(ctx.String("url"), token), nil
+	return gitea.NewClient(ctx.String("url"), gitea.SetToken(token))
 }
 
 func defRemote(remote, def string) string {
diff --git a/cmd/issues_create.go b/cmd/issues_create.go
index 72c655c..7536cbf 100644
--- a/cmd/issues_create.go
+++ b/cmd/issues_create.go
@@ -67,7 +67,7 @@ func doIssueCreate(ctx *cli.Context) error {
 		}
 	}
 
-	issue, err := client.CreateIssue(ctx.String("owner"), ctx.String("repo"), gitea.CreateIssueOption{Title: title, Body: body})
+	issue, _, err := client.CreateIssue(ctx.String("owner"), ctx.String("repo"), gitea.CreateIssueOption{Title: title, Body: body})
 	if err != nil {
 		return err
 	}
diff --git a/cmd/pulls_checkout.go b/cmd/pulls_checkout.go
index 64adfe5..1e15b82 100644
--- a/cmd/pulls_checkout.go
+++ b/cmd/pulls_checkout.go
@@ -57,7 +57,7 @@ func doPullCheckout(ctx *cli.Context) error {
 			}
 		}
 	} else {
-		iss, err := client.GetIssue(upstreamRepo[1], upstreamRepo[2], prNum.Index)
+		iss, _, err := client.GetIssue(upstreamRepo[1], upstreamRepo[2], prNum.Index)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/pulls_create.go b/cmd/pulls_create.go
index f54ebaa..ad0b621 100644
--- a/cmd/pulls_create.go
+++ b/cmd/pulls_create.go
@@ -29,7 +29,7 @@ func doPullCreate(ctx *cli.Context) error {
 		return err
 	}
 
-	upstreams, err := client.ListRepoBranches(getUpstreamRepo()[1], getUpstreamRepo()[2], gitea.ListRepoBranchesOptions{})
+	upstreams, _, err := client.ListRepoBranches(getUpstreamRepo()[1], getUpstreamRepo()[2], gitea.ListRepoBranchesOptions{})
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func doPullCreate(ctx *cli.Context) error {
 		bases[idx] = upstream.Name
 	}
 
-	origins, err := client.ListRepoBranches(getOriginRepo()[1], getOriginRepo()[2], gitea.ListRepoBranchesOptions{})
+	origins, _, err := client.ListRepoBranches(getOriginRepo()[1], getOriginRepo()[2], gitea.ListRepoBranchesOptions{})
 	if err != nil {
 		return err
 	}
@@ -114,7 +114,7 @@ func doPullCreate(ctx *cli.Context) error {
 		}
 	}
 
-	pull, err := client.CreatePullRequest(ctx.String("owner"), ctx.String("repo"), gitea.CreatePullRequestOption{Title: title, Body: body, Base: base, Head: head})
+	pull, _, err := client.CreatePullRequest(ctx.String("owner"), ctx.String("repo"), gitea.CreatePullRequestOption{Title: title, Body: body, Base: base, Head: head})
 	if err != nil {
 		if fmt.Sprint(err) == "409 Conflict" { // Hard-coded in the SDK
 			return existingPR(client, getUpstreamRepo()[1], getUpstreamRepo()[2], head, err)
@@ -130,7 +130,7 @@ func doPullCreate(ctx *cli.Context) error {
 }
 
 func existingPR(client *gitea.Client, owner, repo, head string, pullErr error) error {
-	pulls, err := client.ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{State: "open"})
+	pulls, _, err := client.ListRepoPullRequests(owner, repo, gitea.ListPullRequestsOptions{State: "open"})
 	if err != nil {
 		return err
 	}
diff --git a/cmd/release_create.go b/cmd/release_create.go
index e163c48..35727f3 100644
--- a/cmd/release_create.go
+++ b/cmd/release_create.go
@@ -68,7 +68,7 @@ func doReleaseCreate(ctx *cli.Context) error {
 		return err
 	}
 
-	release, err := client.CreateRelease(ctx.String("owner"), ctx.String("repo"), gitea.CreateReleaseOption{
+	release, _, err := client.CreateRelease(ctx.String("owner"), ctx.String("repo"), gitea.CreateReleaseOption{
 		TagName:      answers.Tag,
 		Target:       answers.Target,
 		Title:        answers.Title,
diff --git a/cmd/repo_create.go b/cmd/repo_create.go
index ac4e456..f3ada10 100644
--- a/cmd/repo_create.go
+++ b/cmd/repo_create.go
@@ -68,7 +68,7 @@ func doRepoCreate(ctx *cli.Context) error {
 		opts.Readme = auto.Readme
 	}
 
-	repo, err := client.CreateRepo(opts)
+	repo, _, err := client.CreateRepo(opts)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/token_add.go b/cmd/token_add.go
index 38f019b..8b1174e 100644
--- a/cmd/token_add.go
+++ b/cmd/token_add.go
@@ -75,13 +75,15 @@ func doTokenAdd(ctx *cli.Context) error {
 			return err
 		}
 
-		client := gitea.NewClient(answers.URL, "")
-		client.SetBasicAuth(giteaAnswers.Username, giteaAnswers.Password)
+		client, err := gitea.NewClient(answers.URL, gitea.SetBasicAuth(giteaAnswers.Username, giteaAnswers.Password))
+		if err != nil {
+			return err
+		}
 		if giteaAnswers.OTP != "" {
 			client.SetOTP(giteaAnswers.OTP)
 		}
 
-		t, err := client.CreateAccessToken(gitea.CreateAccessTokenOption{Name: giteaAnswers.Token})
+		t, _, err := client.CreateAccessToken(gitea.CreateAccessTokenOption{Name: giteaAnswers.Token})
 		if err != nil {
 			return err
 		}
diff --git a/go.mod b/go.mod
index 43da615..a9b6ca9 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module gitea.com/jolheiser/sip
 go 1.13
 
 require (
-	code.gitea.io/sdk/gitea v0.12.2
+	code.gitea.io/sdk/gitea v0.13.0
 	github.com/AlecAivazis/survey/v2 v2.1.1
 	github.com/BurntSushi/toml v0.3.1
 	github.com/alecthomas/chroma v0.8.0 // indirect
diff --git a/go.sum b/go.sum
index 16080e3..3936e1e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,7 @@
 code.gitea.io/sdk/gitea v0.12.2 h1:NQI8b/CT9AEQjsxbVIZ6gsPUXv38moT5y1ocN7n1YcQ=
 code.gitea.io/sdk/gitea v0.12.2/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
+code.gitea.io/sdk/gitea v0.13.0 h1:iHognp8ZMhMFLooUUNZFpm8IHaC9qoHJDvAE5vTm5aw=
+code.gitea.io/sdk/gitea v0.13.0/go.mod h1:z3uwDV/b9Ls47NGukYM9XhnHtqPh/J+t40lsUrR6JDY=
 github.com/AlecAivazis/survey/v2 v2.1.1 h1:LEMbHE0pLj75faaVEKClEX1TM4AJmmnOh9eimREzLWI=
 github.com/AlecAivazis/survey/v2 v2.1.1/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
diff --git a/modules/sdk/issues.go b/modules/sdk/issues.go
index fa9c7fd..e11df51 100644
--- a/modules/sdk/issues.go
+++ b/modules/sdk/issues.go
@@ -14,7 +14,7 @@ func GetIssues(client *gitea.Client, owner, repo string, opts gitea.ListIssueOpt
 	p := 1
 	for {
 		opts.Page = p
-		list, err := client.ListRepoIssues(owner, repo, opts)
+		list, _, err := client.ListRepoIssues(owner, repo, opts)
 		if err != nil {
 			return issues, err
 		}
diff --git a/modules/sdk/pulls.go b/modules/sdk/pulls.go
index bfe33fc..8e149fe 100644
--- a/modules/sdk/pulls.go
+++ b/modules/sdk/pulls.go
@@ -10,7 +10,7 @@ func GetPulls(client *gitea.Client, owner, repo string, opts gitea.ListPullReque
 	p := 1
 	for {
 		opts.Page = p
-		list, err := client.ListRepoPullRequests(owner, repo, opts)
+		list, _, err := client.ListRepoPullRequests(owner, repo, opts)
 		if err != nil {
 			return pulls, err
 		}
diff --git a/modules/sdk/releases.go b/modules/sdk/releases.go
index 7cdbfa4..bc44019 100644
--- a/modules/sdk/releases.go
+++ b/modules/sdk/releases.go
@@ -8,7 +8,7 @@ func GetReleases(client *gitea.Client, owner, repo string, opts gitea.ListReleas
 	p := 1
 	for {
 		opts.Page = p
-		list, err := client.ListReleases(owner, repo, opts)
+		list, _, err := client.ListReleases(owner, repo, opts)
 		if err != nil {
 			return releases, err
 		}
diff --git a/modules/sdk/repo.go b/modules/sdk/repo.go
index 312149b..471ac67 100644
--- a/modules/sdk/repo.go
+++ b/modules/sdk/repo.go
@@ -7,7 +7,7 @@ func GetForks(client *gitea.Client, owner, repo string) ([]*gitea.Repository, er
 	forks := make([]*gitea.Repository, 0)
 	p := 1
 	for {
-		list, err := client.ListForks(owner, repo, gitea.ListForksOptions{
+		list, _, err := client.ListForks(owner, repo, gitea.ListForksOptions{
 			ListOptions: gitea.ListOptions{
 				Page:     p,
 				PageSize: 100,