Refactor look and feel handling

Issue: #148