Base styles done
Fixed conflicts and finished base styles