Refactored theme; Created style for buttons