Update settings namespaces
Update namespaces
Make option display more strict
Use proper reference to self class
Initial commit