Work in progress

New theme,
started working with badges