updated theme for frontpage
fix merge conflicts