diff -ur ./dwm-1.0/draw.c ./dwm-1.0p/draw.c
--- ./dwm-1.0/draw.c	2006-08-24 12:28:56.000000000 +0400
+++ ./dwm-1.0p/draw.c	2006-08-24 16:03:01.000000000 +0400
@@ -22,7 +22,7 @@
 }
 
 static void
-drawtext(const char *text, Bool invert, Bool highlight)
+drawtext(const char *text, Bool invert, Bool highlight, int color)
 {
 	int x, y, w, h;
 	static char buf[256];
@@ -33,21 +33,35 @@
 
 	XSetForeground(dpy, dc.gc, invert ? dc.fg : dc.bg);
 	XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1);
+	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
+	XSetForeground(dpy, dc.gc, color);
 	points[0].x = dc.x;
-	points[0].y = dc.y;
-	points[1].x = dc.w - 1;
-	points[1].y = 0;
-	points[2].x = 0;
-	points[2].y = dc.h - 1;
-	points[3].x = -(dc.w - 1);
-	points[3].y = 0;
-	points[4].x = 0;
-	points[4].y = -(dc.h - 1);
-	XSetForeground(dpy, dc.gc, dc.border);
-	XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-
-	if(!text)
-		return;
+    points[0].y = dc.y;
+	points[1].x = dc.w;
+    points[1].y = 0;
+    if(highlight)
+    {
+        points[0].x = dc.x;
+        points[0].y = dc.y;
+        points[1].x = dc.w - 1;
+        points[1].y = 0;
+        points[2].x = 0;
+        points[2].y = dc.h - 1;
+        points[3].x = -(dc.w - 1);
+        points[3].y = 0;
+        points[4].x = 0;
+        points[4].y = -(dc.h - 1);
+        XSetForeground(dpy, dc.gc, dc.fg);
+	    XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
+    }
+    else
+    {
+
+	    XDrawLines(dpy, dc.drawable, dc.gc, points, 2, CoordModePrevious);
+    }
+    XDrawLine(dpy, dc.drawable, dc.gc, dc.x, dc.h -1 , dc.x+dc.w, dc.h -1 );
+    if(!text)
+        return;
 
 	w = 0;
 	olen = len = strlen(text);
@@ -85,19 +99,6 @@
 		XChangeGC(dpy, dc.gc, GCForeground | GCBackground | GCFont, &gcv);
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 	}
-	if(highlight) {
-		points[0].x = dc.x + 1;
-		points[0].y = dc.y + 1;
-		points[1].x = dc.w - 3;
-		points[1].y = 0;
-		points[2].x = 0;
-		points[2].y = dc.h - 3;
-		points[3].x = -(dc.w - 3);
-		points[3].y = 0;
-		points[4].x = 0;
-		points[4].y = -(dc.h - 3);
-		XDrawLines(dpy, dc.drawable, dc.gc, points, 5, CoordModePrevious);
-	}
 }
 
 /* extern */
@@ -120,16 +121,16 @@
 
 	dc.x = dc.y = 0;
 	dc.w = bw;
-	drawtext(NULL, !istile, False);
+	drawtext(NULL, !istile, False, dc.fg);
 
 	dc.w = 0;
 	for(i = 0; i < ntags; i++) {
 		dc.x += dc.w;
 		dc.w = textw(tags[i]);
 		if(istile)
-			drawtext(tags[i], seltag[i], sel && sel->tags[i]);
+			drawtext(tags[i], seltag[i], sel && sel->tags[i], dc.fg);
 		else
-			drawtext(tags[i], !seltag[i], sel && sel->tags[i]);
+			drawtext(tags[i], !seltag[i], sel && sel->tags[i], dc.fg);
 	}
 	x = dc.x + dc.w;
 	dc.w = textw(stext);
@@ -138,11 +139,11 @@
 		dc.x = x;
 		dc.w = bw - x;
 	}
-	drawtext(stext, !istile, False);
+	drawtext(stext, !istile, False, dc.border);
 
 	if(sel && ((dc.w = dc.x - x) > bh)) {
 		dc.x = x;
-		drawtext(sel->name, istile, False);
+		drawtext(sel->name, istile, False, dc.fg);
 	}
 	XCopyArea(dpy, dc.drawable, barwin, dc.gc, 0, 0, bw, bh, 0, 0);
 	XSync(dpy, False);
@@ -157,16 +158,24 @@
 	if(c == sel && issel) {
 		drawstatus();
 		XUnmapWindow(dpy, c->twin);
-		XSetWindowBorder(dpy, c->win, dc.fg);
+		XSetWindowBorder(dpy, c->win, dc.border);
 		return;
 	}
 
-	XSetWindowBorder(dpy, c->win, dc.bg);
+	XSetWindowBorder(dpy, c->win, dc.bgborder);
 	XMapWindow(dpy, c->twin);
 	dc.x = dc.y = 0;
 	dc.w = c->tw;
-	drawtext(c->name, !istile, False);
-	XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
+	drawtext(c->name, !istile, False, dc.bgborder);
+    XSetForeground(dpy, dc.gc, dc.bgborder);
+    XDrawLine(dpy, dc.drawable, dc.gc, dc.x, dc.y, dc.x, dc.y+dc.h);
+    XDrawLine(dpy, dc.drawable, dc.gc, dc.x+dc.w-1, dc.y, dc.x+dc.w-1, dc.y+dc.h);
+	dc.x += dc.w;
+	dc.w = c->tw - dc.x;
+	drawtext(c->name, !istile, False, dc.bgborder);
+    XSetForeground(dpy, dc.gc, dc.bgborder);
+    XDrawLine(dpy, dc.drawable, dc.gc, dc.x+dc.w-1, dc.y, dc.x+dc.w-1, dc.y+dc.h);
+    XCopyArea(dpy, dc.drawable, c->twin, dc.gc, 0, 0, c->tw, c->th, 0, 0);
 	XSync(dpy, False);
 }
 
diff -ur ./dwm-1.0/dwm.h ./dwm-1.0p/dwm.h
--- ./dwm-1.0/dwm.h	2006-08-24 12:28:56.000000000 +0400
+++ ./dwm-1.0p/dwm.h	2006-08-24 13:22:33.000000000 +0400
@@ -39,6 +39,7 @@
 	unsigned long bg;
 	unsigned long fg;
 	unsigned long border;
+	unsigned long bgborder;
 	Drawable drawable;
 	Fnt font;
 	GC gc;
diff -ur ./dwm-1.0/main.c ./dwm-1.0p/main.c
--- ./dwm-1.0/main.c	2006-08-24 12:28:56.000000000 +0400
+++ ./dwm-1.0p/main.c	2006-08-24 13:22:55.000000000 +0400
@@ -124,6 +124,7 @@
 	dc.bg = getcolor(BGCOLOR);
 	dc.fg = getcolor(FGCOLOR);
 	dc.border = getcolor(BORDERCOLOR);
+	dc.bgborder = getcolor(BGBORDERCOLOR);
 	setfont(FONT);
 
 	sx = sy = 0;