Converted to 1.6 because of reasons.

Signed-off-by: Jedabero <jedabero@hotmail.com>
And now a new refactoring: Put everything into a window!

Signed-off-by: Jedabero <jedabero@hotmail.com>