Update styles to 2.2 version + some refactoring

Change-Id: Id66d1c73c146d4a71930ee0f6318ce8aa52f4247
Reviewed-by: Jarosław Staniek <staniek@kde.org>