merged your style changes into deviowa repository

looks so awesome now :), just added some todos and took care of one of them