Submodules + i3blocks fixes