fixed themes and scroll bar
fixed errors