Added clementine support, removed swap indicator