Added a new height to the media dialog
Resovled merge conflict in colors selection