week 3, format changes
Merge upstream with origin
redo format, add folder for themes
redo format
widen code with kntr hook
Incorporar cambios de arriba