diff --git a/PKGBUILD b/PKGBUILD
index e7a29e9..f3a5433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ryan Kes <alrayyes@gmail.com> 
 
 pkgname=dwm
-pkgver=6.1
+pkgver=6.2
 pkgrel=3
 pkgdesc="A dynamic window manager for X"
 url="http://dwm.suckless.org"
@@ -12,25 +12,27 @@ options=(zipman)
 depends=('libx11' 'libxinerama' 'libxft' 'freetype2' 'st' 'dmenu' 'nerd-fonts-source-code-pro')
 install=dwm.install
 
-_patches=("https://dwm.suckless.org/patches/alpha/dwm-alpha-6.1.diff"
-        "https://dwm.suckless.org/patches/activetagindicatorbar/dwm-activetagindicatorbar-6.1.diff"
-        "https://dwm.suckless.org/patches/noborder/dwm-noborder-6.1.diff")
+_patches=("https://dwm.suckless.org/patches/alpha/dwm-alpha-20180613-b69c870.diff"
+        "https://dwm.suckless.org/patches/noborder/dwm-noborder-20170207-bb3bd6f.diff")
 
 source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz
 	config.h
 	dwm.desktop
 	"${_patches[@]}")
 
-md5sums=('f0b6b1093b7207f89c2a90b848c008ec'
-         'e1a6e5202ef2c9a0d338a63f9464b656'
+md5sums=('9929845ccdec4d2cc191f16210dd7f3d'
+         '49875b8dd04346410b570bb85c9c6f3a'
          '939f403a71b6e85261d09fc3412269ee'
-         'e6858ff16b9eb1d7fa42a96b59847395'
-         '4c0b9919df89804a4b344c1405757019'
-         '7e25b6da25308c899d2ac6eb322cc69d')
+         '4e5893e04c443530168223639c97bc47'
+         'fbb786263f2d714b18368ff64779d669')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   
+  # Update systray patch to fix conflicts
+  #sed -i 's/+253,24/+254,24/g' "$srcdir/$(basename ${_patches[3]})"
+  #sed -i '117 a \ static void xinitvisual();' "$srcdir/$(basename ${_patches[2]})"
+  
   for patch in "${_patches[@]}"; do
     echo "Applying patch $(basename $patch)..."
     patch -Np1 -i "$srcdir/$(basename $patch)"
diff --git a/config.h b/config.h
index 43c9175..34ca253 100644
--- a/config.h
+++ b/config.h
@@ -1,24 +1,29 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char *fonts[] = {
-    "SauceCodePro Nerd Font Mono:style=Regular:pixelsize=18:antialias=true:autohint=true"
-};
-static const char dmenufont[]       = "SauceCodePro Nerd Font Mono:style=Regular:pixelsize=18:antialias=true:autohint=true";
-static const char normbordercolor[] = "#444444";
-static const char normbgcolor[]     = "#222222";
-static const char normfgcolor[]     = "#bbbbbb";
-static const char selbordercolor[]  = "#005577";
-static const char selbgcolor[]      = "#005577";
-static const char selfgcolor[]      = "#eeeeee";
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
-
-/* alpha patch */
-static unsigned int baralpha        = 0xd0;
-static unsigned int borderalpha     = OPAQUE;
+static const char *fonts[]          = { "SauceCodePro Nerd Font Mono:style=Regular:pixelsize=18:antialias=true:autohint=true" };
+static const char dmenufont[]       = "SauceCodePro Nerd Font Mono:style=Regular:pixelsize=18:antialias=true:autohint=true";
+static const char col_gray1[]       = "#222222";
+static const char col_gray2[]       = "#444444";
+static const char col_gray3[]       = "#bbbbbb";
+static const char col_gray4[]       = "#eeeeee";
+static const char col_cyan[]        = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
+static const char *colors[][3]      = {
+	/*               fg         bg         border   */
+	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+};
+static const unsigned int alphas[][3]      = {
+	/*               fg      bg        border     */
+	[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
+	[SchemeSel]  = { OPAQUE, baralpha, borderalpha },
+};
 
 /* tagging */
 static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@@ -58,7 +63,7 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
 
 static Key keys[] = {
@@ -99,7 +104,7 @@ static Key keys[] = {
 };
 
 /* button definitions */
-/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
 static Button buttons[] = {
 	/* click                event mask      button          function        argument */
 	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
@@ -114,3 +119,4 @@ static Button buttons[] = {
 	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
 	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
 };
+