Some more changes, more near to theme I think

Still a lot of changes will come in the future though...