Cleared deprecated warnings and got 3.5 screens locked and looking good