diff --git a/awesome.c b/awesome.c
index cc48690b2..3d303395b 100644
--- a/awesome.c
+++ b/awesome.c
@@ -436,4 +436,4 @@ main(int argc, char *argv[])
 
     return EXIT_SUCCESS;
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/awesome.h b/awesome.h
index 786e4a638..203231739 100644
--- a/awesome.h
+++ b/awesome.h
@@ -28,4 +28,4 @@ int xerror(Display *, XErrorEvent *);   /* awesome's X error handler */
 UICB_PROTO(uicb_quit);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/client.c b/client.c
index dca891d01..3c2bd3236 100644
--- a/client.c
+++ b/client.c
@@ -808,4 +808,4 @@ uicb_killclient(awesome_config *awesomeconf,
     else
         XKillClient(awesomeconf->display, (*awesomeconf->client_sel)->win);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/client.h b/client.h
index 9709c8c43..074d2663d 100644
--- a/client.h
+++ b/client.h
@@ -50,4 +50,4 @@ UICB_PROTO(uicb_swapnext);
 UICB_PROTO(uicb_swapprev);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/common.h b/common.h
index 7695a40d8..6ed39dbac 100644
--- a/common.h
+++ b/common.h
@@ -31,4 +31,4 @@
 #define LAYOUT_PROTO(name)         void name(awesome_config *)
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/config.c b/config.c
index b11706505..b9851b05b 100644
--- a/config.c
+++ b/config.c
@@ -429,4 +429,4 @@ initxcolor(Display *disp, int scr, const char *colstr)
         die("awesome: error, cannot allocate color '%s'\n", colstr);
     return color;
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/config.h b/config.h
index 8337ab168..eabbcbf48 100644
--- a/config.h
+++ b/config.h
@@ -203,4 +203,4 @@ struct awesome_config
 void parse_config(Display *, int, const char *, awesome_config *);        /* parse configuration file */
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/draw.c b/draw.c
index 03e508dab..2df95e0b7 100644
--- a/draw.c
+++ b/draw.c
@@ -127,4 +127,4 @@ textwidth(Display *disp, XftFont *font, char *text, ssize_t len)
     return gi.width;
 }
 
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/draw.h b/draw.h
index 4145d87e5..d0bf4739e 100644
--- a/draw.h
+++ b/draw.h
@@ -29,4 +29,4 @@ void drawrectangle(Display *, int, int, int, int, int, Drawable, int, int, Bool,
 void drawcircle(Display *, int, int, int, int, Drawable, int, int, Bool, XColor);
 inline unsigned short textwidth(Display *, XftFont *, char *, ssize_t);
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/event.c b/event.c
index 5ef2746db..b60059792 100644
--- a/event.c
+++ b/event.c
@@ -538,4 +538,4 @@ grabkeys(Display *disp, int screen, awesome_config *awesomeconf)
                  GrabModeAsync, GrabModeAsync);
     }
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/event.h b/event.h
index 8e9796f4f..b60de0138 100644
--- a/event.h
+++ b/event.h
@@ -42,4 +42,4 @@ void handle_event_shape(XEvent *, awesome_config *);
 void handle_event_randr_screen_change_notify(XEvent *, awesome_config *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layout.c b/layout.c
index a8baf5a97..257de5618 100644
--- a/layout.c
+++ b/layout.c
@@ -288,4 +288,4 @@ uicb_zoom(awesome_config *awesomeconf,
     arrange(awesomeconf->display, awesomeconf);
 }
 
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layout.h b/layout.h
index ef515d993..ce067f643 100644
--- a/layout.h
+++ b/layout.h
@@ -43,4 +43,4 @@ UICB_PROTO(uicb_togglehorizontalmax);
 UICB_PROTO(uicb_zoom);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/floating.c b/layouts/floating.c
index 7d4f2f8e2..9e983d2f1 100644
--- a/layouts/floating.c
+++ b/layouts/floating.c
@@ -39,4 +39,4 @@ layout_floating(awesome_config *awesomeconf)
                 resize(c, c->x, c->y, c->w, c->h, awesomeconf, True);
         }
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/floating.h b/layouts/floating.h
index 0868ffd42..1fc2110cd 100644
--- a/layouts/floating.h
+++ b/layouts/floating.h
@@ -26,4 +26,4 @@
 LAYOUT_PROTO(layout_floating);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/max.c b/layouts/max.c
