diff --git a/CommandBase.cpp b/CommandBase.cpp
index 90e3d27..b98ffac 100644
--- a/CommandBase.cpp
+++ b/CommandBase.cpp
@@ -16,4 +16,4 @@ void CommandBase::init(){
   elevator = new Elevator();
   oi = new OI();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/CommandBase.h b/CommandBase.h
index c1cb716..ca66699 100644
--- a/CommandBase.h
+++ b/CommandBase.h
@@ -19,4 +19,4 @@ class CommandBase: public Command {
     static OI *oi;
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Autonomous/AutoDrive.cpp b/Commands/Autonomous/AutoDrive.cpp
index e7f85fc..b5e65df 100644
--- a/Commands/Autonomous/AutoDrive.cpp
+++ b/Commands/Autonomous/AutoDrive.cpp
@@ -20,4 +20,4 @@ void AutoDrive::End(){
 void AutoDrive::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Autonomous/AutoDrive.h b/Commands/Autonomous/AutoDrive.h
index eaab4a2..26f2aa3 100644
--- a/Commands/Autonomous/AutoDrive.h
+++ b/Commands/Autonomous/AutoDrive.h
@@ -16,4 +16,4 @@ class AutoDrive: public Command{
     void Interrupted();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Autonomous/Autonomous.cpp b/Commands/Autonomous/Autonomous.cpp
index 93aced5..33bfe6e 100644
--- a/Commands/Autonomous/Autonomous.cpp
+++ b/Commands/Autonomous/Autonomous.cpp
@@ -6,4 +6,4 @@ Autonomous::Autonomous(){
   AddSequential(new AutoDrive());
   AddSequential(new Raise());
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Autonomous/Autonomous.h b/Commands/Autonomous/Autonomous.h
index 88cf308..43ca69c 100644
--- a/Commands/Autonomous/Autonomous.h
+++ b/Commands/Autonomous/Autonomous.h
@@ -11,4 +11,4 @@ class Autonomous: public CommandGroup{
     Autonomous();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/CloseCollector.cpp b/Commands/Collector/CloseCollector.cpp
index 3b7a866..cd95a99 100644
--- a/Commands/Collector/CloseCollector.cpp
+++ b/Commands/Collector/CloseCollector.cpp
@@ -17,4 +17,4 @@ void CloseCollector::End(){
 void CloseCollector::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/CloseCollector.h b/Commands/Collector/CloseCollector.h
index 6be493a..cd26268 100644
--- a/Commands/Collector/CloseCollector.h
+++ b/Commands/Collector/CloseCollector.h
@@ -17,4 +17,4 @@ class CloseCollector: public Command{
 };
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/CollectTote.cpp b/Commands/Collector/CollectTote.cpp
index eca5210..13c5bcc 100644
--- a/Commands/Collector/CollectTote.cpp
+++ b/Commands/Collector/CollectTote.cpp
@@ -18,4 +18,4 @@ void CollectTote::End(){
 void CollectTote::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/CollectTote.h b/Commands/Collector/CollectTote.h
index de2d7db..03074fd 100644
--- a/Commands/Collector/CollectTote.h
+++ b/Commands/Collector/CollectTote.h
@@ -17,4 +17,4 @@ class CollectTote: public Command{
 };
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/OpenCollector.cpp b/Commands/Collector/OpenCollector.cpp
index 1ec498e..93deb00 100644
--- a/Commands/Collector/OpenCollector.cpp
+++ b/Commands/Collector/OpenCollector.cpp
@@ -18,4 +18,4 @@ void OpenCollector::End(){
 void OpenCollector::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/OpenCollector.h b/Commands/Collector/OpenCollector.h
index 47ae5f5..2686251 100644
--- a/Commands/Collector/OpenCollector.h
+++ b/Commands/Collector/OpenCollector.h
@@ -17,4 +17,4 @@ class OpenCollector: public Command{
 };
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/ReleaseTote.cpp b/Commands/Collector/ReleaseTote.cpp
index e751c35..744efcb 100644
--- a/Commands/Collector/ReleaseTote.cpp
+++ b/Commands/Collector/ReleaseTote.cpp
@@ -19,4 +19,4 @@ void ReleaseTote::End(){
 void ReleaseTote::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Collector/ReleaseTote.h b/Commands/Collector/ReleaseTote.h
index 521b7da..722680f 100644
--- a/Commands/Collector/ReleaseTote.h
+++ b/Commands/Collector/ReleaseTote.h
@@ -17,4 +17,4 @@ class ReleaseTote: public Command{
 };
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Drivetrain/Drive.cpp b/Commands/Drivetrain/Drive.cpp
index dfa803b..3fe46f9 100644
--- a/Commands/Drivetrain/Drive.cpp
+++ b/Commands/Drivetrain/Drive.cpp
@@ -29,4 +29,4 @@ void Drive::End(){
 void Drive::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Drivetrain/Drive.h b/Commands/Drivetrain/Drive.h
index 17583fa..17e0ab8 100644
--- a/Commands/Drivetrain/Drive.h
+++ b/Commands/Drivetrain/Drive.h
@@ -16,4 +16,4 @@ class Drive: public Command{
     void Interrupted();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Calibrate.cpp b/Commands/Elevator/Calibrate.cpp
index 87f2c25..a55c8c4 100644
--- a/Commands/Elevator/Calibrate.cpp
+++ b/Commands/Elevator/Calibrate.cpp
@@ -23,4 +23,4 @@ void Calibrate::End(){
 void Calibrate::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Calibrate.h b/Commands/Elevator/Calibrate.h
index 5d70334..d2bb7b2 100644
--- a/Commands/Elevator/Calibrate.h
+++ b/Commands/Elevator/Calibrate.h
@@ -14,4 +14,4 @@ class Calibrate: public Command{
     void Interrupted();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Lower.cpp b/Commands/Elevator/Lower.cpp
index 253ffd9..c29c16f 100644
--- a/Commands/Elevator/Lower.cpp
+++ b/Commands/Elevator/Lower.cpp
@@ -23,4 +23,4 @@ void Lower::End(){
 void Lower::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Lower.h b/Commands/Elevator/Lower.h
index 3a83b57..92c8535 100644
--- a/Commands/Elevator/Lower.h
+++ b/Commands/Elevator/Lower.h
@@ -14,4 +14,4 @@ class Lower: public Command{
     void Interrupted();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Raise.cpp b/Commands/Elevator/Raise.cpp
index 050b571..92eecc9 100644
--- a/Commands/Elevator/Raise.cpp
+++ b/Commands/Elevator/Raise.cpp
@@ -23,4 +23,4 @@ void Raise::End(){
 void Raise::Interrupted(){
   End();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Commands/Elevator/Raise.h b/Commands/Elevator/Raise.h
index abc519b..b19f470 100644
--- a/Commands/Elevator/Raise.h
+++ b/Commands/Elevator/Raise.h
@@ -15,4 +15,4 @@ class Raise: public Command{
 };
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/DentRobot.cpp b/DentRobot.cpp
index 77c6a8f..d0399a6 100644
--- a/DentRobot.cpp
+++ b/DentRobot.cpp
@@ -38,4 +38,4 @@ void DentRobot::TeleopPeriodic(){
 void DentRobot::TestPeriodic(){
 }
 START_ROBOT_CLASS(DentRobot);
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/OI.cpp b/OI.cpp
index 1a81fab..f2c7400 100644
--- a/OI.cpp
+++ b/OI.cpp
@@ -45,4 +45,4 @@ Joystick* OI::GetRightStick(){
 Joystick* OI::GetLeftStick(){
   return leftStick;
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/OI.h b/OI.h
index 6bdbe19..7f0929f 100644
--- a/OI.h
+++ b/OI.h
@@ -13,4 +13,4 @@ class OI
     Joystick* GetLeftStick();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/RobotMap.h b/RobotMap.h
index cdabc04..d0cc6e4 100644
--- a/RobotMap.h
+++ b/RobotMap.h
@@ -26,4 +26,4 @@
 #define COLLECTOR_RIGHT_CAN 9
 
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Collector.cpp b/Subsystems/Collector.cpp
index f569633..fcc7959 100644
--- a/Subsystems/Collector.cpp
+++ b/Subsystems/Collector.cpp
@@ -27,4 +27,4 @@ bool Collector::BoxCollected(){
   return false;
   //return boxSwitch->Get();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Collector.h b/Subsystems/Collector.h
index d9cb6ff..92262ac 100644
--- a/Subsystems/Collector.h
+++ b/Subsystems/Collector.h
@@ -15,4 +15,4 @@ class Collector: public Subsystem
     bool BoxCollected();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Drivetrain.cpp b/Subsystems/Drivetrain.cpp
index 7db8487..6440679 100644
--- a/Subsystems/Drivetrain.cpp
+++ b/Subsystems/Drivetrain.cpp
@@ -20,4 +20,4 @@ void Drivetrain::DriveMecanum(float x, float y, float z, float sensitivity, floa
   rightRear->Set((correctX + correctY - correctZ));
   leftRear->Set((-correctX + correctY + correctZ)*-1);
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Drivetrain.h b/Subsystems/Drivetrain.h
index b4114b4..3ab69b3 100644
--- a/Subsystems/Drivetrain.h
+++ b/Subsystems/Drivetrain.h
@@ -13,4 +13,4 @@ class Drivetrain: public Subsystem{
     void DriveArcade(float, float);
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Elevator.cpp b/Subsystems/Elevator.cpp
index f0ff41e..e02c4ff 100644
--- a/Subsystems/Elevator.cpp
+++ b/Subsystems/Elevator.cpp
@@ -29,4 +29,4 @@ bool Elevator::GetElevatorBottom(){
 bool Elevator::GetElevatorTop(){
   return elevatorTop->Get();
 }
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et
diff --git a/Subsystems/Elevator.h b/Subsystems/Elevator.h
index 44c57de..c6facaf 100644
--- a/Subsystems/Elevator.h
+++ b/Subsystems/Elevator.h
@@ -21,4 +21,4 @@ class Elevator{
     bool GetElevatorBottom();
 };
 #endif
-// vim: ts2:sw=2:et
+// vim: ts=2:sw=2:et