diff --git a/STYLE b/STYLE
index 109cca28..a25ff89d 100644
--- a/STYLE
+++ b/STYLE
@@ -2,7 +2,7 @@ If you intend to patch and contribute awesome, please respect the following codi
 - Use 4 space tabs instead of tabs;
 - Place braces alone on new lines;
 - No space before if, for, while statements or function call;
-- Do not put very long line, split them;
+- The preferred line length is 80 characters;
 - Be clear in what you do.
 
 A vim modeline is set in each file to respect this.
diff --git a/awesome-client-common.c b/awesome-client-common.c
index 9bf5f805..a2217b6a 100644
--- a/awesome-client-common.c
+++ b/awesome-client-common.c
@@ -83,3 +83,4 @@ get_client_socket(void)
 
     return csfd;
 }
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/awesome-client.c b/awesome-client.c
index f2418a78..6d6886cb 100644
--- a/awesome-client.c
+++ b/awesome-client.c
@@ -68,4 +68,4 @@ main(void)
 
     return ret_value;
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/awesome-client.h b/awesome-client.h
index 66673d6e..36837114 100644
--- a/awesome-client.h
+++ b/awesome-client.h
@@ -26,4 +26,4 @@ struct sockaddr_un * get_client_addr(const char *);
 int get_client_socket(void);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/awesome.c b/awesome.c
index 542be6b0..725868f6 100644
--- a/awesome.c
+++ b/awesome.c
@@ -455,4 +455,4 @@ main(int argc, char *argv[])
 
     return EXIT_SUCCESS;
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/awesome.h b/awesome.h
index 6f4adff5..1956c0d0 100644
--- a/awesome.h
+++ b/awesome.h
@@ -28,4 +28,4 @@ int xerror(Display *, XErrorEvent *);
 UICB_PROTO(uicb_quit);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/client.c b/client.c
