diff --git a/.goreleaser.yml b/.goreleaser.yml
index 60f72ca691a84326f14101a9a61f98706caec66a..8ed8134960f9ec00c01c96d4d192e5b55bc9605d 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -13,7 +13,7 @@ before:
 builds:
   - # The main build configuration for your CLI.
     # The binary name will be 'email-cli'.
-    id: "email-cli"
+    id: "matcha"
     # The main entrypoint of your application.
     main: .
     # The Go compiler to use.
@@ -73,11 +73,11 @@ release:
 brews:
   - # The configuration for your Homebrew tap.
     # The name of your formula file will be 'email-cli.rb'.
-    name: email-cli
+    name: matcha
     # The GitHub repository for your Homebrew tap.
     tap:
-      owner: andrinoff
-      name: homebrew-email-cli
+      owner: floatpane
+      name: homebrew-matcha
       # The token to use for pushing to the tap repository.
       # It uses the secret you'll create in your repository settings.
       token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
@@ -90,7 +90,7 @@ brews:
     # A description for your formula.
     description: "A beautiful and functional email client for your terminal."
     # The homepage URL for your formula.
-    homepage: "https://github.com/andrinoff/email-cli"
+    homepage: "https://matcha.floatpane.com"
 
     # The dependencies for your formula.
     # Since it's a pre-compiled binary, there are no runtime dependencies.
@@ -104,12 +104,12 @@ brews:
     # The installation instructions for your formula.
     # This tells Homebrew to just install the binary.
     install: |
-      bin.install "email-cli"
+      bin.install "matcha"
 
 # 'snapcrafts' configures the Snapcraft integration.
 snapcrafts:
   - # The configuration for your Snapcraft package.
-    name: email-cli
+    name: matcha
     publish: true
     summary: "A beautiful and functional email client for your terminal."
     description: |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index baec6003219ff1ec952418ca5604ed3038d57b37..ed6eacf32e14313368a9ac021759c2d6c346891e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ First off, thank you for considering contributing to Email CLI! It's people like
 
 ### Reporting Bugs
 
