Add energy theme, tweaks from first month of data