diff --git a/README.md b/README.md
index 1161e10..37dc52e 100644
--- a/README.md
+++ b/README.md
@@ -31,24 +31,77 @@
 </div>
 
 ## Roadmap
-
-Core functionality:
-
+### Core Functionality
 - [x] Rate Limiter (hint: couldn't be fully tested due to [an Issue with the Spacebar Server](https://github.com/spacebarchat/server/issues/1022))
-- [x] Login (conventional way) (Guess what? Found [an Issue with the Spacebar Server](https://github.com/spacebarchat/server/pull/1043) :3)
-- [ ] 2FA
-- [x] Registration (encountered another [Issue with the Spacebar Server](https://github.com/spacebarchat/server/issues/1040) which makes some error messages an empty string)
-- [x] Gateway Events, multithreaded
-- [x] Sending messages (Text, Images, Attachments)
-- [x] Events (Message, User, Channel, etc.)
-- [ ] Adding, deleting and editing channels
-- [ ] User profile customization
+- [x] [Login (the conventional way)](https://github.com/polyphony-chat/chorus/issues/1)
+- [ ] [2FA](https://github.com/polyphony-chat/chorus/issues/40)
+- [x] [Registration](https://github.com/polyphony-chat/chorus/issues/1)
+
+### Messaging
+- [x] [Sending messages](https://github.com/polyphony-chat/chorus/issues/23)
+- [ ] [Events (Message, User, Channel, etc.)](https://github.com/polyphony-chat/chorus/issues/51)
+- [x] Channel creation
+- [x] Channel deletion
+- [ ] Channel management (name, description, icon, etc.)
 - [ ] Deleting messages
+- [ ] Message threads
+- [ ] Reactions
+- [ ] Message Search
+- [ ] Message history
+
+### User Management
+- [ ] User profile customization
+- [x] Gettings users and user profiles
+- [ ] Friend requests
+- [ ] Blocking users
+- [ ] User presence (online, offline, idle, etc.)
+- [ ] User status (custom status, etc.)
+- [x] Account deletion
+
+### Additional Features
 - [ ] Emoji
 - [ ] Stickers
-- [ ] Listing users and user profiles
-- [ ] Message threads
 - [ ] Forum channels
+- [ ] Server discovery
+- [ ] Server templates
+
+### Voice and Video
+- [ ] Voice chat support
+- [ ] Video chat support
+
+### Permissions and Roles
+- [ ] Role management (creation, deletion, modification)
+- [ ] Permission management (assigning and revoking permissions)
+- [ ] Channel-specific permissions
+- [ ] Role-based access control
+
+### Server Management
+- [x] Server creation
+- [x] Server deletion
+- [ ] Server settings management (name, description, icon, etc.)
+- [ ] Member management (adding, removing, banning, unbanning)
+- [ ] Server invites
+
+### Moderation
+- [ ] Channel moderation (slow mode, etc.)
+- [ ] User sanctions (mute, kick, ban)
+- [ ] Audit logs
+
+### Embeds and Rich Content
+- [x] Sending rich content in messages (links, images, videos)
+- [ ] Customizing embed appearance (title, description, color, fields)
+
+### Notifications and Push Notifications
+- [ ] Notification settings management
+
+### Webhooks
+- [ ] Webhook creation and management
+- [ ] Handling incoming webhook events
+
+### Documentation and Examples
+- [ ] Comprehensive documentation
+- [ ] Example usage and code snippets
+- [ ] Tutorials and guides
 
 [Rust]: https://img.shields.io/badge/Rust-orange?style=plastic&logo=rust
 [Rust-url]: https://www.rust-lang.org/