-If you find a bug, please open an issue on our [GitHub issues page](https://github.com/andrinoff/email-cli/issues). Please include as much detail as possible, including:
+If you find a bug, please open an issue on our [GitHub issues page](https://github.com/floatpane/matcha/issues). Please include as much detail as possible, including:
 
 - A clear and descriptive title.
 - Steps to reproduce the bug.
@@ -16,7 +16,7 @@ If you find a bug, please open an issue on our [GitHub issues page](https://gith
 
 ### Suggesting Enhancements
 
-If you have an idea for a new feature or an improvement to an existing one, please open an issue on our [GitHub issues page](https://github.com/andrinoff/email-cli/issues). Please provide a clear description of the enhancement and why you think it would be a good addition.
+If you have an idea for a new feature or an improvement to an existing one, please open an issue on our [GitHub issues page](https://github.com/floatpane/matcha/issues). Please provide a clear description of the enhancement and why you think it would be a good addition.
 
 ### Pull Requests
 
@@ -37,7 +37,7 @@ To get started with development, you'll need to have Go installed.
 
 1.  Clone the repository:
     ```bash
-    git clone https://github.com/andrinoff/email-cli.git
+    git clone https://github.com/floatpane/matcha.git
     cd email-cli
     ```
 2.  Install dependencies:
diff --git a/LICENSE b/LICENSE
index ec328bbb4417bcd03dd4f8e2125f2c7c07868dd0..c619cf3c72f89809c0570bea702955230efb8898 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2025-present Drew Smirnoff
+Copyright 2025-present floatpane
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/README.md b/README.md
index e81d717cf6b66bd93e35716b7448b3ff68725e12..73c8d04d3729e52c40e8d26d8b1669da04178df1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Email CLI 🦫
+# Matcha Client 🍵
 
 <div align="center">
 
@@ -8,17 +8,17 @@
 
 ---
 
-[![Go CI](https://github.com/andrinoff/email-cli/actions/workflows/ci.yml/badge.svg)](https://github.com/andrinoff/email-cli/actions/workflows/ci.yml)
-[![Go Release](https://github.com/andrinoff/email-cli/actions/workflows/release.yml/badge.svg)](https://github.com/andrinoff/email-cli/actions/workflows/release.yml)
+[![Go CI](https://github.com/floatpane/matcha/actions/workflows/ci.yml/badge.svg)](https://github.com/floatpane/matcha/actions/workflows/ci.yml)
+[![Go Release](https://github.com/floatpane/matcha/actions/workflows/release.yml/badge.svg)](https://github.com/floatpane/matcha/actions/workflows/release.yml)
 [![GoReleaser](https://img.shields.io/badge/GoReleaser-blue?logo=goreleaser)](https://goreleaser.com)
-[![Go Version](https://img.shields.io/github/go-mod/go-version/andrinoff/email-cli)](https://golang.org)
-[![Go Report Card](https://goreportcard.com/badge/github.com/andrinoff/email-cli)](https://goreportcard.com/report/github.com/andrinoff/email-cli)
+[![Go Version](https://img.shields.io/github/go-mod/go-version/floatpane/matcha)](https://golang.org)
+[![Go Report Card](https://goreportcard.com/badge/github.com/floatpane/matcha)](https://goreportcard.com/report/github.com/floatpane/matcha)
 
-[![GitHub release (latest by date)](https://img.shields.io/github/v/release/andrinoff/email-cli)](https://github.com/andrinoff/email-cli/releases)
-[![GitHub All Releases](https://img.shields.io/github/downloads/andrinoff/email-cli/total)](https://github.com/andrinoff/email-cli/releases)
-[![GitHub stars](https://img.shields.io/github/stars/andrinoff/email-cli)](https://github.com/andrinoff/email-cli/stargazers)
-[![GitHub issues](https://img.shields.io/github/issues/andrinoff/email-cli)](https://github.com/andrinoff/email-cli/issues)
-[![GitHub license](https://img.shields.io/github/license/andrinoff/email-cli)](https://github.com/andrinoff/email-cli/blob/master/LICENSE)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/floatpane/matcha)](https://github.com/floatpane/matcha/releases)
+[![GitHub All Releases](https://img.shields.io/github/downloads/floatpane/matcha/total)](https://github.com/floatpane/matcha/releases)
+[![GitHub stars](https://img.shields.io/github/stars/floatpane/matcha)](https://github.com/floatpane/matcha/stargazers)
+[![GitHub issues](https://img.shields.io/github/issues/floatpane/matcha)](https://github.com/floatpane/matcha/issues)
+[![GitHub license](https://img.shields.io/github/license/floatpane/matcha)](https://github.com/floatpane/matcha/blob/master/LICENSE)
 
 [![macOS](https://img.shields.io/badge/macOS-Supported-000000?logo=macos&logoColor=white)](https://www.apple.com/macos)
 [![Linux](https://img.shields.io/badge/Linux-Supported-FCC624?logo=linux&logoColor=black)](https://www.linux.org/)
@@ -26,7 +26,7 @@
 [![Snapcraft](https://img.shields.io/badge/snap-available-82BEA0.svg?logo=snapcraft)](https://snapcraft.io/email-cli)
 
 [![Patreon](https://img.shields.io/badge/Patreon-F96854?logo=patreon&logoColor=white)](https://patreon.com/andrinoff)
-[![GitHub contributors](https://img.shields.io/github/contributors/andrinoff/email-cli)](https://github.com/andrinoff/email-cli/graphs/contributors)
+[![GitHub contributors](https://img.shields.io/github/contributors/floatpane/matcha)](https://github.com/floatpane/matcha/graphs/contributors)
 [![Built with Bubble Tea](https://img.shields.io/badge/Built%20with-Bubble%20Tea-FF75B7.svg)](https://github.com/charmbracelet/bubbletea)
 
 A beautiful and functional email client for your terminal, built with Go and the charming Bubble Tea TUI library. Never leave your command line to check your inbox or send an email again!
@@ -53,7 +53,7 @@ There are several ways to install Email CLI.
 #### Homebrew 🍺 (macOS & Linux)
 
 ```bash
-brew tap andrinoff/email-cli
+brew tap floatpane/matcha
 brew install email-cli
 ```
 
@@ -79,7 +79,7 @@ Email CLI is written in **Go**. To build it manually:
 2.  Clone the repository:
 
     ```bash
-    git clone https://github.com/andrinoff/email-cli.git
+    git clone https://github.com/floatpane/matcha.git
     ```
 
 3.  Navigate to the project folder:
@@ -102,7 +102,3 @@ Email CLI is written in **Go**. To build it manually:
 ## License 📄
 
 This project is distributed under the MIT License. See the `LICENSE` file for more information.
-
----
-
-Made by [@andrinoff](https://andrinoff.com)
diff --git a/assets/logo.png b/assets/logo.png
index 6faf0bc626116da1136cae05a326c316dd696c20..318dae7bc5ca550b249094a7b05ec15cdc2df0bf 100644
Binary files a/assets/logo.png and b/assets/logo.png differ
diff --git a/go.mod b/go.mod
index 4c7e666720ecb8d3e740a847ebb95cd5b59666ea..95bd4b8799a734e2d991e7f3e2cda499fe70e5ae 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/andrinoff/email-cli
+module github.com/floatpane/matcha
 
 go 1.24.5
 
diff --git a/main.go b/main.go
index a5079d01f4bb0669d2e3acc272faae4c7b2f7133..09a49dbe0cebd6ccd6aff1354b97f2941704e52c 100644
--- a/main.go
+++ b/main.go
@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/andrinoff/email-cli/config"
-	"github.com/andrinoff/email-cli/fetcher"
-	"github.com/andrinoff/email-cli/sender"
-	"github.com/andrinoff/email-cli/tui"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/floatpane/matcha/config"
+	"github.com/floatpane/matcha/fetcher"
+	"github.com/floatpane/matcha/sender"
+	"github.com/floatpane/matcha/tui"
 	"github.com/google/uuid"
 	"github.com/yuin/goldmark"
 	"github.com/yuin/goldmark/renderer/html"
diff --git a/public/assets/logo.png b/public/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..318dae7bc5ca550b249094a7b05ec15cdc2df0bf
Binary files /dev/null and b/public/assets/logo.png differ
diff --git a/sender/sender.go b/sender/sender.go
index c1a6e85c74aabfd5b38133596a7fa98b2aa12628..38bf1cc1627aa9c183ebeb7cc28edf8f6618db90 100644
--- a/sender/sender.go
+++ b/sender/sender.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/andrinoff/email-cli/config"
+	"github.com/floatpane/matcha/config"
 )
 
 // generateMessageID creates a unique Message-ID header.
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f06e0711700c7fe02fb849b1775747c11255a467..a03d47dc2f0c14763cdc11062c4f1e7858046322 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -20,4 +20,4 @@ parts:
   email-cli:
     plugin: go
     source: .
-    go-importpath: github.com/andrinoff/email-cli
+    go-importpath: github.com/floatpane/matcha
diff --git a/tui/email_view.go b/tui/email_view.go
index a1c75594383d7037175a99de0aeaa6dff752f6cf..1396481989ab334f2086972480ebe8ff1beb885e 100644
--- a/tui/email_view.go
+++ b/tui/email_view.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/andrinoff/email-cli/fetcher"
-	"github.com/andrinoff/email-cli/view"
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/floatpane/matcha/fetcher"
+	"github.com/floatpane/matcha/view"
 )
 
 var (
diff --git a/tui/email_view_test.go b/tui/email_view_test.go
index 67b4ec5d39ff0a005c35bd4ba176c967e0c4956e..6572bc1653095c0ad5eed4dd2aa16e3a14caf0d5 100644
--- a/tui/email_view_test.go
+++ b/tui/email_view_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/andrinoff/email-cli/fetcher"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/floatpane/matcha/fetcher"
 )
 
 func TestEmailViewUpdate(t *testing.T) {
diff --git a/tui/inbox.go b/tui/inbox.go
index d874b28b3b852468ac126a31cee34cb72d3a3bcd..86b9dc45f2e71cfd2a770648c976f4048c2633b1 100644
--- a/tui/inbox.go
+++ b/tui/inbox.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/andrinoff/email-cli/fetcher"
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/list"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/floatpane/matcha/fetcher"
 )
 
 var (
diff --git a/tui/inbox_test.go b/tui/inbox_test.go
index e0ff3b41c0175a227f8220e442a0bf2edf9da9e6..0cf79058a86e1575db83ce2ece39eb0c0d738f3a 100644
--- a/tui/inbox_test.go
+++ b/tui/inbox_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/andrinoff/email-cli/fetcher"
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/floatpane/matcha/fetcher"
 )
 
 // TestInboxUpdate verifies the state transitions in the inbox view.
diff --git a/tui/messages.go b/tui/messages.go
index d34659a6ecb5145923b97ac274515a633fc89fe9..92a50d6813b3bc85c2de58dd06e61c04efd05e46 100644
--- a/tui/messages.go
+++ b/tui/messages.go
@@ -1,6 +1,6 @@
 package tui
 
-import "github.com/andrinoff/email-cli/fetcher"
+import "github.com/floatpane/matcha/fetcher"
 
 type ViewEmailMsg struct {
 	Index int