Merge branch 'alinasava/web-dev-a' into 'master' 2x Dark mode fixes + Typo in color name fix See merge request makerlog/web!50