diff --git a/cmd/writeas/api.go b/cmd/writeas/api.go
index 798126e..52a499f 100644
--- a/cmd/writeas/api.go
+++ b/cmd/writeas/api.go
@@ -1,221 +1,221 @@
 package main
 
 import (
 	"fmt"
 	"github.com/atotto/clipboard"
-	"github.com/writeas/go-writeas"
 	"github.com/writeas/web-core/posts"
 	"github.com/writeas/writeas-cli/fileutils"
+	"go.code.as/writeas.v2"
 	"gopkg.in/urfave/cli.v1"
 	"path/filepath"
 )
 
 const (
 	defaultUserAgent = "writeas-cli v" + version
 )
 
 func client(userAgent string, tor bool) *writeas.Client {
 	var client *writeas.Client
 	if tor {
 		client = writeas.NewTorClient(torPort)
 	} else {
 		if isDev() {
 			client = writeas.NewDevClient()
 		} else {
 			client = writeas.NewClient()
 		}
 	}
 	client.UserAgent = userAgent
 
 	return client
 }
 
 func newClient(c *cli.Context, authRequired bool) (*writeas.Client, error) {
 	var client *writeas.Client
 	if isTor(c) {
 		client = writeas.NewTorClient(torPort)
 	} else {
 		if isDev() {
 			client = writeas.NewDevClient()
 		} else {
 			client = writeas.NewClient()
 		}
 	}
 	client.UserAgent = userAgent(c)
 	// TODO: load user into var shared across the app
 	u, _ := loadUser()
 	if u != nil {
 		client.SetToken(u.AccessToken)
 	} else if authRequired {
 		return nil, fmt.Errorf("Not currently logged in. Authenticate with: writeas auth -u <username>")
 	}
 
 	return client, nil
 }
 
 // DoFetch retrieves the Write.as post with the given friendlyID,
 // optionally via the Tor hidden service.
 func DoFetch(friendlyID, ua string, tor bool) error {
 	cl := client(ua, tor)
 
 	p, err := cl.GetPost(friendlyID)
 	if err != nil {
 		return err
 	}
 
 	if p.Title != "" {
 		fmt.Printf("# %s\n\n", string(p.Title))
 	}
 	fmt.Printf("%s\n", string(p.Content))
 	return nil
 }
 
 // DoPost creates a Write.as post, returning an error if it was
 // unsuccessful.
 func DoPost(c *cli.Context, post []byte, font string, encrypt, tor, code bool) (*writeas.Post, error) {
 	cl, _ := newClient(c, false)
 
 	pp := &writeas.PostParams{
 		Font:       getFont(code, font),
 		Collection: collection(c),
 	}
 	pp.Title, pp.Content = posts.ExtractTitle(string(post))
 	if lang := language(c, true); lang != "" {
 		pp.Language = &lang
 	}
 	p, err := cl.CreatePost(pp)
 	if err != nil {
 		return nil, fmt.Errorf("Unable to post: %v", err)
 	}
 
 	var url string
 	if p.Collection != nil {
 		url = p.Collection.URL + p.Slug
 	} else {
 		if tor {
 			url = torBaseURL
 		} else if isDev() {
 			url = devBaseURL
 		} else {
 			url = writeasBaseURL
 		}
 		url += "/" + p.ID
 	}
 
 	if cl.Token() == "" {
 		// Store post locally, since we're not authenticated
 		addPost(p.ID, p.Token)
 	}
 
 	// Copy URL to clipboard
 	err = clipboard.WriteAll(string(url))
 	if err != nil {
 		Errorln("writeas: Didn't copy to clipboard: %s", err)
 	} else {
 		Info(c, "Copied to clipboard.")
 	}
 
 	// Output URL
 	fmt.Printf("%s\n", url)
 
 	return p, nil
 }
 
 // DoUpdate updates the given post on Write.as.
 func DoUpdate(c *cli.Context, post []byte, friendlyID, token, font string, tor, code bool) error {
 	cl, _ := newClient(c, false)
 
 	params := writeas.PostParams{
 		ID:    friendlyID,
 		Token: token,
 	}
 	params.Title, params.Content = posts.ExtractTitle(string(post))
 	if lang := language(c, false); lang != "" {
 		params.Language = &lang
 	}
 	if code || font != "" {
 		params.Font = getFont(code, font)
 	}
 
 	_, err := cl.UpdatePost(&params)
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem updating: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		Info(c, "Post updated via hidden service.")
 	} else {
 		Info(c, "Post updated.")
 	}
 	return nil
 }
 
 // DoDelete deletes the given post on Write.as.
 func DoDelete(c *cli.Context, friendlyID, token string, tor bool) error {
 	cl, _ := newClient(c, false)
 
 	err := cl.DeletePost(&writeas.PostParams{
 		ID:    friendlyID,
 		Token: token,
 	})
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem deleting: %v", err)
 		}
 		return fmt.Errorf("Post doesn't exist, or bad edit token given.")
 	}
 
 	if tor {
 		Info(c, "Post deleted from hidden service.")
 	} else {
 		Info(c, "Post deleted.")
 	}
 	removePost(friendlyID)
 
 	return nil
 }
 
 func DoLogIn(c *cli.Context, username, password string) error {
 	cl := client(userAgent(c), isTor(c))
 
 	u, err := cl.LogIn(username, password)
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem logging in: %v", err)
 		}
 		return err
 	}
 
 	err = saveUser(u)
 	if err != nil {
 		return err
 	}
 	fmt.Printf("Logged in as %s.\n", u.User.Username)
 	return nil
 }
 
 func DoLogOut(c *cli.Context) error {
 	cl, err := newClient(c, true)
 	if err != nil {
 		return err
 	}
 
 	err = cl.LogOut()
 	if err != nil {
 		if debug {
 			ErrorlnQuit("Problem logging out: %v", err)
 		}
 		return err
 	}
 
 	// Delete local user data
 	err = fileutils.DeleteFile(filepath.Join(userDataDir(), userFile))
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
diff --git a/cmd/writeas/cli.go b/cmd/writeas/cli.go
index cdd2fdc..75ebc51 100644
--- a/cmd/writeas/cli.go
+++ b/cmd/writeas/cli.go
@@ -1,332 +1,332 @@
 package main
 
 import (
 	"bufio"
-	"github.com/writeas/go-writeas"
+	"go.code.as/writeas.v2"
 	"gopkg.in/urfave/cli.v1"
 	"io"
 	"log"
 	"os"
 )
 
 // API constants for communicating with Write.as.
 const (
 	writeasBaseURL = "https://write.as"
 	devBaseURL     = "https://development.write.as"
 	torBaseURL     = "http://writeas7pm7rcdqg.onion"
 )
 
 // Application constants.
 const (
 	version = "1.1"
 )
 
 // Defaults for posts on Write.as.
 const (
 	defaultFont = PostFontMono
 )
 
 // Available flags for creating posts
 var postFlags = []cli.Flag{
 	cli.StringFlag{
 		Name:  "c, b",
 		Usage: "Optional blog to post to",
 		Value: "",
 	},
 	cli.BoolFlag{
 		Name:  "tor, t",
 		Usage: "Perform action on Tor hidden service",
 	},
 	cli.IntFlag{
 		Name:  "tor-port",
 		Usage: "Use a different port to connect to Tor",
 		Value: 9150,
 	},
 	cli.BoolFlag{
 		Name:  "code",
 		Usage: "Specifies this post is code",
 	},
 	cli.BoolFlag{
 		Name:  "verbose, v",
 		Usage: "Make the operation more talkative",
 	},
 	cli.StringFlag{
 		Name:  "font",
 		Usage: "Sets post font to given value",
 		Value: defaultFont,
 	},
 	cli.StringFlag{
 		Name:  "lang",
 		Usage: "Sets post language to given ISO 639-1 language code",
 		Value: "",
 	},
 	cli.StringFlag{
 		Name:  "user-agent",
 		Usage: "Sets the User-Agent for API requests",
 		Value: "",
 	},
 }
 
 func main() {
 	initialize()
 
 	cli.VersionFlag = cli.BoolFlag{
 		Name:  "version, V",
 		Usage: "print the version",
 	}
 
 	// Run the app
 	app := cli.NewApp()
 	app.Name = "writeas"
 	app.Version = version
 	app.Usage = "Publish text quickly"
 	app.Authors = []cli.Author{
 		{
 			Name:  "Write.as",
 			Email: "hello@write.as",
 		},
 	}
 	app.Action = cmdPost
 	app.Flags = postFlags
 	app.Commands = []cli.Command{
 		{
 			Name:   "post",
 			Usage:  "Alias for default action: create post from stdin",
 			Action: cmdPost,
 			Flags:  postFlags,
 			Description: `Create a new post on Write.as from stdin.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.`,
 		},
 		{
 			Name:  "new",
 			Usage: "Compose a new post from the command-line and publish",
 			Description: `An alternative to piping data to the program.
 
    On Windows, this will use 'copy con' to start reading what you input from the
    prompt. Press F6 or Ctrl-Z then Enter to end input.
    On *nix, this will use the best available text editor, starting with the 
    value set to the WRITAS_EDITOR or EDITOR environment variable, or vim, or
    finally nano.
 
    Use the --code flag to indicate that the post should use syntax 
    highlighting. Or use the --font [value] argument to set the post's 
    appearance, where [value] is mono, monospace (default), wrap (monospace 
    font with word wrapping), serif, or sans.
    
    If posting fails for any reason, 'writeas' will show you the temporary file
    location and how to pipe it to 'writeas' to retry.`,
 			Action: cmdNew,
 			Flags:  postFlags,
 		},
 		{
 			Name:        "publish",
 			Usage:       "Publish a file to Write.as",
 			Action:      cmdPublish,
 			Flags:       postFlags,
 		},
 		{
 			Name:   "delete",
 			Usage:  "Delete a post",
 			Action: cmdDelete,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Delete via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 			},
 		},
 		{
 			Name:   "update",
 			Usage:  "Update (overwrite) a post",
 			Action: cmdUpdate,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Update via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.BoolFlag{
 					Name:  "code",
 					Usage: "Specifies this post is code",
 				},
 				cli.StringFlag{
 					Name:  "font",
 					Usage: "Sets post font to given value",
 				},
 			},
 		},
 		{
 			Name:   "get",
 			Usage:  "Read a raw post",
 			Action: cmdGet,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Get from Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 			},
 		},
 		{
 			Name:  "add",
 			Usage: "Add an existing post locally",
 			Description: `A way to add an existing post to your local store for easy editing later.
 			
    This requires a post ID (from https://write.as/[ID]) and an Edit Token
    (exported from another Write.as client, such as the Android app).
 `,
 			Action: cmdAdd,
 		},
 		{
 			Name:   "list",
 			Usage:  "List local posts",
 			Action: cmdList,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "id",
 					Usage: "Show list with post IDs (default)",
 				},
 				cli.BoolFlag{
 					Name:  "url",
 					Usage: "Show list with URLs",
 				},
 			},
 		},
 		{
 			Name:   "fetch",
 			Usage:  "Fetch authenticated user's Write.as posts",
 			Action: cmdPull,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 			},
 		},
 		{
 			Name:   "auth",
 			Usage:  "Authenticate with Write.as",
 			Action: cmdAuth,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 				cli.StringFlag{
 					Name:  "u",
 					Usage: "Username for authentication",
 					Value: "",
 				},
 			},
 		},
 		{
 			Name:   "logout",
 			Usage:  "Log out of Write.as",
 			Action: cmdLogOut,
 			Flags: []cli.Flag{
 				cli.BoolFlag{
 					Name:  "tor, t",
 					Usage: "Authenticate via Tor hidden service",
 				},
 				cli.IntFlag{
 					Name:  "tor-port",
 					Usage: "Use a different port to connect to Tor",
 					Value: 9150,
 				},
 			},
 		},
 	}
 
 	cli.CommandHelpTemplate = `NAME:
    {{.Name}} - {{.Usage}}
 
 USAGE:
    writeas {{.Name}}{{if .Flags}} [command options]{{end}} [arguments...]{{if .Description}}
 
 DESCRIPTION:
    {{.Description}}{{end}}{{if .Flags}}
 
 OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{ end }}
 `
 
 	app.Run(os.Args)
 }
 
 func initialize() {
 	// Ensure we have a data directory to use
 	if !dataDirExists() {
 		createDataDir()
 	}
 }
 
 func readStdIn() []byte {
 	numBytes, numChunks := int64(0), int64(0)
 	r := bufio.NewReader(os.Stdin)
 	fullPost := []byte{}
 	buf := make([]byte, 0, 1024)
 	for {
 		n, err := r.Read(buf[:cap(buf)])
 		buf = buf[:n]
 		if n == 0 {
 			if err == nil {
 				continue
 			}
 			if err == io.EOF {
 				break
 			}
 			log.Fatal(err)
 		}
 		numChunks++
 		numBytes += int64(len(buf))
 
 		fullPost = append(fullPost, buf...)
 		if err != nil && err != io.EOF {
 			log.Fatal(err)
 		}
 	}
 
 	return fullPost
 }
 
 func handlePost(fullPost []byte, c *cli.Context) (*writeas.Post, error) {
 	tor := isTor(c)
 	if c.Int("tor-port") != 0 {
 		torPort = c.Int("tor-port")
 	}
 	if tor {
 		Info(c, "Posting to hidden service...")
 	} else {
 		Info(c, "Posting...")
 	}
 
 	return DoPost(c, fullPost, c.String("font"), false, tor, c.Bool("code"))
 }
