Functions Update

Combined actions into master theme setup function.