edit: Remove more hard-coded values for improved themes support.