diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 96f57d3..e0ac760 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -50,6 +50,7 @@ dockers:
       - dive
     dockerfile: Dockerfile
     image_templates:
+      - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:latest'
       - '{{ envOrDefault "REGISTRY" "docker.io" }}/joschi/dive:{{ .Version }}'
     build_flag_templates:
       - "--build-arg=DOCKER_CLI_VERSION={{.Env.DOCKER_CLI_VERSION}}"
diff --git a/Makefile b/Makefile
index d2c19b6..3937bf9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ DOCKER_CLI_VERSION = 27.3.1
 
 # Command templates #################################
 LINT_CMD = $(TEMP_DIR)/golangci-lint run --tests=false --timeout=2m --config .golangci.yaml
-GOIMPORTS_CMD = $(TEMP_DIR)/gosimports -local github.com/wagoodman
+GOIMPORTS_CMD = $(TEMP_DIR)/gosimports -local github.com/joschi
 RELEASE_CMD = DOCKER_CLI_VERSION=$(DOCKER_CLI_VERSION) $(TEMP_DIR)/goreleaser release --clean
 SNAPSHOT_CMD = $(RELEASE_CMD) --skip=publish --skip=sign --snapshot
 CHRONICLE_CMD = $(TEMP_DIR)/chronicle
@@ -186,7 +186,7 @@ ci-test-docker-image:
 		--rm \
 		-t \
 		-v /var/run/docker.sock:/var/run/docker.sock \
-		'${PRODUCTION_REGISTRY}/wagoodman/dive:latest' \
+		'${PRODUCTION_REGISTRY}/joschi/dive:latest' \
 			'${TEST_IMAGE}' \
 			--ci
 
