some refactoring, added i3 config