Some refactoring
Merge branch 'master' of github.com:EmilianStankov/Viridis-Media-Player