diff --git a/home/.config/i3/conf.d/window-classes.conf b/home/.config/i3/conf.d/window-classes.conf
index 58fa0d0..71ddbf0 100644
--- a/home/.config/i3/conf.d/window-classes.conf
+++ b/home/.config/i3/conf.d/window-classes.conf
@@ -3,6 +3,7 @@
 # Open specific applications in floating mode
 for_window [class="URxvt"] floating enable border pixel 0
 for_window [title="alsamixer"] floating enable border pixel 1
+for_window [class="(?i)gvim"] floating enable boarder pixel 0
 for_window [class="Calamares"] floating enable border normal
 for_window [class="Clipgrab"] floating enable
 for_window [title="File Transfer*"] floating enable
diff --git a/home/shell/vimrc b/home/shell/vimrc
index 1dc644b..c51bb4f 100644
--- a/home/shell/vimrc
+++ b/home/shell/vimrc
@@ -1,13 +1,35 @@
+" Syntax highlighting based on detected language
 syntax on
-" Convert tabs to spaces
-set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab
 
+" Iceberg theme - I also use this theme in VSCode
 colorscheme iceberg
 
-" Show tabs as arrows, and trailing whitespace as pips
-set list
-set listchars=tab:\→\ ,trail:·
+" Default GUI  Window Geometry
+if has("gui_running")
+    set lines=29 columns=105
+endif
 
+" Render newlines with '$'
+" Render Tabs with '>-'
+" Render Trailing Whitespace with '~'
+" Extends and Precedes are for Line Wrapping
+set list
+set listchars=eol:$,tab:>-,trail:~,extends:>,precedes:<
+
+" Turn on Line numbering
+set number
+
+" Turn on Mouse Aware mode, does lots of stuff
+" What we're most interested in is the fact that
+" it won't let us highlight the line numbers
+set mouse+=a
+
+" Yank and Paste using the system clipboard
+set clipboard=unnamedplus
+
+" Convert tabs to spaces
+" Tabs are 4 spaces wide
+set tabstop=8 softtabstop=0 expandtab shiftwidth=4 smarttab
 
 execute pathogen#infect()
 filetype plugin indent on