diff --git a/Makefile.am b/Makefile.am
index de6438cd..7f68321c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,4 +69,4 @@ doxy: Doxyfile
 
 .PHONY: distclean-local doxy
 
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
diff --git a/src/Makefile.am b/src/Makefile.am
index e8c5cb3e..9111c707 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -252,4 +252,4 @@ EXTRA_DIST = \
 	ccurl_thread.h
 
 
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
diff --git a/src/algebra.c b/src/algebra.c
index 6fda32d9..d72bcf0d 100644
--- a/src/algebra.c
+++ b/src/algebra.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #define _GNU_SOURCE
 #include "config.h"
diff --git a/src/algebra.h b/src/algebra.h
index 6f44ec68..f464eac3 100644
--- a/src/algebra.h
+++ b/src/algebra.h
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #ifndef _ALGEBRA_H
 #define _ALGEBRA_H
diff --git a/src/apcupsd.c b/src/apcupsd.c
index 19f31408..cca6891c 100644
--- a/src/apcupsd.c
+++ b/src/apcupsd.c
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #include "conky.h"
 #include "apcupsd.h"
diff --git a/src/apcupsd.h b/src/apcupsd.h
index bf9ea336..2dfa02ad 100644
--- a/src/apcupsd.h
+++ b/src/apcupsd.h
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #ifndef APCUPSD_H_
 #define APCUPSD_H_
diff --git a/src/audacious.c b/src/audacious.c
index a6d7b8b5..fbaf8fc5 100644
--- a/src/audacious.c
+++ b/src/audacious.c
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #include "config.h"
 #include "conky.h"
diff --git a/src/audacious.h b/src/audacious.h
index b929f953..79eddc56 100644
--- a/src/audacious.h
+++ b/src/audacious.h
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #ifndef AUDACIOUS_H
 #define AUDACIOUS_H
diff --git a/src/bmpx.c b/src/bmpx.c
index 5e718131..7be4544b 100644
--- a/src/bmpx.c
+++ b/src/bmpx.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/bmpx.h b/src/bmpx.h
index 5808469e..a036d271 100644
--- a/src/bmpx.h
+++ b/src/bmpx.h
@@ -1,3 +1,27 @@
+/* Conky, a system monitor, based on torsmo
+ *
+ * Please see COPYING for details
+ *
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ *	(see AUTHORS)
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
+
 #ifndef BMPX_H_
 #define BMPX_H_
 
diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
index 5d64f89c..11d12df6 100644
--- a/src/ccurl_thread.c
+++ b/src/ccurl_thread.c
@@ -19,6 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/colours.c b/src/colours.c
index cfa60e5b..0ea1e8a9 100644
--- a/src/colours.c
+++ b/src/colours.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #include "conky.h"
 #include "logging.h"
diff --git a/src/common.c b/src/common.c
index 4700be1e..11eaa390 100644
--- a/src/common.c
+++ b/src/common.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/conf_cookie.c b/src/conf_cookie.c
index 91905a60..cc7a4b61 100644
--- a/src/conf_cookie.c
+++ b/src/conf_cookie.c
@@ -1,3 +1,27 @@
+/* Conky, a system monitor, based on torsmo
+ *
+ * Please see COPYING for details
+ *
+ * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ *	(see AUTHORS)
+ * All rights reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
+
 #define _GNU_SOURCE
 #include "config.h"
 #include <stdio.h>
diff --git a/src/conky.c b/src/conky.c
index f4a2f08e..e59ff9fb 100644
--- a/src/conky.c
+++ b/src/conky.c
@@ -1,4 +1,5 @@
 /* Conky, a system monitor, based on torsmo
+ *
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -23,6 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
@@ -9389,6 +9392,7 @@ int main(int argc, char **argv)
 #endif
 
 	return 0;
+
 }
 
 static void signal_handler(int sig)
diff --git a/src/conky.h b/src/conky.h
index 8ed78b20..c6baa864 100644
--- a/src/conky.h
+++ b/src/conky.h
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #ifndef _conky_h_
diff --git a/src/diskio.c b/src/diskio.c
index 0f0ff154..3596ee61 100644
--- a/src/diskio.c
+++ b/src/diskio.c
@@ -24,6 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/eve.c b/src/eve.c
index 40f72f7b..6d05c58d 100644
--- a/src/eve.c
+++ b/src/eve.c
@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "eve.h"
diff --git a/src/fonts.c b/src/fonts.c
index 1db76239..388921d6 100644
--- a/src/fonts.c
+++ b/src/fonts.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #include "conky.h"
 #include "fonts.h"
diff --git a/src/freebsd.c b/src/freebsd.c
index 6075138d..00399ed3 100644
--- a/src/freebsd.c
+++ b/src/freebsd.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include <sys/ioctl.h>
diff --git a/src/fs.c b/src/fs.c
index 50c6ff9a..6fbaa170 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/hddtemp.c b/src/hddtemp.c
index 5b1e22e7..7f18e3e3 100644
--- a/src/hddtemp.c
+++ b/src/hddtemp.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/ibm.c b/src/ibm.c
index 97f174be..9af81df1 100644
--- a/src/ibm.c
+++ b/src/ibm.c
@@ -24,6 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/imlib2.c b/src/imlib2.c
index c544a303..282b2975 100644
--- a/src/imlib2.c
+++ b/src/imlib2.c
@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/libmpdclient.c b/src/libmpdclient.c
index 3df620a9..b9af206f 100644
--- a/src/libmpdclient.c
+++ b/src/libmpdclient.c
@@ -29,6 +29,8 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/libtcp-portmon.c b/src/libtcp-portmon.c
index b06b9be9..41b6b2db 100644
--- a/src/libtcp-portmon.c
+++ b/src/libtcp-portmon.c
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/linux.c b/src/linux.c
index 483e547e..da2da5a0 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -24,6 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/llua.c b/src/llua.c
index 0c44374a..032b708b 100644
--- a/src/llua.c
+++ b/src/llua.c
@@ -17,6 +17,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/mail.c b/src/mail.c
index d6fef22b..078b308f 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/mboxscan.c b/src/mboxscan.c
index e2e3cfab..59d4ab0b 100644
--- a/src/mboxscan.c
+++ b/src/mboxscan.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/mixer.c b/src/mixer.c
index 974081af..b7245e58 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/moc.c b/src/moc.c
index 38c360f7..e55b3bb0 100644
--- a/src/moc.c
+++ b/src/moc.c
@@ -16,6 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/mpd.c b/src/mpd.c
index c60845cc..27b138ad 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/netbsd.c b/src/netbsd.c
index 9ac3413d..558230ee 100644
--- a/src/netbsd.c
+++ b/src/netbsd.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "netbsd.h"
diff --git a/src/nvidia.c b/src/nvidia.c
index 62ae71f1..92373c0c 100644
--- a/src/nvidia.c
+++ b/src/nvidia.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "nvidia.h"
diff --git a/src/openbsd.c b/src/openbsd.c
index c870c59d..27334f62 100644
--- a/src/openbsd.c
+++ b/src/openbsd.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include <sys/dkstat.h>
diff --git a/src/prss.c b/src/prss.c
index 2bbe5893..84cc8037 100644
--- a/src/prss.c
+++ b/src/prss.c
@@ -13,7 +13,11 @@
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #include "conky.h"
 #include "prss.h"
diff --git a/src/rss.c b/src/rss.c
index 49124798..86ee3def 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -19,6 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/smapi.c b/src/smapi.c
index e0ca9e1e..5ff8dd05 100644
--- a/src/smapi.c
+++ b/src/smapi.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #define _GNU_SOURCE
 #include "conky.h"	/* text_buffer_size, PACKAGE_NAME, maybe more */
