Refactor theme settings for buttons