updated with new text layer
updated button styles and parser
mergefix?