This reverts commit c95ab685e4a77823247886e01fa044223e247a89 and adds code fixes to scss files Co-authored-by: Jesús Espino <jespinog@gmail.com>