Refactor Styles to be more generic