Opacity added on everthing!
Merge with master