index ef985fd93..4b4518654 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -36,4 +36,4 @@ layout_max(awesome_config *awesomeconf)
                    si[awesomeconf->screen].height - 2 * c->border, awesomeconf, awesomeconf->resize_hints);
     XFree(si);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/max.h b/layouts/max.h
index dcaf568cd..c8132bdb0 100644
--- a/layouts/max.h
+++ b/layouts/max.h
@@ -27,4 +27,4 @@
 LAYOUT_PROTO(layout_max);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/tile.c b/layouts/tile.c
index 604705a0b..265af20f3 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -178,4 +178,4 @@ layout_tileleft(awesome_config *awesomeconf)
 {
     _tile(awesomeconf, False);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/layouts/tile.h b/layouts/tile.h
index b1ae50007..605d5b411 100644
--- a/layouts/tile.h
+++ b/layouts/tile.h
@@ -33,4 +33,4 @@ UICB_PROTO(uicb_setncol);
 UICB_PROTO(uicb_setmwfact);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/screen.c b/screen.c
index 573a3dbc6..b16ee926a 100644
--- a/screen.c
+++ b/screen.c
@@ -249,4 +249,4 @@ uicb_movetoscreen(awesome_config * awesomeconf,
     arrange(awesomeconf->display, &awesomeconf[prev_screen - awesomeconf->screen]);
     arrange(awesomeconf->display, &awesomeconf[new_screen - awesomeconf->screen]);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/screen.h b/screen.h
index 6c952cf30..8eea698ca 100644
--- a/screen.h
+++ b/screen.h
@@ -39,4 +39,4 @@ UICB_PROTO(uicb_focusprevscreen);
 UICB_PROTO(uicb_movetoscreen);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/statusbar.c b/statusbar.c
index 989bd2165..dccf319f9 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -260,4 +260,4 @@ uicb_setstatustext(awesome_config *awesomeconf, const char *arg)
 
     drawstatusbar(awesomeconf->display, awesomeconf);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/statusbar.h b/statusbar.h
index 9950d0786..3c4d365f2 100644
--- a/statusbar.h
+++ b/statusbar.h
@@ -32,4 +32,4 @@ UICB_PROTO(uicb_togglebar);
 UICB_PROTO(uicb_setstatustext);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/tag.c b/tag.c
index 0f13a7eeb..b9952a8d6 100644
--- a/tag.c
+++ b/tag.c
@@ -329,4 +329,4 @@ uicb_tag_viewprev(awesome_config *awesomeconf,
     saveawesomeprops(awesomeconf->display, awesomeconf);
     arrange(awesomeconf->display, awesomeconf);
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/tag.h b/tag.h
index d0b48e84c..090ced38a 100644
--- a/tag.h
+++ b/tag.h
@@ -41,4 +41,4 @@ UICB_PROTO(uicb_tag_viewnext);
 UICB_PROTO(uicb_tag_viewprev);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/uicb.c b/uicb.c
index 653d3cec4..b3eef75fc 100644
--- a/uicb.c
+++ b/uicb.c
@@ -84,4 +84,4 @@ run_uicb(char *cmd, awesome_config *awesomeconf)
 
     return 0;
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/uicb.h b/uicb.h
index c7742bb14..db148229e 100644
--- a/uicb.h
+++ b/uicb.h
@@ -28,4 +28,4 @@ int parse_control(char *, awesome_config *);
 int run_uicb(char *, awesome_config *);
 
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/util.c b/util.c
index 8b903ca60..4721344f2 100644
--- a/util.c
+++ b/util.c
@@ -225,4 +225,4 @@ ssize_t a_strcpy(char *dst, ssize_t n, const char *src)
 
     return len;
 }
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
diff --git a/util.h b/util.h
index a221ad063..88b0a4028 100644
--- a/util.h
+++ b/util.h
@@ -207,4 +207,4 @@ void *name_func_lookup(const char *, const NameFuncLink *);
 UICB_PROTO(uicb_spawn);
 UICB_PROTO(uicb_exec);
 #endif
-// vim: filetype=c:expandtab:shiftwidth=6:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99