diff --git a/README.md b/README.md
index 0d82c1b..a99b885 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # dive
-[![GitHub release](https://img.shields.io/github/release/wagoodman/dive.svg)](https://github.com/wagoodman/dive/releases/latest)
-[![Validations](https://github.com/wagoodman/dive/actions/workflows/validations.yaml/badge.svg)](https://github.com/wagoodman/dive/actions/workflows/validations.yaml)
-[![Go Report Card](https://goreportcard.com/badge/github.com/wagoodman/dive)](https://goreportcard.com/report/github.com/wagoodman/dive)
-[![License: MIT](https://img.shields.io/badge/License-MIT%202.0-blue.svg)](https://github.com/wagoodman/dive/blob/main/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/joschi/dive.svg)](https://github.com/joschi/dive/releases/latest)
+[![Validations](https://github.com/joschi/dive/actions/workflows/validations.yaml/badge.svg)](https://github.com/joschi/dive/actions/workflows/validations.yaml)
+[![Go Report Card](https://goreportcard.com/badge/github.com/joschi/dive)](https://goreportcard.com/report/github.com/joschi/dive)
+[![License: MIT](https://img.shields.io/badge/License-MIT%202.0-blue.svg)](https://github.com/joschi/dive/blob/main/LICENSE)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg?style=flat)](https://www.paypal.me/wagoodman)
 
-**A tool for exploring a docker image, layer contents, and discovering ways to shrink the size of your Docker/OCI image.**
+**A tool for exploring a Docker image, layer contents, and discovering ways to shrink the size of your Docker/OCI image.**
 
 
 ![Image](.data/demo.gif)
@@ -15,9 +15,9 @@ To analyze a Docker image simply run dive with an image tag/id/digest:
 dive <your-image-tag>
 ```
 
-or you can dive with docker command directly
+or you can dive with Docker directly:
 ```
-alias dive="docker run -ti --rm  -v /var/run/docker.sock:/var/run/docker.sock wagoodman/dive"
+alias dive="docker run -ti --rm  -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/joschi/dive"
 dive <your-image-tag>
 
 # for example
@@ -29,7 +29,7 @@ or if you want to build your image then jump straight into analyzing it:
 dive build -t <some-tag> .
 ```
 
-Building on Macbook (supporting only the Docker container engine)
+Building on macOS (supporting only the Docker container engine):
 
 ```bash
 docker run --rm -it \
@@ -37,7 +37,7 @@ docker run --rm -it \
       -v  "$(pwd)":"$(pwd)" \
       -w "$(pwd)" \
       -v "$HOME/.dive.yaml":"$HOME/.dive.yaml" \
-      wagoodman/dive:latest build -t <some-tag> .
+      ghcr.io/joschi/dive:latest build -t <some-tag> .
 ```
 
 Additionally you can run this in your CI pipeline to ensure you're keeping wasted space to a minimum (this skips the UI):
@@ -97,8 +97,8 @@ With valid `source` options as such:
 
 Using debs:
 ```bash
-DIVE_VERSION=$(curl -sL "https://api.github.com/repos/wagoodman/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
-curl -fOL "https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.deb"
+DIVE_VERSION=$(curl -sL "https://api.github.com/repos/joschi/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
+curl -fOL "https://github.com/joschi/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.deb"
 sudo apt install ./dive_${DIVE_VERSION}_linux_amd64.deb
 ```
 
@@ -113,13 +113,13 @@ sudo snap connect dive:docker-daemon docker:docker-daemon
 > [!CAUTION]
 > The Snap method is not recommended if you installed Docker via `apt-get`, since it might break your existing Docker daemon.
 > 
-> See also: https://github.com/wagoodman/dive/issues/546
+> See also: https://github.com/joschi/dive/issues/546
 
 
 **RHEL/Centos**
 ```bash
-DIVE_VERSION=$(curl -sL "https://api.github.com/repos/wagoodman/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
-curl -fOL "https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.rpm"
+DIVE_VERSION=$(curl -sL "https://api.github.com/repos/joschi/dive/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
+curl -fOL "https://github.com/joschi/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.rpm"
 rpm -i dive_${DIVE_VERSION}_linux_amd64.rpm
 ```
 
@@ -145,7 +145,7 @@ If you use [MacPorts](https://www.macports.org):
 sudo port install dive
 ```
 
-Or download the latest Darwin build from the [releases page](https://github.com/wagoodman/dive/releases/latest).
+Or download the latest Darwin build from the [releases page](https://github.com/joschi/dive/releases/latest).
 
 **Windows**
 
@@ -167,13 +167,13 @@ If you use [winget](https://learn.microsoft.com/en-gb/windows/package-manager/):
 winget install --id wagoodman.dive
 ```
 
-Or download the latest Windows build from the [releases page](https://github.com/wagoodman/dive/releases/latest).
+Or download the latest Windows build from the [releases page](https://github.com/joschi/dive/releases/latest).
 
 **Go tools**
 Requires Go version 1.10 or higher.
 
 ```bash
-go install github.com/wagoodman/dive@latest
+go install github.com/joschi/dive@latest
 ```
 *Note*: installing in this way you will not see a proper version when running `dive -v`.
 
@@ -190,27 +190,21 @@ nix-env -iA nixpkgs.dive
 
 **Docker**
 ```bash
-docker pull wagoodman/dive
+docker pull ghcr.io/joschi/dive
 ```
 
-or
-
-```bash
-docker pull quay.io/wagoodman/dive
-```
-
-When running you'll need to include the docker socket file:
+When running you'll need to include the Docker socket file:
 ```bash
 docker run --rm -it \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    wagoodman/dive:latest <dive arguments...>
+    ghcr.io/joschi/dive:latest <dive arguments...>
 ```
 
 Docker for Windows (showing PowerShell compatible line breaks; collapse to a single line for Command Prompt compatibility)
 ```bash
 docker run --rm -it `
     -v /var/run/docker.sock:/var/run/docker.sock `
-    wagoodman/dive:latest <dive arguments...>
+    ghcr.io/joschi/dive:latest <dive arguments...>
 ```
 
 **Note:** depending on the version of docker you are running locally you may need to specify the docker API version as an environment variable:
@@ -222,7 +216,7 @@ or if you are running with a docker image:
 docker run --rm -it \
     -v /var/run/docker.sock:/var/run/docker.sock \
     -e DOCKER_API_VERSION=1.37 \
-    wagoodman/dive:latest <dive arguments...>
+    ghcr.io/joschi/dive:latest <dive arguments...>
 ```
 
 ## CI Integration
diff --git a/RELEASE.md b/RELEASE.md
index a58c6cf..21d7205 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -16,7 +16,7 @@ If a release is found to be problematic, it can be retracted with the following
 
 - Deleting the GitHub Release
 - Untag the docker images in the `docker.io` registry
-- Revert the brew formula in [`wagoodman/homebrew-dive`](https://github.com/wagoodman/homebrew-dive) to point to the previous release
+- Revert the brew formula in [`joschi/homebrew-dive`](https://github.com/joschi/homebrew-dive) to point to the previous release
 - Add a new `retract` entry in the go.mod for the versioned release
 
 **Note**: do not delete release tags from the git repository since there may already be references to the release
diff --git a/cmd/analyze.go b/cmd/analyze.go
index 31a56f8..ba13c27 100644
--- a/cmd/analyze.go
+++ b/cmd/analyze.go
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive"
-	"github.com/wagoodman/dive/runtime"
+	"github.com/joschi/dive/dive"
+	"github.com/joschi/dive/runtime"
 )
 
 // doAnalyzeCmd takes a docker image tag, digest, or id and displays the
diff --git a/cmd/build.go b/cmd/build.go
index 84b029e..9e44975 100644
--- a/cmd/build.go
+++ b/cmd/build.go
@@ -4,8 +4,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive"
-	"github.com/wagoodman/dive/runtime"
+	"github.com/joschi/dive/dive"
+	"github.com/joschi/dive/runtime"
 )
 
 // buildCmd represents the build command
diff --git a/cmd/root.go b/cmd/root.go
index ad9f10b..1e23c22 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -12,8 +12,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive"
-	"github.com/wagoodman/dive/dive/filetree"
+	"github.com/joschi/dive/dive"
+	"github.com/joschi/dive/dive/filetree"
 )
 
 var cfgFile string
diff --git a/dive/get_image_resolver.go b/dive/get_image_resolver.go
index 4d53ed9..d751802 100644
--- a/dive/get_image_resolver.go
+++ b/dive/get_image_resolver.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/dive/image/docker"
-	"github.com/wagoodman/dive/dive/image/podman"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/dive/image/docker"
+	"github.com/joschi/dive/dive/image/podman"
 )
 
 const (
diff --git a/dive/image/analyzer.go b/dive/image/analyzer.go
index 58b8da8..6318e93 100644
--- a/dive/image/analyzer.go
+++ b/dive/image/analyzer.go
@@ -1,7 +1,7 @@
 package image
 
 import (
-	"github.com/wagoodman/dive/dive/filetree"
+	"github.com/joschi/dive/dive/filetree"
 )
 
 type Analyzer interface {
diff --git a/dive/image/docker/archive_resolver.go b/dive/image/docker/archive_resolver.go
index 5404837..86b71e0 100644
--- a/dive/image/docker/archive_resolver.go
+++ b/dive/image/docker/archive_resolver.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 type archiveResolver struct{}
diff --git a/dive/image/docker/cli.go b/dive/image/docker/cli.go
index a1d3689..8a18a46 100644
--- a/dive/image/docker/cli.go
+++ b/dive/image/docker/cli.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/utils"
 )
 
 // runDockerCmd runs a given Docker command in the current tty
diff --git a/dive/image/docker/engine_resolver.go b/dive/image/docker/engine_resolver.go
index 20bd58d..5382b31 100644
--- a/dive/image/docker/engine_resolver.go
+++ b/dive/image/docker/engine_resolver.go
@@ -14,7 +14,7 @@ import (
 	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 type engineResolver struct{}
diff --git a/dive/image/docker/image_archive.go b/dive/image/docker/image_archive.go
index c2eda0c..aeab665 100644
--- a/dive/image/docker/image_archive.go
+++ b/dive/image/docker/image_archive.go
@@ -12,8 +12,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
 )
 
 type ImageArchive struct {
diff --git a/dive/image/docker/layer.go b/dive/image/docker/layer.go
index 7222735..c252714 100644
--- a/dive/image/docker/layer.go
+++ b/dive/image/docker/layer.go
@@ -3,8 +3,8 @@ package docker
 import (
 	"strings"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
 )
 
 // Layer represents a Docker image layer and metadata
diff --git a/dive/image/docker/testing.go b/dive/image/docker/testing.go
index f8d8817..af939fc 100644
--- a/dive/image/docker/testing.go
+++ b/dive/image/docker/testing.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 func TestLoadArchive(tarPath string) (*ImageArchive, error) {
diff --git a/dive/image/image.go b/dive/image/image.go
index 04a1be2..34c366d 100644
--- a/dive/image/image.go
+++ b/dive/image/image.go
@@ -1,7 +1,7 @@
 package image
 
 import (
-	"github.com/wagoodman/dive/dive/filetree"
+	"github.com/joschi/dive/dive/filetree"
 )
 
 type Image struct {
diff --git a/dive/image/layer.go b/dive/image/layer.go
index 66448f2..f76cddc 100644
--- a/dive/image/layer.go
+++ b/dive/image/layer.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/dustin/go-humanize"
 
-	"github.com/wagoodman/dive/dive/filetree"
+	"github.com/joschi/dive/dive/filetree"
 )
 
 const (
diff --git a/dive/image/podman/cli.go b/dive/image/podman/cli.go
index 73d1e0a..5f0c89e 100644
--- a/dive/image/podman/cli.go
+++ b/dive/image/podman/cli.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"os/exec"
 
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/utils"
 )
 
 // runPodmanCmd runs a given Podman command in the current tty
diff --git a/dive/image/podman/resolver.go b/dive/image/podman/resolver.go
index 80852a6..79f20d0 100644
--- a/dive/image/podman/resolver.go
+++ b/dive/image/podman/resolver.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/dive/image/docker"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/dive/image/docker"
 )
 
 type resolver struct{}
diff --git a/dive/image/podman/resolver_unsupported.go b/dive/image/podman/resolver_unsupported.go
index 120f62e..d24b95a 100644
--- a/dive/image/podman/resolver_unsupported.go
+++ b/dive/image/podman/resolver_unsupported.go
@@ -6,7 +6,7 @@ package podman
 import (
 	"fmt"
 
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 type resolver struct{}
diff --git a/go.mod b/go.mod
index cf8b334..427ebd8 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/wagoodman/dive
+module github.com/joschi/dive
 
 go 1.23
 
diff --git a/main.go b/main.go
index ba3b90c..6e4d691 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@
 package main
 
 import (
-	"github.com/wagoodman/dive/cmd"
+	"github.com/joschi/dive/cmd"
 )
 
 var (
diff --git a/runtime/ci/evaluator.go b/runtime/ci/evaluator.go
index c48f6e6..dfb77d9 100644
--- a/runtime/ci/evaluator.go
+++ b/runtime/ci/evaluator.go
@@ -10,8 +10,8 @@ import (
 	"github.com/logrusorgru/aurora/v4"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/utils"
 )
 
 type CiEvaluator struct {
diff --git a/runtime/ci/evaluator_test.go b/runtime/ci/evaluator_test.go
index c513adf..629a683 100644
--- a/runtime/ci/evaluator_test.go
+++ b/runtime/ci/evaluator_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/image/docker"
+	"github.com/joschi/dive/dive/image/docker"
 )
 
 func Test_Evaluator(t *testing.T) {
diff --git a/runtime/ci/rule.go b/runtime/ci/rule.go
index f9e348d..f044116 100644
--- a/runtime/ci/rule.go
+++ b/runtime/ci/rule.go
@@ -8,7 +8,7 @@ import (
 	"github.com/logrusorgru/aurora/v4"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 const (
diff --git a/runtime/export/export.go b/runtime/export/export.go
index a9a3660..e646cd9 100644
--- a/runtime/export/export.go
+++ b/runtime/export/export.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	diveImage "github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/filetree"
+	diveImage "github.com/joschi/dive/dive/image"
 )
 
 type export struct {
diff --git a/runtime/export/export_test.go b/runtime/export/export_test.go
index d32e574..293c965 100644
--- a/runtime/export/export_test.go
+++ b/runtime/export/export_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/wagoodman/dive/dive/image/docker"
+	"github.com/joschi/dive/dive/image/docker"
 )
 
 func Test_Export(t *testing.T) {
diff --git a/runtime/export/layer.go b/runtime/export/layer.go
index 85d5f57..49fc028 100644
--- a/runtime/export/layer.go
+++ b/runtime/export/layer.go
@@ -1,7 +1,7 @@
 package export
 
 import (
-	"github.com/wagoodman/dive/dive/filetree"
+	"github.com/joschi/dive/dive/filetree"
 )
 
 type layer struct {
diff --git a/runtime/options.go b/runtime/options.go
index c9c5a1e..b01d7bb 100644
--- a/runtime/options.go
+++ b/runtime/options.go
@@ -3,7 +3,7 @@ package runtime
 import (
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive"
+	"github.com/joschi/dive/dive"
 )
 
 type Options struct {
diff --git a/runtime/run.go b/runtime/run.go
index 7e4814c..fb5905b 100644
--- a/runtime/run.go
+++ b/runtime/run.go
@@ -9,13 +9,13 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 
-	"github.com/wagoodman/dive/dive"
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/runtime/ci"
-	"github.com/wagoodman/dive/runtime/export"
-	"github.com/wagoodman/dive/runtime/ui"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/dive"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/runtime/ci"
+	"github.com/joschi/dive/runtime/export"
+	"github.com/joschi/dive/runtime/ui"
+	"github.com/joschi/dive/utils"
 )
 
 func run(enableUi bool, options Options, imageResolver image.Resolver, events eventChannel, filesystem afero.Fs) {
diff --git a/runtime/run_test.go b/runtime/run_test.go
index 6362ea7..20a7dab 100644
--- a/runtime/run_test.go
+++ b/runtime/run_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/spf13/afero"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive"
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/dive/image/docker"
+	"github.com/joschi/dive/dive"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/dive/image/docker"
 )
 
 type defaultResolver struct{}
diff --git a/runtime/ui/app.go b/runtime/ui/app.go
index ac92249..cf00fab 100644
--- a/runtime/ui/app.go
+++ b/runtime/ui/app.go
@@ -6,11 +6,11 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/runtime/ui/key"
-	"github.com/wagoodman/dive/runtime/ui/layout"
-	"github.com/wagoodman/dive/runtime/ui/layout/compound"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/runtime/ui/key"
+	"github.com/joschi/dive/runtime/ui/layout"
+	"github.com/joschi/dive/runtime/ui/layout/compound"
 )
 
 const debug = false
diff --git a/runtime/ui/controller.go b/runtime/ui/controller.go
index fd40398..4fd9df1 100644
--- a/runtime/ui/controller.go
+++ b/runtime/ui/controller.go
@@ -6,10 +6,10 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/runtime/ui/view"
-	"github.com/wagoodman/dive/runtime/ui/viewmodel"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/runtime/ui/view"
+	"github.com/joschi/dive/runtime/ui/viewmodel"
 )
 
 type Controller struct {
diff --git a/runtime/ui/key/binding.go b/runtime/ui/key/binding.go
index ff7c1a7..2bd6597 100644
--- a/runtime/ui/key/binding.go
+++ b/runtime/ui/key/binding.go
@@ -8,7 +8,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/format"
 )
 
 type BindingInfo struct {
diff --git a/runtime/ui/layout/compound/layer_details_column.go b/runtime/ui/layout/compound/layer_details_column.go
index 92363fb..8fb73f3 100644
--- a/runtime/ui/layout/compound/layer_details_column.go
+++ b/runtime/ui/layout/compound/layer_details_column.go
@@ -4,8 +4,8 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/runtime/ui/view"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/runtime/ui/view"
+	"github.com/joschi/dive/utils"
 )
 
 type LayerDetailsCompoundLayout struct {
diff --git a/runtime/ui/view/debug.go b/runtime/ui/view/debug.go
index 3478631..726daa0 100644
--- a/runtime/ui/view/debug.go
+++ b/runtime/ui/view/debug.go
@@ -6,8 +6,8 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/utils"
 )
 
 // Debug is just for me :)
diff --git a/runtime/ui/view/filetree.go b/runtime/ui/view/filetree.go
index 923f7a9..125aec7 100644
--- a/runtime/ui/view/filetree.go
+++ b/runtime/ui/view/filetree.go
@@ -8,11 +8,11 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/runtime/ui/key"
-	"github.com/wagoodman/dive/runtime/ui/viewmodel"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/key"
+	"github.com/joschi/dive/runtime/ui/viewmodel"
+	"github.com/joschi/dive/utils"
 )
 
 type ViewOptionChangeListener func() error
diff --git a/runtime/ui/view/filter.go b/runtime/ui/view/filter.go
index ccbff27..1c8a9d9 100644
--- a/runtime/ui/view/filter.go
+++ b/runtime/ui/view/filter.go
@@ -7,8 +7,8 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/utils"
 )
 
 type FilterEditListener func(string) error
diff --git a/runtime/ui/view/image_details.go b/runtime/ui/view/image_details.go
index 977a72c..31c78fc 100644
--- a/runtime/ui/view/image_details.go
+++ b/runtime/ui/view/image_details.go
@@ -9,9 +9,9 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/runtime/ui/key"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/key"
 )
 
 type ImageDetails struct {
diff --git a/runtime/ui/view/layer.go b/runtime/ui/view/layer.go
index 9aba279..309f84e 100644
--- a/runtime/ui/view/layer.go
+++ b/runtime/ui/view/layer.go
@@ -7,10 +7,10 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/runtime/ui/key"
-	"github.com/wagoodman/dive/runtime/ui/viewmodel"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/key"
+	"github.com/joschi/dive/runtime/ui/viewmodel"
 )
 
 // Layer holds the UI objects and data models for populating the lower-left pane.
diff --git a/runtime/ui/view/layer_change_listener.go b/runtime/ui/view/layer_change_listener.go
index 3a7096f..2369b6a 100644
--- a/runtime/ui/view/layer_change_listener.go
+++ b/runtime/ui/view/layer_change_listener.go
@@ -1,5 +1,5 @@
 package view
 
-import "github.com/wagoodman/dive/runtime/ui/viewmodel"
+import "github.com/joschi/dive/runtime/ui/viewmodel"
 
 type LayerChangeListener func(viewmodel.LayerSelection) error
diff --git a/runtime/ui/view/layer_details.go b/runtime/ui/view/layer_details.go
index 0334fb2..ffea0d2 100644
--- a/runtime/ui/view/layer_details.go
+++ b/runtime/ui/view/layer_details.go
@@ -8,9 +8,9 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/dive/image"
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/runtime/ui/key"
+	"github.com/joschi/dive/dive/image"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/key"
 )
 
 type LayerDetails struct {
diff --git a/runtime/ui/view/status.go b/runtime/ui/view/status.go
index 648ce2c..c17fe62 100644
--- a/runtime/ui/view/status.go
+++ b/runtime/ui/view/status.go
@@ -7,9 +7,9 @@ import (
 	"github.com/awesome-gocui/gocui"
 	"github.com/sirupsen/logrus"
 
-	"github.com/wagoodman/dive/runtime/ui/format"
-	"github.com/wagoodman/dive/runtime/ui/key"
-	"github.com/wagoodman/dive/utils"
+	"github.com/joschi/dive/runtime/ui/format"
+	"github.com/joschi/dive/runtime/ui/key"
+	"github.com/joschi/dive/utils"
 )
 
 // Status holds the UI objects and data models for populating the bottom-most pane. Specifically the panel
diff --git a/runtime/ui/view/views.go b/runtime/ui/view/views.go
index 785f5d3..c78191c 100644
--- a/runtime/ui/view/views.go
+++ b/runtime/ui/view/views.go
@@ -3,8 +3,8 @@ package view
 import (
 	"github.com/awesome-gocui/gocui"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image"
 )
 
 type IView interface {
diff --git a/runtime/ui/viewmodel/filetree.go b/runtime/ui/viewmodel/filetree.go
index a5f87d0..2cf7650 100644
--- a/runtime/ui/viewmodel/filetree.go
+++ b/runtime/ui/viewmodel/filetree.go
@@ -10,8 +10,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/runtime/ui/format"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/runtime/ui/format"
 )
 
 // FileTreeViewModel holds the UI objects and data models for populating the right pane. Specifically the pane that
diff --git a/runtime/ui/viewmodel/filetree_test.go b/runtime/ui/viewmodel/filetree_test.go
index f315b41..c0e6be3 100644
--- a/runtime/ui/viewmodel/filetree_test.go
+++ b/runtime/ui/viewmodel/filetree_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/fatih/color"
 	"github.com/sergi/go-diff/diffmatchpatch"
 
-	"github.com/wagoodman/dive/dive/filetree"
-	"github.com/wagoodman/dive/dive/image/docker"
-	"github.com/wagoodman/dive/runtime/ui/format"
+	"github.com/joschi/dive/dive/filetree"
+	"github.com/joschi/dive/dive/image/docker"
+	"github.com/joschi/dive/runtime/ui/format"
 )
 
 const allowTestDataCapture = false
diff --git a/runtime/ui/viewmodel/layer_selection.go b/runtime/ui/viewmodel/layer_selection.go
index 47bc5e2..d702046 100644
--- a/runtime/ui/viewmodel/layer_selection.go
+++ b/runtime/ui/viewmodel/layer_selection.go
@@ -1,7 +1,7 @@
 package viewmodel
 
 import (
-	"github.com/wagoodman/dive/dive/image"
+	"github.com/joschi/dive/dive/image"
 )
 
 type LayerSelection struct {
diff --git a/runtime/ui/viewmodel/layer_set_state.go b/runtime/ui/viewmodel/layer_set_state.go
index 3f02817..97b3958 100644
--- a/runtime/ui/viewmodel/layer_set_state.go
+++ b/runtime/ui/viewmodel/layer_set_state.go
@@ -1,6 +1,6 @@
 package viewmodel
 
-import "github.com/wagoodman/dive/dive/image"
+import "github.com/joschi/dive/dive/image"
 
 type LayerSetState struct {
 	LayerIndex        int