Add the rest of KaosDroid