diff --git a/bugn.exe b/bugn.exe
index f1e2590..391fe72 100644
Binary files a/bugn.exe and b/bugn.exe differ
diff --git a/doc/Customization.md b/doc/Customization.md
index abe0603..25777b3 100644
--- a/doc/Customization.md
+++ b/doc/Customization.md
@@ -35,10 +35,6 @@ The available configuration variables are listed in the document
 associated functions are listed in the document
 "[Default hotkeys](./Default_hotkeys.md)".
 
-`Config_borderWidth`, `Config_borderPadding` and `Config_selBorderColor` are
-especially usefull, if you are not allowed to set the design in the system
-settings.
-
 You may find a sample and template configuration file in the 
 [usr directory](../usr/).
 
diff --git a/doc/Default_configuration.md b/doc/Default_configuration.md
index d9f0a09..2ded176 100644
--- a/doc/Default_configuration.md
+++ b/doc/Default_configuration.md
@@ -166,11 +166,12 @@ desktop functionality of BlackBox and NOT bug.n is used (=> Hiding and showing
 windows is detected and acted upon).
 
 `Config_borderWidth=0`
-> If > 0, the window border width is set to the given integer value.
+> If > 0, the window border width is set to the given integer value (supported 
+Windows versions: _not_ 10).
 
 `Config_borderPadding=-1`
-> If >= 0, the window border padding is set to the given integer value (only
-for Windows >= Vista).
+> If >= 0, the window border padding is set to the given integer value 
+(supported Windows versions: only Vista).
 
 `Config_showTaskBar=0`
 > If false (`=0`), the task bar is hidden. It can be made visible or hidden by
@@ -178,11 +179,13 @@ hotkey (see below).
 
 `Config_showBorder=1`
 > If false (`=0`), the window borders are hidden; therefor windows cannot be
-resized manually by dragging the border, even if using the according hotkey.
+resized manually by dragging the border, even if using the according hotkey 
+(supported Windows versions: _not_ 10).
 
 `Config_selBorderColor=`
-> Border colour of the active window; format: 0x00BBGGRR (e. g. `0x006A240A`,
-if =0, the system's window border colour is not changed).
+> Border colour of the active window, format: 0x00BBGGRR; e. g. `0x006A240A`,
+if `=0`, the system's window border colour is not changed (supported Windows 
+versions: _not_ 10).
 
 ### Window arrangement
 
diff --git a/src/Config.ahk b/src/Config.ahk
index 167e86c..8880b69 100644
--- a/src/Config.ahk
+++ b/src/Config.ahk
@@ -107,6 +107,13 @@ Config_init() {
 
   Config_hotkeyCount := 0
   Config_restoreConfig(Config_filePath)
+  If (SubStr(A_OSVersion, 1, 3) = "10.") {
+    Config_borderWidth    := 0
+    Config_borderPadding  := -1
+    Config_showBorder     := True
+    Config_selBorderColor := ""
+  }
+  
   Config_getSystemSettings()
   Config_initColors()
   Loop, % Config_layoutCount {
diff --git a/src/Tiler.ahk b/src/Tiler.ahk
index ba0a132..7898ace 100644
--- a/src/Tiler.ahk
+++ b/src/Tiler.ahk
@@ -341,7 +341,7 @@ Tiler_toggleStackArea(m ,v) {
 }
 
 Tiler_traceAreas(m, v, continuously) {
-  Local h1, h2, n, w1, w2, wndTitle, x1, x2, y1, y2, y3
+  Local borderW, h1, h2, n, w1, w2, wndTitle, x1, x2, y1, y2, y3
 
   x1 := Monitor_#%m%_x + View_#%m%_#%v%_layoutGapWidth + View_#%m%_#%v%_margin4
   y1 := Monitor_#%m%_y + View_#%m%_#%v%_layoutGapWidth + View_#%m%_#%v%_margin1
@@ -354,12 +354,13 @@ Tiler_traceAreas(m, v, continuously) {
   Gui, Color, %Config_foreColor_#2_#1%
   Gui, Font, c%Config_fontColor_#1_#3% s%Config_largeFontSize%, %Config_fontName%
 
+  borderW := Config_borderWidth + (Config_borderPadding < 0 ? 0 : Config_borderPadding)
   n := View_#%m%_#%v%_area_#0
   Loop, % n {
-    x2 := View_#%m%_#%v%_area_#%A_Index%_x - x1 + Config_borderWidth + Config_borderPadding
-    y2 := View_#%m%_#%v%_area_#%A_Index%_y - y1 + Config_borderWidth + Config_borderPadding
-    w2 := View_#%m%_#%v%_area_#%A_Index%_width - 2 * (Config_borderWidth + Config_borderPadding)
-    h2 := View_#%m%_#%v%_area_#%A_Index%_height - 2 * (Config_borderWidth + Config_borderPadding)
+    x2 := View_#%m%_#%v%_area_#%A_Index%_x - x1 + borderW
+    y2 := View_#%m%_#%v%_area_#%A_Index%_y - y1 + borderW
+    w2 := View_#%m%_#%v%_area_#%A_Index%_width - 2 * borderW
+    h2 := View_#%m%_#%v%_area_#%A_Index%_height - 2 * borderW
     y3 := y2 + (h2 - Config_largeFontSize) / 2
     Gui, Add, Progress, x%x2% y%y2% w%w2% h%h2% Background%Config_backColor_#1_#3%, 100
     Gui, Add, Text, x%x2% y%y3% w%w2% BackgroundTrans Center, % A_Index
diff --git a/usr/joten_01.ini b/usr/joten_01.ini
index f9dc895..b6a4456 100644
--- a/usr/joten_01.ini
+++ b/usr/joten_01.ini
@@ -37,8 +37,8 @@ Config_readinInterval=10000
 
 ;; Windows ui elements
 ;Config_bbCompatibility=0
-Config_borderWidth=2
-Config_borderPadding=0
+;Config_borderWidth=0
+;Config_borderPadding=-1
 Config_showTaskBar=1
 ;Config_showBorder=1
 ;Config_selBorderColor=