add scribble theme
fix conflicts