index f7238a17..2d6691b9 100644
--- a/client.c
+++ b/client.c
@@ -751,4 +751,4 @@ uicb_client_kill(int screen __attribute__ ((unused)), char *arg __attribute__ ((
     else
         XKillClient(globalconf.display, sel->win);
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/client.h b/client.h
index 01f18c57..11571c27 100644
--- a/client.h
+++ b/client.h
@@ -46,4 +46,4 @@ UICB_PROTO(uicb_client_swapnext);
 UICB_PROTO(uicb_client_swapprev);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/common.h b/common.h
index 9c4db615..7220bcea 100644
--- a/common.h
+++ b/common.h
@@ -31,4 +31,4 @@
 #define LAYOUT_PROTO(name)         void name(int)
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/config.c b/config.c
index 19b91405..39c8b767 100644
--- a/config.c
+++ b/config.c
@@ -698,4 +698,4 @@ config_parse(const char *confpatharg)
     p_delete(&confpath);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/config.h b/config.h
index f6833151..9dffcd65 100644
--- a/config.h
+++ b/config.h
@@ -270,4 +270,4 @@ struct awesome_config
 void config_parse(const char *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/draw.c b/draw.c
index 5b7bac24..d035a1ed 100644
--- a/draw.c
+++ b/draw.c
@@ -209,4 +209,4 @@ textwidth(DrawCtx *ctx, XftFont *font, char *text)
     return textwidth_primitive(ctx->display, font, text);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/draw.h b/draw.h
index 01c8513a..f8396305 100644
--- a/draw.h
+++ b/draw.h
@@ -45,4 +45,4 @@ Drawable draw_rotate(DrawCtx *, int, double, int, int);
 unsigned short textwidth(DrawCtx *, XftFont *, char *);
 unsigned short textwidth_primitive(Display*, XftFont*, char*);
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/event.c b/event.c
index cf957c4e..7962a711 100644
--- a/event.c
+++ b/event.c
@@ -413,4 +413,4 @@ grabkeys(int phys_screen)
         XGrabKey(globalconf.display, code, k->mod | globalconf.numlockmask | LockMask, RootWindow(globalconf.display, phys_screen), True, GrabModeAsync, GrabModeAsync);
     }
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/event.h b/event.h
index e2f1d8f6..fa84e7cd 100644
--- a/event.h
+++ b/event.h
@@ -42,4 +42,4 @@ void handle_event_shape(XEvent *);
 void handle_event_randr_screen_change_notify(XEvent *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/focus.c b/focus.c
index 3816ce5a..143504cc 100644
--- a/focus.c
+++ b/focus.c
@@ -128,4 +128,4 @@ uicb_focus_history(int screen, char *arg)
     }
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/focus.h b/focus.h
index 4181860f..9c9f52cd 100644
--- a/focus.h
+++ b/focus.h
@@ -31,4 +31,4 @@ Client * focus_get_latest_client_for_tag(int, Tag *);
 UICB_PROTO(uicb_focus_history);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layout.c b/layout.c
index 5eba9079..0db7655c 100644
--- a/layout.c
+++ b/layout.c
@@ -344,4 +344,4 @@ uicb_client_zoom(int screen, char *arg __attribute__ ((unused)))
     arrange(screen);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layout.h b/layout.h
index 5ff6c784..e0de7196 100644
--- a/layout.h
+++ b/layout.h
@@ -42,4 +42,4 @@ UICB_PROTO(uicb_client_togglehorizontalmax);
 UICB_PROTO(uicb_client_zoom);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/fibonacci.c b/layouts/fibonacci.c
index 58662efc..abf80701 100644
--- a/layouts/fibonacci.c
+++ b/layouts/fibonacci.c
@@ -101,4 +101,4 @@ layout_dwindle(int screen)
     layout_fibonacci(screen, 1);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/fibonacci.h b/layouts/fibonacci.h
index c8a61efd..382a6a1a 100644
--- a/layouts/fibonacci.h
+++ b/layouts/fibonacci.h
@@ -28,4 +28,4 @@ LAYOUT_PROTO(layout_spiral);
 LAYOUT_PROTO(layout_dwindle);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/floating.c b/layouts/floating.c
index a0bea1e4..8b5ef45a 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -33,4 +33,4 @@ layout_floating(int screen)
         if(client_isvisible(c, screen))
             client_resize(c, c->rx, c->ry, c->rw, c->rh, True, False);
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/floating.h b/layouts/floating.h
index 1fc2110c..b36f6098 100644
--- a/layouts/floating.h
+++ b/layouts/floating.h
@@ -26,4 +26,4 @@
 LAYOUT_PROTO(layout_floating);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/max.c b/layouts/max.c
index cfb2b5fd..51435214 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -39,4 +39,4 @@ layout_max(int screen)
                    si[screen].height - 2 * c->border, globalconf.screens[screen].resize_hints, False);
     p_delete(&si);
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/max.h b/layouts/max.h
index c8132bdb..bbf0e2e1 100644
--- a/layouts/max.h
+++ b/layouts/max.h
@@ -27,4 +27,4 @@
 LAYOUT_PROTO(layout_max);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/tile.c b/layouts/tile.c
index ade4086d..1a00e2ba 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -186,4 +186,4 @@ layout_tileleft(int screen)
     _tile(screen, False);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/layouts/tile.h b/layouts/tile.h
index 957792c5..5699da86 100644
--- a/layouts/tile.h
+++ b/layouts/tile.h
@@ -33,4 +33,4 @@ UICB_PROTO(uicb_tag_setncol);
 UICB_PROTO(uicb_tag_setmwfact);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/mouse.c b/mouse.c
index f5d51a39..3baef6d1 100644
--- a/mouse.c
+++ b/mouse.c
@@ -149,4 +149,4 @@ uicb_client_resizemouse(int screen, char *arg __attribute__ ((unused)))
 }
 
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/mouse.h b/mouse.h
index 4da95de1..42f3f53f 100644
--- a/mouse.h
+++ b/mouse.h
@@ -30,4 +30,4 @@ UICB_PROTO(uicb_client_movemouse);
 UICB_PROTO(uicb_client_resizemouse);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/rules.c b/rules.c
index 07fdb41e..3c4121bc 100644
--- a/rules.c
+++ b/rules.c
@@ -89,4 +89,4 @@ is_tag_match_rules(Tag *t, Rule *r)
     return False;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/rules.h b/rules.h
index d6422ddc..5ef97107 100644
--- a/rules.h
+++ b/rules.h
@@ -31,4 +31,4 @@ Bool client_match_rule(Client *, Rule *);
 Bool is_tag_match_rules(Tag *, Rule *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/screen.c b/screen.c
index 7cf9a9b8..9f4cd78a 100644
--- a/screen.c
+++ b/screen.c
@@ -291,4 +291,4 @@ uicb_client_movetoscreen(int screen __attribute__ ((unused)), char *arg)
     arrange(prev_screen);
     arrange(new_screen);
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/screen.h b/screen.h
index 1d687668..cc32c9ce 100644
--- a/screen.h
+++ b/screen.h
@@ -39,4 +39,4 @@ UICB_PROTO(uicb_screen_focus);
 UICB_PROTO(uicb_client_movetoscreen);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/statusbar.c b/statusbar.c
index 20b12ef1..0e3fc3de 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -205,4 +205,4 @@ uicb_statusbar_set_position(int screen, char *arg)
     statusbar_update_position(globalconf.display, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/statusbar.h b/statusbar.h
index 87e84bd3..d4d8a42c 100644
--- a/statusbar.h
+++ b/statusbar.h
@@ -33,4 +33,4 @@ UICB_PROTO(uicb_statusbar_toggle);
 UICB_PROTO(uicb_statusbar_set_position);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/tag.c b/tag.c
index b4039216..7fadc381 100644
--- a/tag.c
+++ b/tag.c
@@ -357,4 +357,4 @@ uicb_tag_viewprev(int screen, char *arg __attribute__ ((unused)))
         arrange(screen);
     }
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/tag.h b/tag.h
index b74ebbfc..264a3527 100644
--- a/tag.h
+++ b/tag.h
@@ -43,4 +43,4 @@ UICB_PROTO(uicb_tag_viewnext);
 UICB_PROTO(uicb_tag_viewprev);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/uicb.c b/uicb.c
index 6f85e7a0..307636ea 100644
--- a/uicb.c
+++ b/uicb.c
@@ -148,4 +148,4 @@ parse_control(char *cmd)
     return 0;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/uicb.h b/uicb.h
index a40a486d..ddcb1810 100644
--- a/uicb.h
+++ b/uicb.h
@@ -27,4 +27,4 @@
 int parse_control(char *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/util.c b/util.c
index 40735a68..d80617a3 100644
--- a/util.c
+++ b/util.c
@@ -147,4 +147,4 @@ ssize_t a_strcpy(char *dst, ssize_t n, const char *src)
 
     return len;
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/util.h b/util.h
index 434dba70..5599490b 100644
--- a/util.h
+++ b/util.h
@@ -205,4 +205,4 @@ void warn(const char *, ...) __attribute__ ((format(printf, 1, 2)));
 void *name_func_lookup(const char *, const NameFuncLink *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widget.c b/widget.c
index d202d92a..b5efff83 100644
--- a/widget.c
+++ b/widget.c
@@ -115,4 +115,4 @@ uicb_widget_tell(int screen, char *arg)
     return;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widget.h b/widget.h
index fb21bf69..691a1040 100644
--- a/widget.h
+++ b/widget.h
@@ -23,4 +23,4 @@ UICB_PROTO(uicb_widget_tell);
 
 #endif
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widgets/focustitle.c b/widgets/focustitle.c
index e4ba8e72..43316d26 100644
--- a/widgets/focustitle.c
+++ b/widgets/focustitle.c
@@ -49,4 +49,4 @@ focustitle_new(Statusbar *statusbar, cfg_t *config)
     return w;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widgets/layoutinfo.c b/widgets/layoutinfo.c
index a4ed159a..1bd8e276 100644
--- a/widgets/layoutinfo.c
+++ b/widgets/layoutinfo.c
@@ -41,4 +41,4 @@ layoutinfo_new(Statusbar *statusbar, cfg_t* config)
     return w;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widgets/taglist.c b/widgets/taglist.c
index ab8e585c..636dd606 100644
--- a/widgets/taglist.c
+++ b/widgets/taglist.c
@@ -82,4 +82,4 @@ taglist_new(Statusbar *statusbar, cfg_t *config)
     return w;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/widgets/textbox.c b/widgets/textbox.c
index f949860b..d0b7a8b0 100644
--- a/widgets/textbox.c
+++ b/widgets/textbox.c
@@ -67,4 +67,4 @@ textbox_new(Statusbar *statusbar, cfg_t *config)
     update(w, cfg_getstr(config, "default"));
     return w;
 }
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/window.c b/window.c
index 2588b060..9eb6ebcd 100644
--- a/window.c
+++ b/window.c
@@ -171,4 +171,4 @@ window_settrans(Display *disp, Window win, double opacity)
     XSync(disp, False);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/window.h b/window.h
index ca9978da..44529856 100644
--- a/window.h
+++ b/window.h
@@ -35,4 +35,4 @@ void window_setshape(Display *, int, Window);
 void window_settrans(Display *, Window, double);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/xutil.c b/xutil.c
index 9e670d09..f8edc68b 100644
--- a/xutil.c
+++ b/xutil.c
@@ -113,4 +113,4 @@ xgettextprop(Display *disp, Window w, Atom atom, char *text, ssize_t textlen)
     return True;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/xutil.h b/xutil.h
index 780d3917..f0608e1b 100644
--- a/xutil.h
+++ b/xutil.h
@@ -29,4 +29,4 @@ UICB_PROTO(uicb_spawn);
 UICB_PROTO(uicb_exec);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80