Completed theming,fixed design issues
Fixed cnflicts
Fixed cnflicts