Added theme, fixed view item form switch