diff --git a/.gitignore b/.gitignore
index 4eeab9e..b7c6f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /.idea/*
 !/.idea/runConfigurations
 !/.idea/cmake.xml
+!/.idea/codeStyles
 
 # Python 
 __pycache__
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa25ba8..0f04d10 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_SCRIPT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 if(NOT FSFW_OSAL)
-    set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
+  set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
 endif()
 
 # Project Name
@@ -31,7 +31,7 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
 # Set names and variables
-set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
+set(TARGET_NAME ${CMAKE_PROJECT_NAME})
 set(LIB_FSFW_NAME fsfw)
 set(LIB_FSFW_HAL_NAME fsfw_hal)
 
@@ -43,12 +43,12 @@ set(LIB_FSFW_HAL_PATH fsfw_hal)
 set(BSP_PATH "bsp_hosted")
 set(COMMON_CONFIG_PATH "${COMMON_PATH}/config")
 set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
-set(FSFW_ADDITIONAL_INC_PATHS 
-    "${COMMON_CONFIG_PATH}"
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    CACHE STRING
-    "FSFW configuration paths"
-)
+set(FSFW_ADDITIONAL_INC_PATHS
+  "${COMMON_CONFIG_PATH}"
+  "${CMAKE_CURRENT_BINARY_DIR}"
+  CACHE STRING
+  "FSFW configuration paths"
+  )
 
 configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
@@ -57,30 +57,30 @@ configure_file(${FSFW_CONFIG_PATH}/OBSWConfig.h.in OBSWConfig.h)
 set(FSFW_ADD_MONITORING ON)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set(WARNING_FLAGS
-        -Wall
-        -Wextra
-        -Wimplicit-fallthrough=1
-        -Wno-unused-parameter
-        -Wno-psabi
+  set(WARNING_FLAGS
+    -Wall
+    -Wextra
+    -Wimplicit-fallthrough=1
+    -Wno-unused-parameter
+    -Wno-psabi
     )
 
-    set(FSFW_WARNING_FLAGS ${WARNING_FLAGS})
+  set(FSFW_WARNING_FLAGS ${WARNING_FLAGS})
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options(/permissive- /d2SSAOptimizer-)
-    # To avoid nameclashes with min and max macro
-    add_compile_definitions(NOMINMAX)
+  add_compile_options(/permissive- /d2SSAOptimizer-)
+  # To avoid nameclashes with min and max macro
+  add_compile_definitions(NOMINMAX)
 endif()
 
 if(FSFW_OSAL MATCHES linux)
-    find_package(Threads REQUIRED)
-# Hosted
+  find_package(Threads REQUIRED)
+  # Hosted
 else()
 
-    if(WIN32)
-    elseif(UNIX)
-        find_package(Threads REQUIRED)
-    endif()
+  if(WIN32)
+  elseif(UNIX)
+    find_package(Threads REQUIRED)
+  endif()
 endif()
 
 
@@ -93,7 +93,7 @@ add_executable(${TARGET_NAME})
 
 # Add subdirectories
 if(LIB_OS_NAME)
-    add_subdirectory(${LIB_OS_NAME})
+  add_subdirectory(${LIB_OS_NAME})
 endif()
 add_subdirectory(${BSP_PATH})
 add_subdirectory(${FSFW_PATH})
@@ -105,72 +105,72 @@ add_subdirectory(${COMMON_PATH})
 
 # Add libraries for all sources.
 target_link_libraries(${TARGET_NAME} PRIVATE
-    ${LIB_FSFW_NAME} 
-    ${LIB_OS_NAME} 
-    # ${LIB_FSFW_HAL_NAME}
-)
+  ${LIB_FSFW_NAME}
+  ${LIB_OS_NAME}
+  # ${LIB_FSFW_HAL_NAME}
+  )
 
 # Add include paths for all sources.
 target_include_directories(${TARGET_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${FSFW_CONFIG_PATH}
-)    
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${FSFW_CONFIG_PATH}
+  )
 
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    target_link_options(${TARGET_NAME} PRIVATE
-        "-Wl,-Map=${TARGET_NAME}.map"
+  target_link_options(${TARGET_NAME} PRIVATE
+    "-Wl,-Map=${TARGET_NAME}.map"
     )
 
-    # Remove unused sections.
-    target_compile_options(${TARGET_NAME} PRIVATE
-        "-ffunction-sections"
-        "-fdata-sections"
+  # Remove unused sections.
+  target_compile_options(${TARGET_NAME} PRIVATE
+    "-ffunction-sections"
+    "-fdata-sections"
     )
 
-    # Removed unused sections.
-    target_link_options(${TARGET_NAME} PRIVATE
-        "-Wl,--gc-sections"
+  # Removed unused sections.
+  target_link_options(${TARGET_NAME} PRIVATE
+    "-Wl,--gc-sections"
     )
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
 endif()
 
 if(CMAKE_VERBOSE)
-    message(STATUS "Warning flags: ${WARNING_FLAGS}")
+  message(STATUS "Warning flags: ${WARNING_FLAGS}")
 endif()
-         
+
 
 # Compile options for all sources.
 target_compile_options(${TARGET_NAME} PRIVATE
-    ${WARNING_FLAGS}
-)
+  ${WARNING_FLAGS}
+  )
 
 if(NOT CMAKE_SIZE)
-    set(CMAKE_SIZE size)
-    if(WIN32)
-        set(FILE_SUFFIX ".exe")
-    endif()
+  set(CMAKE_SIZE size)
+  if(WIN32)
+    set(FILE_SUFFIX ".exe")
+  endif()
 endif()
 
 if(TGT_BSP)
-    set(TARGET_STRING "Target BSP: ${TGT_BSP}")
+  set(TARGET_STRING "Target BSP: ${TGT_BSP}")
 else()
-    set(TARGET_STRING "Target BSP: Hosted")
+  set(TARGET_STRING "Target BSP: Hosted")
 endif()
 
 string(CONCAT POST_BUILD_COMMENT
-    "Build directory: ${CMAKE_BINARY_DIR}\n"
-    "Target OSAL: ${FSFW_OSAL}\n"
-    "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
-    "${TARGET_STRING}"
-)
+  "Build directory: ${CMAKE_BINARY_DIR}\n"
+  "Target OSAL: ${FSFW_OSAL}\n"
+  "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
+  "${TARGET_STRING}"
+  )
 
 add_custom_command(
-   TARGET ${TARGET_NAME}
-   POST_BUILD
-   COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX}
-   COMMENT ${POST_BUILD_COMMENT}
+  TARGET ${TARGET_NAME}
+  POST_BUILD
+  COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX}
+  COMMENT ${POST_BUILD_COMMENT}
 )
 
 include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)