Added explicit configuration for some floating applications
Merge branch 'master' into laptop