diff --git a/README b/README.md
similarity index 60%
rename from README
rename to README.md
index 3b0633c..530ab4f 100644
--- a/README
+++ b/README.md
@@ -5,14 +5,25 @@ dwm is an extremely fast, small, and dynamic window manager for X. Current versi
 
 Usage
 -----
-1. Follow the original installation guide (included below);
-2. Create a dwm starter script (eg. dwm_start as attached) and move it to a directory in the PATH (eg. /usr/local/bin/). Make sure it's executable;
-3. Create GDM login option (eg. dwm.desktop as attached) in directory /usr/share/xsessions/ ;
-4. Install tools of your preference: sakura, xlock, wicd, etc.
-5. To administrate Network using GUI, install wicd, and start it with wicd-client -n.
+* Refer to original installation guide as necessary (included below);
+* Customize config.h;
+* (optional) Enable system tray by applying attached systray.diff patch;
+* Create dwm starter script (eg. dwm_start as attached, with status-bar enabled) in your PATH (eg. /usr/local/bin/). Make sure it's executable;
+* Create GDM login option (eg. dwm.desktop as attached) in directory /usr/share/xsessions/ ;
+* Install tools of your preference (remember to modify your config.h)
+    - termianl: sakura
+    - screen lock: slock (or xlock, but it sometimes has problem in wake-up), xautolock (use in combination with slock to auto lock when inactive for certain time)
+    - GUI for network management: wicd (start it with wicd-client -n), etc.
+
+
+Know Issues
+-----
+* No support for UTF-8 in title bar
+
 
+Original README in dwm package below
+-------
 
-(The original document)
 Requirements
 ------------
 In order to build dwm you need the Xlib header files.
diff --git a/config.h b/config.h
index dfa2512..bdc3609 100644
--- a/config.h
+++ b/config.h
@@ -52,7 +52,7 @@ static const Layout layouts[] = {
 static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
 static const char *termcmd[]  = { "sakura", NULL };
 static const char *filemanager[]  = { "pcmanfm", NULL };
-static const char *lockscreen[]  = { "xlock", NULL };
+static const char *lockscreen[]  = { "slock", NULL };
 static const char *browsercmd[]  = { "google-chrome", NULL };
 
 static Key keys[] = {
diff --git a/dwm_start b/dwm_start
index ab9ba07..322b754 100755
--- a/dwm_start
+++ b/dwm_start
@@ -3,4 +3,7 @@ while true; do
   xsetroot -name "$( date +"%F %R" )"
   sleep 1m    # Update time every minute
 done &
+# auto lock screen after n minutes of inactivity
+# need to install xautolock, slock
+xautolock -time 40 -locker slock &
 exec dwm