print_clipboard() {
     print_selection() {
-        print_bar_block "$1:[" "${COL_WHITE}" 0
+        print_bar_block "$1 [" "${COL_WHITE}" 0
         CLEANED=$(wl-paste $2 | sed 's/"/\\"/g')
        ELLIPSIS=
         if [ $(echo "${CLEANED}" | wc -c) -gt 32 ]; then
            ELLIPSIS='...'
         fi
         print_bar_block "${CLEANED}" "" 0
-        print_bar_block "${ELLIPSIS}]" "${COL_WHITE}"
+        print_bar_block "${ELLIPSIS}]" "${COL_WHITE}" $3
     }
-    print_selection C
-    print_selection P --primary
+    print_selection 'wl-paste' '' 0
+    print_selection ' --primary' --primary
 }
 
 print_online() {
     else
         LAYOUT=??
     fi
-    print_bar_block "k:${LAYOUT}"
+    print_bar_block "kb_${LAYOUT}"
 }
 
 printf '{"version": 1}\n['