apply last changes

pt 1
apply last changes

pt2: theme
fix some compatibility issues