Fixing broken Lumen theme (mostly :P)
Fixing merge conflict