jcs re-arrange, fix cmus-controls
Latest commit 9917111 Aug 16, 2018