diff --git a/cmd/writeas/posts.go b/cmd/writeas/posts.go
index a7f426d..175341a 100644
--- a/cmd/writeas/posts.go
+++ b/cmd/writeas/posts.go
@@ -1,165 +1,165 @@
 package main
 
 import (
 	"fmt"
-	"github.com/writeas/go-writeas"
 	"github.com/writeas/writeas-cli/fileutils"
+	"go.code.as/writeas.v2"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
 const (
 	postsFile = "posts.psv"
 	separator = `|`
 )
 
 // Post holds the basic authentication information for a Write.as post.
 type Post struct {
 	ID        string
 	EditToken string
 }
 
 func userDataDir() string {
 	return filepath.Join(parentDataDir(), dataDirName)
 }
 
 func dataDirExists() bool {
 	return fileutils.Exists(userDataDir())
 }
 
 func createDataDir() {
 	err := os.Mkdir(userDataDir(), 0700)
 	if err != nil {
 		if debug {
 			panic(err)
 		} else {
 			Errorln("Error creating data directory: %s", err)
 			return
 		}
 	}
 }
 
 func addPost(id, token string) error {
 	f, err := os.OpenFile(filepath.Join(userDataDir(), postsFile), os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0600)
 	if err != nil {
 		return fmt.Errorf("Error creating local posts list: %s", err)
 	}
 	defer f.Close()
 
 	l := fmt.Sprintf("%s%s%s\n", id, separator, token)
 
 	if _, err = f.WriteString(l); err != nil {
 		return fmt.Errorf("Error writing to local posts list: %s", err)
 	}
 
 	return nil
 }
 
 func tokenFromID(id string) string {
 	post := fileutils.FindLine(filepath.Join(userDataDir(), postsFile), id)
 	if post == "" {
 		return ""
 	}
 
 	parts := strings.Split(post, separator)
 	if len(parts) < 2 {
 		return ""
 	}
 
 	return parts[1]
 }
 
 func removePost(id string) {
 	fileutils.RemoveLine(filepath.Join(userDataDir(), postsFile), id)
 }
 
 func getPosts() *[]Post {
 	lines := fileutils.ReadData(filepath.Join(userDataDir(), postsFile))
 
 	posts := []Post{}
 
 	if lines != nil && len(*lines) > 0 {
 		parts := make([]string, 2)
 		for _, l := range *lines {
 			parts = strings.Split(l, separator)
 			if len(parts) < 2 {
 				continue
 			}
 			posts = append(posts, Post{ID: parts[0], EditToken: parts[1]})
 		}
 	}
 
 	return &posts
 }
 
 func composeNewPost() (string, *[]byte) {
 	f, err := fileutils.TempFile(os.TempDir(), "WApost", "txt")
 	if err != nil {
 		if debug {
 			panic(err)
 		} else {
 			Errorln("Error creating temp file: %s", err)
 			return "", nil
 		}
 	}
 	f.Close()
 
 	cmd := editPostCmd(f.Name())
 	if cmd == nil {
 		os.Remove(f.Name())
 
 		fmt.Println(noEditorErr)
 		return "", nil
 	}
 	cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
 	if err := cmd.Start(); err != nil {
 		os.Remove(f.Name())
 
 		if debug {
 			panic(err)
 		} else {
 			Errorln("Error starting editor: %s", err)
 			return "", nil
 		}
 	}
 
 	// If something fails past this point, the temporary post file won't be
 	// removed automatically. Calling function should handle this.
 	if err := cmd.Wait(); err != nil {
 		if debug {
 			panic(err)
 		} else {
 			Errorln("Editor finished with error: %s", err)
 			return "", nil
 		}
 	}
 
 	post, err := ioutil.ReadFile(f.Name())
 	if err != nil {
 		if debug {
 			panic(err)
 		} else {
 			Errorln("Error reading post: %s", err)
 			return "", nil
 		}
 	}
 	return f.Name(), &post
 }
 
 func WritePost(postsDir string, p *writeas.Post) error {
 	postFilename := p.ID
 	collDir := ""
 	if p.Collection != nil {
 		postFilename = p.Slug
 		collDir = p.Collection.Alias
 	}
 	postFilename += postFileExt
 
 	txtFile := p.Content
 	if p.Title != "" {
 		txtFile = "# " + p.Title + "\n\n" + txtFile
 	}
 	return ioutil.WriteFile(filepath.Join(postsDir, collDir, postFilename), []byte(txtFile), 0644)
 }
diff --git a/cmd/writeas/userconfig.go b/cmd/writeas/userconfig.go
index c9951a3..e904dff 100644
--- a/cmd/writeas/userconfig.go
+++ b/cmd/writeas/userconfig.go
@@ -1,90 +1,90 @@
 package main
 
 import (
 	"encoding/json"
-	"github.com/writeas/go-writeas"
 	"github.com/writeas/writeas-cli/fileutils"
+	"go.code.as/writeas.v2"
 	"gopkg.in/ini.v1"
 	"io/ioutil"
 	"path/filepath"
 )
 
 const (
 	userConfigFile = "config.ini"
 	userFile       = "user.json"
 )
 
 type (
 	APIConfig struct {
 	}
 
 	PostsConfig struct {
 		Directory string `ini:"directory"`
 	}
 
 	UserConfig struct {
 		API   APIConfig   `ini:"api"`
 		Posts PostsConfig `ini:"posts"`
 	}
 )
 
 func loadConfig() (*UserConfig, error) {
 	// TODO: load config to var shared across app
 	cfg, err := ini.LooseLoad(filepath.Join(userDataDir(), userConfigFile))
 	if err != nil {
 		return nil, err
 	}
 
 	// Parse INI file
 	uc := &UserConfig{}
 	err = cfg.MapTo(uc)
 	if err != nil {
 		return nil, err
 	}
 	return uc, nil
 }
 
 func saveConfig(uc *UserConfig) error {
 	cfg := ini.Empty()
 	err := ini.ReflectFrom(cfg, uc)
 	if err != nil {
 		return err
 	}
 
 	return cfg.SaveTo(filepath.Join(userDataDir(), userConfigFile))
 }
 
 func loadUser() (*writeas.AuthUser, error) {
 	fname := filepath.Join(userDataDir(), userFile)
 	userJSON, err := ioutil.ReadFile(fname)
 	if err != nil {
 		if !fileutils.Exists(fname) {
 			// Don't return a file-not-found error
 			return nil, nil
 		}
 		return nil, err
 	}
 
 	// Parse JSON file
 	u := &writeas.AuthUser{}
 	err = json.Unmarshal(userJSON, u)
 	if err != nil {
 		return nil, err
 	}
 	return u, nil
 }
 
 func saveUser(u *writeas.AuthUser) error {
 	// Marshal struct into pretty-printed JSON
 	userJSON, err := json.MarshalIndent(u, "", "  ")
 	if err != nil {
 		return err
 	}
 
 	// Save file
 	err = ioutil.WriteFile(filepath.Join(userDataDir(), userFile), userJSON, 0600)
 	if err != nil {
 		return err
 	}
 	return nil
 }