Add default theme and rename vars for readability