Separate some style in separated files
Update HTML template for the new mackup