diff --git a/README.md b/README.md
index 2c72ea8..01a30d5 100644
--- a/README.md
+++ b/README.md
@@ -4,38 +4,61 @@
 
 List of instructions, resources, steps for setting up a new computer
 
-## Android
+## Applications
 
-### [Direct APK Applications](../master/android/Direct-APK-Application.md)
+### [Android](../master/android/Applications.md)
 
-### [FDroid-Applications](../master/android/FDroid-Applications.md)
+### [Linux](../master/linux/Applications.md)
 
-### [Google-Applications](../master/android/Google-Applications.md)
+### [OSX](../master/osx/Applications.md)
 
-## Linux
+### [Synology](../master/synology/Applications.md)
 
-### [List of Applications](../master/linux/Applications.md)
+### [Windows](../master/windows/Applications.md)
 
-### [Coding Setup](../master/linux/Coding-App-Setup.md)
+## Coding Setup
 
-### [Desktop Setup](../master/linux/Desktop-Setup.md)
+### [Linux](../master/linux/Coding-App-Setup.md)
 
-### [Environment Setup](../master/linux/Environment-Setup.md)
+- [Sublime Text 3](../master/linux/Coding-App-Setup.md#coding-applications##sublime-text-3)
+- [VSCode](../master/linux/Coding-App-Setup.md#coding-applications##vscode)
+
+### [OSX](../master/osx/Coding-App-Setup.md)
+
+- [IntelliJ](../master/osx/Coding-App-Setup.md#coding-applications##intellij)
+- [iTerm](../master/osx/Coding-App-Setup.md#coding-applications##iterm)
+- [VSCode](../master/osx/Coding-App-Setup.md#coding-applications##vscode)
+
+## Configurations
 
 ### VPN Configurations
 
-#### [NordVPN](../master/linux/NordVPN-Configuration.md)
+#### Linux
 
-#### [ProtonVPN](../master/linux/ProtonVPN-Configuration.md)
+- [NordVPN](../master/linux/NordVPN-Configuration.md)
+- [ProtonVPN](../master/linux/ProtonVPN-Configuration.md)
+
+## Desktop Setup
+
+### [Linux](../master/linux/Desktop-Setup.md)
+
+- [Gnome Extensions](../master/linux/Desktop-Setup.md#desktop-setup##gnome-extensions)
+
+- [Desktop Icon Creation](../master/linux/Desktop-Setup.md#desktop-setup##desktop-icon-creation)
+
+## Environment Setup
+
+### [Linux](../master/linux/Environment-Setup.md)
+
+- [Coding Packages](../master/linux/Environment-Setup.md#environment-setup##coding-packages)
+- [Useful System Packages](../master/linux/Environment-Setup.md#environment-setup##useful-system-packages)
+- [Linux Brew](../master/linux/Environment-Setup.md#environment-setup##linux-brew)
+- [Dotfiles](../master/linux/Environment-Setup.md#environment-setup##dot-files)
+
+### [Synology](../master/synology/Configuration-Environment-Setup.md)
 
 ### [Useful Resources](../master/linux/Resources-Information.md)
 
-## OSX
-
-### [List of Applications](../master/osx/Applications.md)
-
-### [Coding App Setup](../master/osx/Coding-App-Setup.md)
-
 ## Self Hosting
 
 ### [Haugene Synology](../master/self-hosting/Huagene-Synology.md)
@@ -44,14 +67,6 @@ List of instructions, resources, steps for setting up a new computer
 
 ## Synology
 
-### [Applications installed](../master/synology/Applications.md)
-
-### [Configuration & Environment Setup](../master/synology/Configuration-Environment-Setup.md)
-
 ### [Docker Setup](../master/synology/Docker-Setup.md)
 
 ### [Setup Media Automation](../master/synology/Advanced-Media-Setup.md)
-
-## Windows
-
-### [List of Applications](../master/windows/Applications.md)
diff --git a/android/FDroid-Applications.md b/android/Applications.md
similarity index 62%
rename from android/FDroid-Applications.md
rename to android/Applications.md
index 4b078e0..ce4218d 100644
--- a/android/FDroid-Applications.md
+++ b/android/Applications.md
@@ -1,147 +1,152 @@
-# FDroid Applications for Android
+# Android Applications
 
-## Ad Blocker
+## Table of Contents
 
-- [Blokada](https://f-droid.org/en/packages/org.blokada.alarm/)
+1. [Direct APK](#direct-apk-downloads-for-android)
+2. [FDroid Applications](#fdroid-applications)
+3. [Direct APK](#google-play-store)
 
 ---
 
-## App Store
+## Direct APK Downloads for Android
+
+- [Mullvad VPN](https://mullvad.net/en/download/apk/2020.4-beta4/)
+- [ProtonMail](https://protonmail.com/download/MailAndroid/ProtonMail-Android.apk)
+- [Signal](https://updates.signal.org/android/Signal-website-universal-release-4.58.5.apk)
+
+---
+
+## Google Play Store
+
+- [AdControl-AD1](https://play.google.com/store/apps/details?id=com.anydesk.adcontrol.ad1)
+- [AnyDesk](https://play.google.com/store/apps/details?id=com.anydesk.anydeskandroid)
+- [Bandcamp](https://play.google.com/store/apps/details?id=com.bandcamp.android)
+- [Drive](https://play.google.com/store/apps/details?id=com.synology.dsdrive)
+- [DS file](https://play.google.com/store/apps/details?id=com.synology.DSfile)
+- [DS finder](https://play.google.com/store/apps/details?id=com.synology.DSfinder)
+- [DS get](https://play.google.com/store/apps/details?id=com.synology.DSdownload)
+- [DS note](https://play.google.com/store/apps/details?id=com.synology.dsnote)
+- [Fuelio](https://play.google.com/store/apps/details?id=com.kajda.fuelio)
+- [HERE WeGo](https://play.google.com/store/apps/details?id=com.here.app.maps)
+- [Magic Earth](https://play.google.com/store/apps/details?id=com.generalmagic.magicearth)
+- [Moments](https://play.google.com/store/apps/details?id=com.synology.moments)
+- [Plex](https://play.google.com/store/apps/details?id=com.plexapp.android)
+- [Plexamp](https://play.google.com/store/apps/details?id=tv.plex.labs.plexamp)
+- [ProtonVPN](https://play.google.com/store/apps/details?id=ch.protonvpn.android)
+- [Steam](https://play.google.com/store/apps/details?id=com.valvesoftware.android.steam.community)
+- [Untappd](https://play.google.com/store/apps/details?id=com.untappdllc.app)
+- [YNAB](https://play.google.com/store/apps/details?id=com.youneedabudget.evergreen.app)
+
+---
+
+## FDroid Applications
+
+### Ad Blocker
+
+- [Blokada](https://f-droid.org/en/packages/org.blokada.alarm/)
+
+### App Store
 
 - [Aurora Droid](https://f-droid.org/en/packages/com.aurora.adroid/)
 - [Aurora Store](https://f-droid.org/en/packages/com.aurora.store/)
 - [F-Droid](https://f-droid.org/en/packages/org.fdroid.fdroid/)
 
----
-
-## Barcode Scanner
+### Barcode Scanner
 
 - [Barcode Scanner](https://f-droid.org/en/packages/com.google.zxing.client.android/)
 - [Binary Eye](https://f-droid.org/en/packages/de.markusfisch.android.binaryeye/)
 
----
-
-## Browser
+### Browser
 
 - [Bromite](https://www.bromite.org/fdroid)
 - [Fennec F-Droid](https://f-droid.org/en/packages/org.mozilla.fennec_fdroid/)
 
----
-
-## Camera
+### Camera
 
 - [Open Camera](https://f-droid.org/en/packages/net.sourceforge.opencamera/)
 
----
-
-## Calendar
+### Calendar
 
 - [Simple Calendar](https://f-droid.org/en/packages/com.simplemobiletools.calendar.pro/)
 
----
-
-## Car Reporting (Gas, Milage, Services)
+### Car Reporting (Gas, Milage, Services)
 
 - [Car Report](https://f-droid.org/en/packages/me.kuehle.carreport/)
 
----
-
-## Contacts
+### Contacts
 
 - [Simple Contacts](https://f-droid.org/en/packages/com.simplemobiletools.contacts.pro/)
 
----
+### Device Information
 
-## Device Information
-
-### Installed Apps Info (MD5, Package Name, Trackers, etc)
+#### Installed Apps Info (MD5, Package Name, Trackers, etc)
 
 - [Checkey](https://f-droid.org/en/packages/info.guardianproject.checkey/)
 - [Exodus Privacy](https://f-droid.org/en/packages/org.eu.exodus_privacy.exodusprivacy/)
 - [List My Apps](https://f-droid.org/en/packages/de.onyxbits.listmyapps/)
 
----
-
-## eReader
+### eReader
 
 - [KOReader](https://f-droid.org/en/packages/org.koreader.launcher/)
 
----
-
-## Fitness/Health
+### Fitness/Health
 
 - [Gadgetbridge](https://f-droid.org/en/packages/nodomain.freeyourgadget.gadgetbridge/)
 
----
-
-## File Manager
+### File Manager
 
 - [Ghost Commander](https://f-droid.org/en/packages/com.ghostsq.commander/)
   - SFTP Plugin: [Ghost Commander - SFTP plugin](https://f-droid.org/en/packages/com.ghostsq.commander.sftp/)
 - [Material Files](https://f-droid.org/en/packages/me.zhanghai.android.files/)
 
----
-
-## Gallery
+### Gallery
 
 - [Simple Gallery](https://f-droid.org/en/packages/com.simplemobiletools.gallery.pro/)
 
----
+### Games
 
-## Games
-
-### Adventure
+#### Adventure
 
 - [Shattered Pixel Dungeon](https://f-droid.org/en/packages/com.shatteredpixel.shatteredpixeldungeon/)
 
-### Strategy
+#### Strategy
 
 - [Checkers](https://f-droid.org/en/packages/org.secuso.privacyfriendlydame/)
 - [UnCiv](https://f-droid.org/en/packages/com.unciv.app/)
 
-### Word Games
+#### Word Games
 
 - [Lexica](https://f-droid.org/en/packages/com.serwylo.lexica/)
 
----
-
-## Gift Card Manager
+### Gift Card Manager
 
 - [Gift Card Guard](hhttps://f-droid.org/en/packages/protect.gift_card_guard/)
 - [Loyalty Card Keychain](https://f-droid.org/en/packages/protect.card_locker/)
 
----
+### Maps
 
-## Maps
-
-### Navigation
+#### Navigation
 
 - [OsmAnd~](https://f-droid.org/en/packages/net.osmand.plus/)
 
-### Help to improve the OpenStreetMap
+#### Help to improve the OpenStreetMap
 
 - [Street­Complete](https://f-droid.org/en/packages/de.westnordost.streetcomplete/)
 
----
-
-## Media Players
+### Media Players
 
 - [Vinyl Music Player](https://f-droid.org/en/packages/com.poupa.vinylmusicplayer/)
 - [VLC](https://f-droid.org/en/packages/org.videolan.vlc/)
 
----
+### News
 
-## News
-
-### RSS
+#### RSS
 
 - [Feeder](https://f-droid.org/en/packages/com.nononsenseapps.feeder/)
 
----
+### Note Taking
 
-## Note Taking
-
-### Free
+#### Free
 
 - [Editor](https://f-droid.org/en/packages/org.billthefarmer.editor/)
 - [Open Note Scanner](https://f-droid.org/en/packages/com.todobom.opennotescanner/)
@@ -150,133 +155,103 @@
 - [Shopping List](https://f-droid.org/en/packages/privacyfriendlyshoppinglist.secuso.org.privacyfriendlyshoppinglist/)
 - [Simple Draw](https://f-droid.org/en/packages/com.simplemobiletools.draw.pro/)
 
-### Subscription
+#### Subscription
 
 - [S. Notes](https://f-droid.org/en/packages/com.standardnotes/)
 
----
-
-## Keyboard
+### Keyboard
 
 - [AnySoftKeyboard](https://f-droid.org/en/packages/com.menny.android.anysoftkeyboard/)
 
----
-
-## Password Manager
+### Password Manager
 
 - [Bitwarden](https://mobileapp.bitwarden.com/fdroid/)
 
----
-
-## Podcast
+### Podcast
 
 - [AntennaPod](https://f-droid.org/en/packages/de.danoeh.antennapod/)
 
----
+### Programming
 
-## Programming
-
-### Database Viewer
+#### Database Viewer
 
 - [SQLiteViewer](https://f-droid.org/en/packages/com.orpheusdroid.sqliteviewer/)
 
----
+### Privacy Apps
 
-## Privacy Apps
-
-### Image Metadata Removal
+#### Image Metadata Removal
 
 - [Scrambled Exif](https://f-droid.org/en/packages/com.jarsilio.android.scrambledeggsif/)
 
-### Social Media Redirects
+#### Social Media Redirects
 
 - [UntrackMe](https://f-droid.org/en/packages/app.fedilab.nitterizeme/)
 
----
-
-## Tasks
+### Tasks
 
 - [Habits](https://f-droid.org/en/packages/org.isoron.uhabits/)
 - [OpenTasks](https://f-droid.org/en/packages/org.dmfs.tasks/)
 
----
-
-## Torrenting
+### Torrenting
 
 - [LibreTorrent](https://f-droid.org/en/packages/org.proninyaroslav.libretorrent/)
 
----
-
-## Two Factor Auth
+### Two Factor Auth
 
 - [andOTP](https://f-droid.org/en/packages/org.shadowice.flocke.andotp/)
 - [Yubico Authenticator](https://f-droid.org/en/packages/com.yubico.yubioath/)
 
----
+### Self Hosted
 
-## Self Hosted
-
-### Bookmarking (Requires instance to point to)
+#### Bookmarking (Requires instance to point to)
 
 - [wallabag](https://f-droid.org/en/packages/fr.gaulupeau.apps.InThePoche/)
 
-### Link Shortener (Requires instance to point to)
+#### Link Shortener (Requires instance to point to)
 
 - [Shaarlier](https://f-droid.org/en/packages/com.dimtion.shaarlier/)
 
-### Sync Software
+#### Sync Software
 
 - [Syncthing](https://f-droid.org/en/packages/com.nutomic.syncthingandroid/)
 
----
+### Social Media
 
-## Social Media
-
-### Mastodon
+#### Mastodon
 
 - [Fedilab](https://f-droid.org/en/packages/fr.gouv.etalab.mastodon)
 
-### Facebook
+#### Facebook
 
 - [Frost](hhttps://f-droid.org/en/packages/com.pitchedapps.frost/)
 
-### Reddit
+#### Reddit
 
 - [Slide](https://f-droid.org/en/packages/me.ccrama.redditslide/)
 
-### YouTube
+#### YouTube
 
 - [NewPipe](https://f-droid.org/en/packages/org.schabi.newpipe/)
 
----
-
-## Stock Tracker
+### Stock Tracker
 
 - [Stocks Widget](https://f-droid.org/en/packages/com.github.premnirmal.tickerwidget/)
 
----
+### Sync Software
 
-## Sync Software
-
-### CalDAV, CardDAV (Contacts, Calendars, etc)
+#### CalDAV, CardDAV (Contacts, Calendars, etc)
 
 - [DAVx⁵](https://f-droid.org/en/packages/at.bitfire.davdroid/)
 
----
-
-## Voice Recording
+### Voice Recording
 
 - [Voice Recorder](https://f-droid.org/en/packages/com.simplemobiletools.voicerecorder/)
 
----
-
-## VPN
+### VPN
 
 - [OpenVPN for Android](https://f-droid.org/en/packages/de.blinkt.openvpn/)
 - [WireGuard](https://f-droid.org/en/packages/com.wireguard.android/)
 
----
-
-## Wiki
+### Wiki
 
 - [Wikipedia](https://f-droid.org/en/packages/org.wikipedia/)
diff --git a/android/Direct-APK-Application.md b/android/Direct-APK-Application.md
deleted file mode 100644
index 07bc3b7..0000000
--- a/android/Direct-APK-Application.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Direct APK Downloads for Android
-
-- [Mullvad VPN](https://mullvad.net/en/download/apk/2020.4-beta4/)
-- [ProtonMail](https://protonmail.com/download/MailAndroid/ProtonMail-Android.apk)
-- [Signal](https://updates.signal.org/android/Signal-website-universal-release-4.58.5.apk)
diff --git a/android/Google-Applications.md b/android/Google-Applications.md
deleted file mode 100644
index bec9b75..0000000
--- a/android/Google-Applications.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Google Play Store Android Applications
-
-- [AdControl-AD1](https://play.google.com/store/apps/details?id=com.anydesk.adcontrol.ad1)
-- [AnyDesk](https://play.google.com/store/apps/details?id=com.anydesk.anydeskandroid)
-- [Bandcamp](https://play.google.com/store/apps/details?id=com.bandcamp.android)
-- [Drive](https://play.google.com/store/apps/details?id=com.synology.dsdrive)
-- [DS file](https://play.google.com/store/apps/details?id=com.synology.DSfile)
-- [DS finder](https://play.google.com/store/apps/details?id=com.synology.DSfinder)
-- [DS get](https://play.google.com/store/apps/details?id=com.synology.DSdownload)
-- [DS note](https://play.google.com/store/apps/details?id=com.synology.dsnote)
-- [Fuelio](https://play.google.com/store/apps/details?id=com.kajda.fuelio)
-- [HERE WeGo](https://play.google.com/store/apps/details?id=com.here.app.maps)
-- [Magic Earth](https://play.google.com/store/apps/details?id=com.generalmagic.magicearth)
-- [Moments](https://play.google.com/store/apps/details?id=com.synology.moments)
-- [Plex](https://play.google.com/store/apps/details?id=com.plexapp.android)
-- [Plexamp](https://play.google.com/store/apps/details?id=tv.plex.labs.plexamp)
-- [ProtonVPN](https://play.google.com/store/apps/details?id=ch.protonvpn.android)
-- [Steam](https://play.google.com/store/apps/details?id=com.valvesoftware.android.steam.community)
-- [Untappd](https://play.google.com/store/apps/details?id=com.untappdllc.app)
-- [YNAB](https://play.google.com/store/apps/details?id=com.youneedabudget.evergreen.app)
diff --git a/environment/Coding-App-Configs.md b/environment/Coding-App-Configs.md
new file mode 100644
index 0000000..d69f11a
--- /dev/null
+++ b/environment/Coding-App-Configs.md
@@ -0,0 +1,5 @@
+# Coding App Configs
+
+## Hyper.js
+
+## iTerm2
diff --git a/environment/Terminal.md b/environment/Terminal.md
index 3d0a699..bdc64c4 100644
--- a/environment/Terminal.md
+++ b/environment/Terminal.md
@@ -1,11 +1,64 @@
 # Terminal
 
-## Applications
+## Vim
 
-### Hyper.js
+- Configuration: [.vimrc](https://github.com/BradNut/dotfiles/blob/master/.vimrc)
+- Install:
+- Linux: `sudo apt install vim`
+- OSX: `brew install vim`
 
-#### Configurations
+### Things to look into for vim
 
-### iTerm2
+- Package manager
+- [Rainbow Parentheses](https://github.com/frazrepo/vim-rainbow)
 
-#### Configurations
+## Zsh
+
+_Currently using zsh_
+
+- Install if not there
+  - Linux/Ubuntu: `sudo apt install zsh`
+  - OSX: `brew install zsh`
+
+### Configuration
+
+- [.zshrc](https://github.com/BradNut/dotfiles/blob/master/.zshrc)
+- [Oh My Zsh](https://ohmyzsh.sh)
+  -- Install: `sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`
+
+#### Oh My Zsh Plugins
+
+- [Z](https://github.com/agkozak/zsh-z)
+  - Install: `git clone https://github.com/agkozak/zsh-z $ZSH_CUSTOM/plugins/zsh-z`
+- [zsh-autosuggestions](https://github.com/zsh-users/zsh-autosuggestions)
+  - Install: `git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions`
+- [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)
+  - Install: `git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting`
+
+## Bash
+
+- Not using at the moment
+
+### Configuration
+
+- [Bash profile](https://github.com/BradNut/dotfiles/blob/master/.bash_profile)
+- [.bashrc](https://github.com/BradNut/dotfiles/blob/master/.bashrc)
+
+## SSH
+
+### Enable
+
+```
+$ sudo apt update
+$ sudo apt install openssh-server
+```
+
+Verify SSH is running:
+
+```
+$ sudo systemctl status ssh
+```
+
+### Generating SSH Keys
+
+Step by step: [Generating New SSH Key and adding to the SSH Agent](https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
diff --git a/linux/Applications.md b/linux/Applications.md
index 4ff170c..649cf32 100644
--- a/linux/Applications.md
+++ b/linux/Applications.md
@@ -2,7 +2,6 @@
 
 ## Software Applications
 
-- [Alva](https://meetalva.io/)
 - [Anydesk](https://anydesk.com/en/downloads/linux)
 - [Bitwarden](https://bitwarden.com/#download)
   - Locally using flatpak
@@ -18,6 +17,7 @@
 - [FreeTube](https://freetubeapp.io/)
   - Flatpak: https://flathub.org/apps/details/io.freetubeapp.FreeTube
 - Gnome Tweaks
+- [HyperJS Terminal](https://hyper.is/#installation)
 - [Lutris](https://lutris.net/downloads/)
 - [MegaSync](https://mega.nz/sync)
 - [Mulvad](https://mullvad.net/en/download/)
@@ -58,6 +58,7 @@
 ## Flatpak Applications
 
 - [Bitwarden](https://flathub.org/apps/details/com.bitwarden.desktop): `flatpak install flathub com.bitwarden.desktop`
+- [Cawbird](https://flathub.org/apps/details/uk.co.ibboard.cawbird): `flatpak install flathub uk.co.ibboard.cawbird`
 - [Evolution](https://flathub.org/apps/details/org.gnome.Evolution): `flatpak install flathub org.gnome.Evolution`
 - [FileZilla](https://flathub.org/apps/details/org.filezillaproject.Filezilla): `flatpak install flathub org.filezillaproject.Filezilla`
 - [FreeTube](https://flathub.org/apps/details/io.freetubeapp.FreeTube)
@@ -68,6 +69,7 @@
 - [Sublime Text](https://flathub.org/apps/details/com.sublimetext.three): `flatpak install flathub com.sublimetext.three`
 - [Steam](https://flathub.org/apps/details/com.valvesoftware.Steam): `flatpak install flathub com.valvesoftware.Steam`
 - [qBittorrent](https://flathub.org/apps/details/org.qbittorrent.qBittorrent): `flatpak install flathub org.qbittorrent.qBittorrent`
+- [Tootle](https://flathub.org/apps/details/com.github.bleakgrey.tootle): `flatpak install flathub com.github.bleakgrey.tootle`
 - [Transmission](https://flathub.org/apps/details/com.transmissionbt.Transmission): `flatpak install flathub com.transmissionbt.Transmission`
 - [YubicoAuth](https://flathub.org/apps/details/com.yubico.yubioath)
 
diff --git a/linux/Desktop-Setup.md b/linux/Desktop-Setup.md
index 8b13757..ede1e0d 100644
--- a/linux/Desktop-Setup.md
+++ b/linux/Desktop-Setup.md
@@ -82,3 +82,18 @@ Icon=/home/bshellnu/Documents/Desktop Icons/YubicoAuthIcon.png
 ```
 
 - [Yubico Auth Icon](https://github.com/BradNut/computer-setup-info/blob/master/linux/images/desktop-images/YubicoAuthIcon.png)
+
+4. [Buckets](https://www.budgetwithbuckets.com/en/download.html)
+
+```
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Exec=/home/bshellnu/Buckets-0.57.5.AppImage
+Name=Buckets
+Icon=/home/bshellnu/Documents/Desktop Icons/BudgetBucketsIcon.png
+```
+
+- [Buckets Icon](https://github.com/BradNut/computer-setup-info/blob/master/linux/images/desktop-images/BudgetBucketsIcon.png)
diff --git a/linux/Environment-Setup.md b/linux/Environment-Setup.md
index e743c9a..3cd1618 100644
--- a/linux/Environment-Setup.md
+++ b/linux/Environment-Setup.md
@@ -1,6 +1,6 @@
-# Coding Environment Setup
+# Environment Setup
 
-## Packages
+## Coding Packages
 
 - Git: `sudo apt install git`
 - Curl: `sudo apt install curl`
@@ -8,16 +8,17 @@
   - [Install instructions](../master/linux/Docker-Setup.md)
 - Gatsby CLI: `sudo npm install gatsby-cli -g`
 - Heroku CLI: `sudo snap install --classic heroku`
+- Vim: `sudo apt install vim`
 - Sanity CLI: `sudo npm install @sanity/cli -g`
 
-#### Useful System Packages
+## Useful System Packages
 
 - [Neofetch](https://github.com/dylanaraps/neofetch)
   - `sudo apt install neofetch`
 - [TLDR Man Pages](https://tldr.sh/)
 - [Trash-CLI](https://www.npmjs.com/package/trash-cli)
 
-### [Linux Brew](https://docs.brew.sh/Homebrew-on-Linux)
+## [Linux Brew](https://docs.brew.sh/Homebrew-on-Linux)
 
 - Install: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"`
 - Run for Debian or Ubuntu: `sudo apt-get install build-essential curl file git`
@@ -56,63 +57,4 @@ $ git config --global.email "you@example.com"
 
 ## Terminal
 
-### Vim
-
-- If not installed: `sudo apt install vim`
-- Configuration: [.vimrc](https://github.com/BradNut/dotfiles/blob/master/.vimrc)
-
-#### Things to look into for vim
-
-- Package manager
-- [Rainbow Parentheses](https://github.com/frazrepo/vim-rainbow)
-
-### Zsh
-
-_Currently using zsh_
-
-- Install if not there
-  - Linux/Ubuntu: `sudo apt install zsh`
-  - OSX: `brew install zsh`
-
-#### Configuration
-
-- [.zshrc](https://github.com/BradNut/dotfiles/blob/master/.zshrc)
-- [Oh My Zsh](https://ohmyzsh.sh)
-  -- Install: `sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`
-
-##### Oh My Zsh Plugins
-
-- [Z](https://github.com/agkozak/zsh-z)
-  - Install: `git clone https://github.com/agkozak/zsh-z $ZSH_CUSTOM/plugins/zsh-z`
-- [zsh-autosuggestions](https://github.com/zsh-users/zsh-autosuggestions)
-  - Install: `git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions`
-- [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)
-  - Install: `git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting`
-
-### Bash
-
-- Not using at the moment
-
-#### Configuration
-
-- [Bash profile](https://github.com/BradNut/dotfiles/blob/master/.bash_profile)
-- [.bashrc](https://github.com/BradNut/dotfiles/blob/master/.bashrc)
-
-## SSH
-
-### Enable
-
-```
-$ sudo apt update
-$ sudo apt install openssh-server
-```
-
-Verify SSH is running:
-
-```
-$ sudo systemctl status ssh
-```
-
-### Generating SSH Keys
-
-Step by step: [Generating New SSH Key and adding to the SSH Agent](https://docs.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
+- See details here: [Terminal Setup](../master/environment/Terminal.md)
diff --git a/osx/Coding-App-Setup.md b/osx/Coding-App-Setup.md
index ed8bbaf..d26c98c 100644
--- a/osx/Coding-App-Setup.md
+++ b/osx/Coding-App-Setup.md
@@ -37,7 +37,7 @@
 
 ## Sublime Text 3
 
-- [Install](https://flathub.org/apps/details/com.sublimetext.three): `flatpak install flathub com.sublimetext.three`
+- [Install](https://www.sublimetext.com/3)
 - [Configuration](https://github.com/BradNut/dotfiles/blob/master/Preferences.sublime-settings)
 
 ### Package Control