-#define SMART_SURROUNDINGS true
-
-#define NORMAL_BORDER_COLOR "#333333"
-#define ACTIVE_BORDER_COLOR "#DDDDDD"
-#define INNER_BORDER_COLOR "#111111"
-#define LOCKED_BORDER_COLOR "#333333"
-#define URGENT_BORDER_COLOR "#333333"
-
-char *normal_border_color;
-char *active_border_color;
-char *locked_border_color;
-char *urgent_border_color;
-char *inner_border_color;
-
-int outer_border_width;
-int inner_border_width;
-int border_width;
+
+#define WINDOW_GAP 6
+#define TOP_PADDING 0
+#define BOTTOM_PADDING 0
+#define LEFT_PADDING 0
+#define RIGHT_PADDING 0
+
+#define ADAPTIVE_WINDOW_BORDER true
+
+#define NORMAL_BORDER_COLOR "gray22"
+#define ACTIVE_BORDER_COLOR "lightslategray"
+#define INNER_BORDER_COLOR "darkslategray"
+#define OUTER_BORDER_COLOR "darkslategray"
+#define PRESEL_BORDER_COLOR "dimgray"
+#define LOCKED_BORDER_COLOR "slateblue"
+
+char normal_border_color[MAXLEN];
+char active_border_color[MAXLEN];
+char inner_border_color[MAXLEN];
+char outer_border_color[MAXLEN];
+char presel_border_color[MAXLEN];
+char locked_border_color[MAXLEN];
+
+char wm_name[MAXLEN];
+
+uint32_t normal_border_color_pxl;
+uint32_t active_border_color_pxl;
+uint32_t inner_border_color_pxl;
+uint32_t outer_border_color_pxl;
+uint32_t presel_border_color_pxl;
+uint32_t locked_border_color_pxl;
+
+unsigned int inner_border_width;
+unsigned int main_border_width;
+unsigned int outer_border_width;
+
+unsigned int border_width;
+