Bug fixe + better theme