Finally had some time to work on my setup.