Added common include files
Updated to use common include files
Fixed typo mistake in theme name
Tab character is set to 2 spaces