Add toolbar and rebuild theme