feat(rework): Reworked all styles and some code