Merge branch 'basic-styles-2'

Made some changes

Signed-off-by: Dave <davidajberner@gmail.com>