Fix bugs, 2.0 theme