diff --git a/github_images/download.png b/github_images/download.png
index e1f6334..cb726b4 100644
Binary files a/github_images/download.png and b/github_images/download.png differ
diff --git a/github_images/drive.png b/github_images/drive.png
deleted file mode 100644
index d4ff0c2..0000000
Binary files a/github_images/drive.png and /dev/null differ
diff --git a/github_images/homepage.png b/github_images/homepage.png
index ebfb847..65023aa 100644
Binary files a/github_images/homepage.png and b/github_images/homepage.png differ
diff --git a/github_images/image-viewer.png b/github_images/image-viewer.png
index 17e6d4c..1b26041 100644
Binary files a/github_images/image-viewer.png and b/github_images/image-viewer.png differ
diff --git a/github_images/media-viewer.png b/github_images/media-viewer.png
new file mode 100644
index 0000000..4b756fe
Binary files /dev/null and b/github_images/media-viewer.png differ
diff --git a/github_images/move.png b/github_images/move.png
index 007c085..3308f50 100644
Binary files a/github_images/move.png and b/github_images/move.png differ
diff --git a/github_images/search.png b/github_images/search.png
index ce46a98..823c218 100644
Binary files a/github_images/search.png and b/github_images/search.png differ
diff --git a/github_images/share.png b/github_images/share.png
index 64bad19..1212fd9 100644
Binary files a/github_images/share.png and b/github_images/share.png differ
diff --git a/github_images/thumbnails.png b/github_images/thumbnails.png
deleted file mode 100644
index 1feaed4..0000000
Binary files a/github_images/thumbnails.png and /dev/null differ
diff --git a/github_images/trash.png b/github_images/trash.png
new file mode 100644
index 0000000..432b5fc
Binary files /dev/null and b/github_images/trash.png differ
diff --git a/github_images/upload.png b/github_images/upload.png
index 8b42307..aadfd1a 100644
Binary files a/github_images/upload.png and b/github_images/upload.png differ
diff --git a/github_images/video-viewer.png b/github_images/video-viewer.png
index fb1a205..c50c98d 100644
Binary files a/github_images/video-viewer.png and b/github_images/video-viewer.png differ
diff --git a/readme.md b/readme.md
index 1de65a7..c738a60 100755
--- a/readme.md
+++ b/readme.md
@@ -8,19 +8,15 @@ MyDrive is an Open Source cloud file storage server (Similar To Google Drive). H
 
 ## 🔍 Index
 
-- [Features](#features)
-- [Installation](#installation)
-- [Guided Installation](https://github.com/subnub/myDrive/wiki/Guided-Installation-Setup)
-- [Guided Installation (Docker)](<https://github.com/subnub/myDrive/wiki/Guided-Installation-Setup-(Docker)>)
-- [Updating from a previous version of myDrive](#updating-from-a-previous-version-of-mydrive)
-- [WebUI For Encryption Key](#webui-for-encryption-key)
-- [Docker](#docker)
-- [Environment Variables](#environment-variables)
-- [Screenshots](#screenshots)
-- [Wiki](https://github.com/subnub/myDrive/wiki)
-- [Video](#video)
-- [Demo](#demo)
-- [Fund/Donate](#fund)
+- [Features](#⭐️-features)
+- [Tech stack](#👨‍🔬-tech-stack)
+- [Installation (non docker)](#💻-installation)
+- [Docker](#🐳-docker)
+- [Screenshots](#📸-screenshots)
+- [Video](#🎥-video)
+- [Live demo](#🕹️-live-demo)
+- [Feature requests/bug reports](#👾-bug-reports-and-feature-requests)
+- [Updating from a previous version of myDrive](#⬆️-updating-from-a-previous-version-of-mydrive)
 
 ## ⭐️ Features
 
@@ -38,6 +34,7 @@ MyDrive is an Open Source cloud file storage server (Similar To Google Drive). H
 - Mobile Support
 - Docker
 - Email Verification
+- JWT (Access and Refresh Tokens)
 
 ## 👨‍🔬 Tech Stack
 
@@ -129,8 +126,8 @@ Image Viewer
 Video Viewer
 ![Video Viewer](github_images/video-viewer.png)
 
-Image Thumbnails
-![Search](github_images/thumbnails.png)
+Media Gallery
+![Search](github_images/media-viewer.png)
 
 Share Files
 ![Share](github_images/share.png)
@@ -141,8 +138,8 @@ Search For Files/Folders
 Move File/Folders
 ![Move](github_images/move.png)
 
-Google Drive Support
-![Move](github_images/drive.png)
+Trash
+![Trash](github_images/trash.png)
 
 ## 🎥 Video
 
@@ -154,7 +151,7 @@ Demo: https://mydrive-3.herokuapp.com/
 
 - Note: The Upload and Download Features, and other core features, are disabled in the demo.
 
-## 👾 Questions? Feature Requests? Issues?
+## 👾 Bug reports and Feature Requests
 
 Contact Email: kyle.hoell@gmail.com