Fix #2 #3 implement custom plugin and theme