[Fix] Merge - Readd keyboard scss