diff --git a/src/openvr/openvr_init.cpp b/src/openvr/openvr_init.cpp
index 086866f..1df89e1 100644
--- a/src/openvr/openvr_init.cpp
+++ b/src/openvr/openvr_init.cpp
@@ -32,8 +32,8 @@ void initializeProperly( const OpenVrInitializationType initType )
         }
         LOG( ERROR ) << "Failed to initialize OpenVR: "
                             + std::string(
-                                  vr::VR_GetVRInitErrorAsEnglishDescription(
-                                      initError ) );
+                                vr::VR_GetVRInitErrorAsEnglishDescription(
+                                    initError ) );
         exit( EXIT_FAILURE );
     }
     else
diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index cde705a..94a1754 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -338,7 +338,7 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
             throw std::runtime_error( std::string(
                 "Failed to create Overlay: "
                 + std::string( vr::VROverlay()->GetOverlayErrorNameFromEnum(
-                      overlayError ) ) ) );
+                    overlayError ) ) ) );
         }
         vr::VROverlay()->SetOverlayWidthInMeters( m_ulOverlayHandle, 2.5f );
         vr::VROverlay()->SetOverlayInputMethod(
@@ -446,7 +446,7 @@ void OverlayController::renderOverlay()
         if ( !vr::VROverlay()
              || ( !vr::VROverlay()->IsOverlayVisible( m_ulOverlayHandle )
                   && !vr::VROverlay()->IsOverlayVisible(
-                         m_ulOverlayThumbnailHandle ) ) )
+                      m_ulOverlayThumbnailHandle ) ) )
             return;
         m_pRenderControl->polishItems();
         m_pRenderControl->sync();
diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp
index 5efe422..fa72f27 100644
--- a/src/tabcontrollers/UtilitiesTabController.cpp
+++ b/src/tabcontrollers/UtilitiesTabController.cpp
@@ -337,8 +337,8 @@ void UtilitiesTabController::eventLoopTick()
                                 parent->setAlarmEnabled( true );
                             }
                             else if (
-                                res
-                                >= vr::VRMessageOverlayResponse_CouldntFindSystemOverlay )
+                                res >= vr::
+                                    VRMessageOverlayResponse_CouldntFindSystemOverlay )
                             {
                                 static const char* errorMessages[]
                                     = { "CouldntFindSystemOverlay",
@@ -346,7 +346,8 @@ void UtilitiesTabController::eventLoopTick()
                                         "ApplicationQuit" };
                                 int errorCode
                                     = res
-                                      - vr::VRMessageOverlayResponse_CouldntFindSystemOverlay;
+                                      - vr::
+                                          VRMessageOverlayResponse_CouldntFindSystemOverlay;
                                 if ( res < 3 )
                                 {
                                     LOG( ERROR )
diff --git a/src/utils/setup.cpp b/src/utils/setup.cpp
index 6485fd9..c6edb48 100644
--- a/src/utils/setup.cpp
+++ b/src/utils/setup.cpp
@@ -107,8 +107,8 @@ void enableApplicationAutostart()
         throw std::runtime_error(
             std::string( "Could not set auto start: " )
             + std::string(
-                  vr::VRApplications()->GetApplicationsErrorNameFromEnum(
-                      app_error ) ) );
+                vr::VRApplications()->GetApplicationsErrorNameFromEnum(
+                    app_error ) ) );
     }
 }
 
@@ -124,8 +124,8 @@ void installApplicationManifest( const std::string manifestPath )
         throw std::runtime_error(
             std::string( "Could not add application manifest: " )
             + std::string(
-                  vr::VRApplications()->GetApplicationsErrorNameFromEnum(
-                      app_error ) ) );
+                vr::VRApplications()->GetApplicationsErrorNameFromEnum(
+                    app_error ) ) );
     }
 }
 
@@ -163,8 +163,8 @@ void reinstallApplicationManifest( const std::string manifestPath )
                 "Could not find working directory of already "
                 "installed application: "
                 + std::string(
-                      vr::VRApplications()->GetApplicationsErrorNameFromEnum(
-                          app_error ) ) );
+                    vr::VRApplications()->GetApplicationsErrorNameFromEnum(
+                        app_error ) ) );
         }
 
         const auto oldManifestPath