Consolidate 3 block lists to 1, add tab completion, removed 4 blocks due to skin change