updated theme, added active state, updated utils