Adding theme + mini-fixes