samples & fix theme bugs