Removed unneeded modules
Updated theme