fix theme + add features
fix theme