diff --git a/CMakeLists.txt b/CMakeLists.txt
index 216a9e8d1..666d891ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,8 +43,8 @@ option(WITH_BREAKPAD "Build with breakpad integration" ON)
 option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
 option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
 option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-OPTION(WITH_UPOWER "Build with support for UPower events" OFF)
-OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" OFF)
+option(WITH_UPOWER "Build with support for UPower events" OFF)
+option(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" OFF)
 
 IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
     message(STATUS "Build of breakpad library disabled on this platform.")
@@ -75,7 +75,7 @@ ENDIF()
 IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
     INCLUDE( CMakeDateStamp )
     SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( TOMAHAWK_VERSION_DATE GREATER 0)
+    IF( TOMAHAWK_VERSION_DATE GREATER 0 )
         SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
     ENDIF()
 
@@ -111,9 +111,9 @@ else()
 endif()
 
 
-if(NOT BUILD_WITH_QT4)
+if( NOT BUILD_WITH_QT4 )
     find_package(Qt5Core QUIET)
-    if(Qt5Core_DIR)
+    if( Qt5Core_DIR )
         find_package(Qt5Widgets QUIET)
         message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
 
@@ -139,7 +139,7 @@ if(NOT BUILD_WITH_QT4)
         set(WITH_BREAKPAD OFF)
     endif()
 endif()
-if(NOT Qt5Core_DIR)
+if( NOT Qt5Core_DIR )
     message(STATUS "Could not find Qt5, searching for Qt4 instead...")
 
     set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
@@ -169,10 +169,10 @@ if(NOT Qt5Core_DIR)
     endmacro()
 
     macro(setup_qt)
-        if(NOT BUILD_GUI)
+        if( NOT BUILD_GUI )
             set(QT_DONT_USE_QTGUI TRUE)
         endif()
-        if(UNIX AND NOT APPLE)
+        if( UNIX AND NOT APPLE )
             set(QT_USE_QTDBUS TRUE)
         endif()
         set(QT_USE_QTSQL TRUE)
@@ -185,7 +185,7 @@ if(NOT Qt5Core_DIR)
     endmacro()
 endif()
 
-if(BUILD_GUI AND UNIX AND NOT APPLE)
+if( BUILD_GUI AND UNIX AND NOT APPLE )
     find_package( X11 )
 endif()
 
@@ -197,7 +197,7 @@ ENDIF( UNIX AND NOT APPLE AND QT_QTDBUS_FOUND  )
 
 macro_optional_find_package(Phonon 4.5.0)
 macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
-if(PHONON_FOUND)
+if( PHONON_FOUND )
     message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
@@ -229,7 +229,7 @@ macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloa
 
 macro_optional_find_package(Jreen 1.0.5)
 macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
-if(PC_JREEN_VERSION STREQUAL "1.1.0")
+if( PC_JREEN_VERSION STREQUAL "1.1.0" )
     message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
 endif()
 
@@ -284,7 +284,7 @@ macro_optional_find_package(KDE4Installed)
 # for future kde integration
 
 # macro_optional_find_package(KDE4)
-IF(KDE4_FOUND)
+IF( KDE4_FOUND )
     IF( CMAKE_C_FLAGS )
         # KDE4 adds and removes some compiler flags that we don't like
         # (only for gcc not for clang e.g.)