added tvbscolor + some refactoring