diff --git a/src/solaris.c b/src/solaris.c
index a420e676..6bd63db3 100644
--- a/src/solaris.c
+++ b/src/solaris.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 /* doesn't work, feel free to finish this */
diff --git a/src/sony.c b/src/sony.c
index 7a25788d..f29dee52 100644
--- a/src/sony.c
+++ b/src/sony.c
@@ -19,6 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 /* conky support for information from sony_laptop kernel module
  *   information from sony_laptop kernel module
diff --git a/src/specials.c b/src/specials.c
index fdedb5a5..fd2128b1 100644
--- a/src/specials.c
+++ b/src/specials.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #include "conky.h"
 #include "colours.h"
diff --git a/src/tailhead.c b/src/tailhead.c
index 2e7b206e..953a3db1 100644
--- a/src/tailhead.c
+++ b/src/tailhead.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "text_object.h"
diff --git a/src/tcp-portmon.c b/src/tcp-portmon.c
index b969b59b..2b263262 100644
--- a/src/tcp-portmon.c
+++ b/src/tcp-portmon.c
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id$
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
  */
 #include "conky.h"
diff --git a/src/temphelper.c b/src/temphelper.c
index fe6b2f58..751f035d 100644
--- a/src/temphelper.c
+++ b/src/temphelper.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #include "config.h"
 #include <stdio.h>
diff --git a/src/text_object.c b/src/text_object.c
index cf89c9bc..6e6311ed 100644
--- a/src/text_object.c
+++ b/src/text_object.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 #include "text_object.h"
 #include "logging.h"
diff --git a/src/timed_thread.c b/src/timed_thread.c
index c53a74f0..798fbfc1 100644
--- a/src/timed_thread.c
+++ b/src/timed_thread.c
@@ -15,7 +15,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- * USA. */
+ * USA.
+ *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
+ */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/top.c b/src/top.c
index 640658fe..e9bc680d 100644
--- a/src/top.c
+++ b/src/top.c
@@ -24,6 +24,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "top.h"
diff --git a/src/users.c b/src/users.c
index 10cddba7..61b9200e 100644
--- a/src/users.c
+++ b/src/users.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"
diff --git a/src/weather.c b/src/weather.c
index 4e6270ea..e02cbfe0 100644
--- a/src/weather.c
+++ b/src/weather.c
@@ -19,6 +19,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 /*
diff --git a/src/x11.c b/src/x11.c
index 6f0c35f1..b87ab190 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -23,6 +23,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "config.h"
diff --git a/src/xmms2.c b/src/xmms2.c
index 24398b3e..57b951df 100644
--- a/src/xmms2.c
+++ b/src/xmms2.c
@@ -22,6 +22,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
+ *
  */
 
 #include "conky.h"