Feature/restyle extension