diff --git a/cursors/Oxygen_White/index.theme b/cursors/Oxygen_White/index.theme
index 81ec0f69..8717d7cd 100644
--- a/cursors/Oxygen_White/index.theme
+++ b/cursors/Oxygen_White/index.theme
@@ -1,81 +1,81 @@
 [Icon Theme]
 Name=Oxygen White
 Name[ar]=أكسجين أبيض
 Name[ca]=Oxygen blanc
 Name[ca@valencia]=Oxygen blanc
 Name[cs]=Oxygen - Bílý
 Name[da]=Oxygen Hvid
 Name[de]=Oxygen-Weiß
 Name[el]=Oxygen λευκό
 Name[en_GB]=Oxygen White
 Name[es]=Oxígeno blanco
 Name[et]=Oxygen White
 Name[eu]=Oxygen Zuria
 Name[fi]=Oxygen, valkoinen
 Name[fr]=Oxygène Blanc
 Name[gl]=Oxygen branco
 Name[hu]=Oxygen White
 Name[ia]=Oxygen Blanc
 Name[id]=Putih Oxygen
 Name[it]=Oxygen bianco
 Name[ko]=Oxygen 흰색
 Name[lt]=Oxygen balta
 Name[nl]=Oxygen-wit
 Name[nn]=Oxygen kvit
 Name[pa]=ਆਕਸੀਜਨ ਚਿੱਟਾ
 Name[pl]=Biały Tlen
 Name[pt]=Oxygen Branco
 Name[pt_BR]=Oxygen White
 Name[ro]=Oxygen Alb
 Name[ru]=Белая Oxygen
 Name[sk]=Oxygen - biely
 Name[sl]=Kisik - bela
 Name[sr]=Кисеоников бели
 Name[sr@ijekavian]=Кисеоников бели
 Name[sr@ijekavianlatin]=Kiseonikov beli
 Name[sr@latin]=Kiseonikov beli
 Name[sv]=Oxygen vit
 Name[tr]=Oxygen Beyazı
 Name[uk]=Біла Oxygen
 Name[x-test]=xxOxygen Whitexx
-Name[zh_CN]=Oxygen 白
+Name[zh_CN]=氧气-白
 Name[zh_TW]=Oxygen 白
 Comment=Oxygen mouse theme. Oxygenize your desktop!
 Comment[ca]=Tema Oxygen pel ratolí. Oxygenitza el teu escriptori!
 Comment[ca@valencia]=Tema Oxygen pel ratolí. Oxygenitza el teu escriptori!
 Comment[da]=Oxygen musetema. Oxygenisér din desktop!
 Comment[de]=Mausdesign für Oxygen.
 Comment[el]=Θέμα ποντικιού Oxygen. Κάντε την επιφάνεια εργασίας σας πιο Oxygen!
 Comment[en_GB]=Oxygen mouse theme. Oxygenise your desktop!
 Comment[es]=Tema de ratón Oxígeno. ¡Oxigene su escritorio!
 Comment[et]=Oxygeni hiireteema. Oksigeneeri oma töölaud!
 Comment[eu]=Oxygen sagu-gaia, Oxygenotu zure mahaigaina!
 Comment[fi]=Oxygen-osoitinteema. Oxygenoi työpöytäsi!
 Comment[fr]=Thème de curseur Oxygène. Oxygénisez votre bureau !
 Comment[gl]=Tema de rato de Oxygen. Oxixene o escritorio!
 Comment[hu]=Oxygen egértéma. Lélegezzen fel asztala!
 Comment[ia]=Thema de mus de Oxygen. Oxygenisa tu scriptorio!
 Comment[id]=Tema mouse Oxygen. Mengoksigenkan desktopmu!
 Comment[it]=Tema del mouse Oxygen. Ossigena il tuo desktop!
 Comment[ko]=Oxygen 마우스 테마입니다. 데스크톱에 산소를 불어넣으십시오!
 Comment[lt]=Oxygen pelės tema. Papuošk savo darbalaukį su Oxygen!
 Comment[nl]=Muisthema van Oxygen. Geef uw bureaublad zuurstof!
 Comment[nn]=Oxygen peikartema. Oxygeniser skrivebordet!
 Comment[pa]=ਆਕਸੀਜਨ ਮਾਊਸ ਥੀਮ। ਆਕਸੀਜਨ ਨਾਲ ਤੁਹਾਡਾ ਡੈਸਕਟਾਪ!
 Comment[pl]=Tlen - zestaw wskaźników myszy. Dotleń swój pulpit!
 Comment[pt]=Tema do rato no Oxygen. Dê oxigénio ao seu ambiente de trabalho!
 Comment[pt_BR]=Tema de cursor Oxygen. Oxygenize seu desktop!
 Comment[ro]=Temă pentru maus Oxygen. Oxigenează-ți biroul!
 Comment[ru]=Тема курсоров мыши Oxygen
 Comment[sk]=Téma myši Oxygen. Okysličte si plochu!
 Comment[sl]=Tema kazalke Kisik. Nasitite vaše namizje s kisikom!
 Comment[sr]=Кисеоникова тема миша. Да вам површ продише!
 Comment[sr@ijekavian]=Кисеоникова тема миша. Да вам површ продише!
 Comment[sr@ijekavianlatin]=Kiseonikova tema miša. Da vam površ prodiše!
 Comment[sr@latin]=Kiseonikova tema miša. Da vam površ prodiše!
 Comment[sv]=Oxygen-muspekartema. Syresätt skrivbordet!
 Comment[tr]=Oxygen fare teması. Masaüstünüzü Oxygenleştirin!
 Comment[uk]=Тема вказівників миші Oxygen. Додайте кисню вашій стільниці!
 Comment[x-test]=xxOxygen mouse theme. Oxygenize your desktop!xx
 Comment[zh_CN]=Oxygen 鼠标主题。Oxygen 化您的桌面！
 Comment[zh_TW]=Oxygen 滑鼠主題。
diff --git a/kdecoration/config/oxygendecorationconfig.desktop b/kdecoration/config/oxygendecorationconfig.desktop
index 2a7d2047..62cbb53e 100644
--- a/kdecoration/config/oxygendecorationconfig.desktop
+++ b/kdecoration/config/oxygendecorationconfig.desktop
@@ -1,124 +1,124 @@
 [Desktop Entry]
 Exec=kcmshell5 oxygendecorationconfig
 Icon=preferences-system-windows
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-Library=org.kde.kdecoration2/oxygendecoration
 X-KDE-PluginKeyword=kcmodule
 X-KDE-ParentApp=kcontrol
 X-KDE-Weight=60
 
 Name=Oxygen Window Decoration
 Name[ca]=Decoració de les finestres Oxygen
 Name[ca@valencia]=Decoració de les finestres Oxygen
 Name[cs]=Dekorace oken Oxygen
 Name[da]=Oxygen vinduesdekoration
 Name[de]=Oxygen-Fensterdekoration
 Name[el]=Διακοσμήσεις παραθύρου Oxygen
 Name[en_GB]=Oxygen Window Decoration
 Name[es]=Decoración de ventanas Oxígeno
 Name[eu]=Oxygen leihoen apaindura
 Name[fi]=Oxygen-ikkunakehys
 Name[fr]=Décoration de fenêtre Oxygène
 Name[gl]=Decoración da xanela Oxygen
 Name[hu]=Oxygen ablakdekoráció
 Name[id]=Dekorasi Window Oxygen
 Name[it]=Decorazione delle finestre di Oxygen
 Name[ko]=Oxygen 창 장식
 Name[nl]=Oxygen vensterdecoratie
 Name[nn]=Oxygen vindaugsdekorasjon
 Name[pa]=ਆਕਸੀਜਨ ਵਿੰਡੋ ਸਜਾਵਟ
 Name[pl]=Wygląd okien Tlenu
 Name[pt]=Decoração de Janelas Oxygen
 Name[pt_BR]=Decorações da janela Oxygen
 Name[ru]=Оформление окон Oxygen
 Name[sk]=Dekorácie okien Oxygen
 Name[sl]=Okraski oken Kisik
 Name[sr]= Кисеоникова декорација прозора
 Name[sr@ijekavian]= Кисеоникова декорација прозора
 Name[sr@ijekavianlatin]= Kiseonikova dekoracija prozora
 Name[sr@latin]= Kiseonikova dekoracija prozora
 Name[sv]=Oxygen fönsterdekoration
 Name[tr]=Oxygen Pencere Dekorasyonu
 Name[uk]=Декорації вікон Oxygen
 Name[x-test]=xxOxygen Window Decorationxx
-Name[zh_CN]=氧气窗口装饰
+Name[zh_CN]=Oxygen 窗口装饰
 Name[zh_TW]=Oxygen 視窗裝飾
 Comment=Modify the appearance of window decorations
 Comment[ca]=Modifica l'aparença de les decoracions de les finestres
 Comment[ca@valencia]=Modifica l'aparença de les decoracions de les finestres
 Comment[cs]=Změnit vzhled dekorace oken
 Comment[da]=Ændr vinduesdekorationers udseende
 Comment[de]=Das Erscheinungsbild der Fensterdekorationen ändern
 Comment[el]=Τροποποίηση εμφάνισης της διακόσμησης παραθύρου
 Comment[en_GB]=Modify the appearance of window decorations
 Comment[es]=Modificar el aspecto de las decoraciones de las ventanas
 Comment[et]=Akna dekoratsioonide välimuse muutmine
 Comment[eu]=Aldatu leiho apainduren itxura
 Comment[fi]=Muuta ikkunoiden kehysten ulkoasua
 Comment[fr]=Modifie l'apparence des décorations de fenêtre
 Comment[gl]=Modifica a aparencia da decoración da xanela
 Comment[hu]=Az ablakdekorációk megjelenésének módosítása
 Comment[ia]=Modifica le apparentia de decorationes de fenestra
 Comment[id]=Modifikasi penampilan pada dekorasi window
 Comment[it]=Modifica l'aspetto delle decorazioni delle finestre
 Comment[ko]=창 장식의 모습을 수정합니다
 Comment[lt]=Keisti lango dekoracijų išvaizdą
 Comment[nl]=Wijzig het uiterlijk van vensterdecoraties
 Comment[nn]=Endra utsjånad på vindaugspynt
 Comment[pl]=Zmień wygląd okien
 Comment[pt]=Modificar a aparência das decorações das janelas
 Comment[pt_BR]=Modifica a aparência das decorações da janela
 Comment[ru]=Настройка заголовков окон в стиле Oxygen
 Comment[sk]=Zmeniť vzhľad dekorácie okien
 Comment[sl]=Spremenite videz okraskov oken
 Comment[sr]=Измените изглед декорације прозора
 Comment[sr@ijekavian]=Измијените изглед декорације прозора
 Comment[sr@ijekavianlatin]=Izmijenite izgled dekoracije prozora
 Comment[sr@latin]=Izmenite izgled dekoracije prozora
 Comment[sv]=Ändra fönsterdekorationers utseende
 Comment[tr]=Pencere dekorasyonlarının görünümünü düzenle
 Comment[uk]=Зміна вигляду декорацій вікон
 Comment[x-test]=xxModify the appearance of window decorationsxx
 Comment[zh_CN]=修改窗口装饰外观
 Comment[zh_TW]=變更視窗裝飾的外觀
 X-KDE-Keywords=oxygen,decoration
 X-KDE-Keywords[ca]=oxygen,decoració
 X-KDE-Keywords[ca@valencia]=oxygen,decoració
 X-KDE-Keywords[cs]=oxygen,dekorace
 X-KDE-Keywords[da]=oxygen,dekoration
 X-KDE-Keywords[de]=oxygen,decoration,Dekoration
 X-KDE-Keywords[el]=oxygen,διακόσμηση
 X-KDE-Keywords[en_GB]=oxygen,decoration
 X-KDE-Keywords[es]=oxígeno,decoración
 X-KDE-Keywords[et]=oxygen,dekoratsioon
 X-KDE-Keywords[eu]=oxygen,apaindura
 X-KDE-Keywords[fi]=oxygen,decoration,kehys,koriste,koristus,ikkunakehys
 X-KDE-Keywords[fr]=oxygène,décoration
 X-KDE-Keywords[gl]=oxygen,decoración
 X-KDE-Keywords[hu]=oxygen,dekoráció
 X-KDE-Keywords[ia]=oxygen,decoration
 X-KDE-Keywords[id]=oxygen,dekorasi
 X-KDE-Keywords[it]=oxygen,decorazione
 X-KDE-Keywords[ko]=oxygen,decoration,장식
 X-KDE-Keywords[lt]=oxygen,dekoracija
 X-KDE-Keywords[nl]=oxygen,decoratie
 X-KDE-Keywords[nn]=oxygen,dekorasjon,pynt
 X-KDE-Keywords[pa]=ਆਕਸੀਜਨ,ਸਜਾਵਟ
 X-KDE-Keywords[pl]=tlen,wystrój
 X-KDE-Keywords[pt]=oxygen,decoração
 X-KDE-Keywords[pt_BR]=oxygen,decoração
 X-KDE-Keywords[ru]=oxygen,оксиджен,decoration,декорации окон,оформление окон
 X-KDE-Keywords[sk]=oxygen,dekorácia
 X-KDE-Keywords[sl]=kisik,okraski
 X-KDE-Keywords[sr]=oxygen,decoration,Кисеоник,декорација
 X-KDE-Keywords[sr@ijekavian]=oxygen,decoration,Кисеоник,декорација
 X-KDE-Keywords[sr@ijekavianlatin]=oxygen,decoration,Kiseonik,dekoracija
 X-KDE-Keywords[sr@latin]=oxygen,decoration,Kiseonik,dekoracija
 X-KDE-Keywords[sv]=oxygen,dekoration
 X-KDE-Keywords[tr]=oxygen,dekorasyon
 X-KDE-Keywords[uk]=oxygen,decoration,декорація,обрамлення
 X-KDE-Keywords[x-test]=xxoxygenxx,xxdecorationxx
 X-KDE-Keywords[zh_CN]=oxygen,decoration,装饰
 X-KDE-Keywords[zh_TW]=oxygen,decoration
diff --git a/kstyle/config/oxygenstyleconfig.desktop b/kstyle/config/oxygenstyleconfig.desktop
index f277792c..e2bf5a32 100644
--- a/kstyle/config/oxygenstyleconfig.desktop
+++ b/kstyle/config/oxygenstyleconfig.desktop
@@ -1,129 +1,129 @@
 [Desktop Entry]
 Exec=kcmshell5 oxygenstyleconfig
 Icon=preferences-desktop-theme
 Type=Service
 X-KDE-ServiceTypes=KCModule
 
 X-KDE-Library=kstyle_oxygen_config
 X-KDE-PluginKeyword=kcmodule
 X-KDE-ParentApp=kcontrol
 X-KDE-Weight=50
 
 Name=Oxygen Widget Style
 Name[ca]=Estil dels estris Oxygen
 Name[ca@valencia]=Estil dels estris Oxygen
 Name[cs]=Styl widgetů Oxygen
 Name[da]=Oxygen kontrolstil
 Name[de]=Oxygen-Stil der Bedienelemente
 Name[el]=Στιλ γραφικών συστατικών Oxygen
 Name[en_GB]=Oxygen Widget Style
 Name[es]=Estilo de elementos gráficos Oxígeno
 Name[eu]=Oxygen trepeten estiloa
 Name[fi]=Oxygen-elementtityyli
 Name[fr]=Style de composants graphiques Oxygène
 Name[gl]=Estilo de trebello Oxygen
 Name[hu]=Oxygen elemstílus
 Name[id]=Gaya Widget Oxygen
 Name[it]=Stile degli oggetti di Oxygen
 Name[ko]=Oxygen 위젯 스타일
 Name[nl]=Oxygen widgetstijl
 Name[nn]=Oxygen elementstil
 Name[pa]=ਆਕਸੀਜਨ ਵਿਜੈਟ ਸਟਾਈਲ
 Name[pl]=Wygląd interfejsu Tlenu
 Name[pt]=Estilo Gráfico Oxygen
 Name[pt_BR]=Estilo dos widgets Oxygen
 Name[ru]=Стиль интерфейса Oxygen
 Name[sk]=Štýl prvkov Oxygen
 Name[sl]=Slog gradnikov Kisik
 Name[sr]=Кисеоников стил виџета̂
 Name[sr@ijekavian]=Кисеоников стил виџета̂
 Name[sr@ijekavianlatin]=Kiseonikov stil vidžetâ̂
 Name[sr@latin]=Kiseonikov stil vidžetâ̂
 Name[sv]=Oxygen stil för grafiska komponenter
 Name[tr]=Oxygen Programcık Biçimi
 Name[uk]=Стиль віджетів Oxygen
 Name[x-test]=xxOxygen Widget Stylexx
-Name[zh_CN]=氧气小部件样式
+Name[zh_CN]=Oxygen 部件样式
 Name[zh_TW]=Oxygen 元件樣式
 Comment=Modify the appearance of widgets
 Comment[ar]=عدّل مظهر الودجات
 Comment[ca]=Modifica l'aparença dels estris
 Comment[ca@valencia]=Modifica l'aparença dels estris
 Comment[cs]=Změnit vzhled widgetů
 Comment[da]=Ændr kontrollers udseende
 Comment[de]=Das Erscheinungsbild der Bedienelemente ändern
 Comment[el]=Τροποποίηση εμφάνισης συστατικών
 Comment[en_GB]=Modify the appearance of widgets
 Comment[es]=Modificar el aspecto de los elementos gráficos
 Comment[et]=Vidinate välimuse muutmine
 Comment[eu]=Aldatu trepeten itxura
 Comment[fi]=Muuta elementtien ulkoasua
 Comment[fr]=Modifier l'apparence des composants graphiques
 Comment[gl]=Modifica a aparencia dos trebellos
 Comment[hu]=Az elemek megjelenésének módosítása
 Comment[ia]=Modifica le apparentia de widgets
 Comment[id]=Modifikasi penampilan pada widget
 Comment[it]=Modifica l'aspetto degli oggetti
 Comment[ko]=위젯의 모습을 수정합니다
 Comment[lt]=Keisti valdiklių išvaizdą
 Comment[nl]=Wijzig het uiterlijk van widgets
 Comment[nn]=Endra utsjånaden på skjermkontrollar
 Comment[pl]=Zmień wygląd interfejsu
 Comment[pt]=Modificar a aparência dos elementos gráficos
 Comment[pt_BR]=Modifica a aparência dos widgets
 Comment[ro]=Modifică aspectul controalelor
 Comment[ru]=Настройка элементов интерфейса в стиле Oxygen
 Comment[sk]=Zmena vzhľadu prvkov
 Comment[sl]=Spremenite videz gradnikov
 Comment[sr]=Измените изглед виџета
 Comment[sr@ijekavian]=Измијените изглед виџета
 Comment[sr@ijekavianlatin]=Izmijenite izgled vidžeta
 Comment[sr@latin]=Izmenite izgled vidžeta
 Comment[sv]=Ändra grafiska komponenters utseende
 Comment[tr]=Parçacıklarının görünümünü düzenle
 Comment[uk]=Зміна вигляду віджетів
 Comment[x-test]=xxModify the appearance of widgetsxx
 Comment[zh_CN]=修改部件外观
 Comment[zh_TW]=變更元件外觀
 
 X-KDE-Keywords=oxygen,widget,style
 X-KDE-Keywords[ar]=أكسجين,ودجة,نمط
 X-KDE-Keywords[ca]=oxygen,estri,estil
 X-KDE-Keywords[ca@valencia]=oxygen,estri,estil
 X-KDE-Keywords[cs]=oxygen,widget,styl
 X-KDE-Keywords[da]=oxygen,kontrol,stil
 X-KDE-Keywords[de]=Oxygen,Bedienelement,Stil
 X-KDE-Keywords[el]=oxygen,γραφικό συστατικό,στιλ
 X-KDE-Keywords[en_GB]=oxygen,widget,style
 X-KDE-Keywords[es]=oxygen,oxígeno,elemento gráfico,widget,estilo
 X-KDE-Keywords[et]=oxygen,vidin,stiil
 X-KDE-Keywords[eu]=oxygen,trepeta,estiloa
 X-KDE-Keywords[fi]=oxygen,widget,style,tyyli,käyttöliittymäelementti,elementti,kontrolli,säädin
 X-KDE-Keywords[fr]=Oxygène, Composants graphiques, Style
 X-KDE-Keywords[gl]=oxygen,trebello,trebello,estilo
 X-KDE-Keywords[hu]=oxygen,elem,stílus
 X-KDE-Keywords[ia]=oxygen,widget,stylo
 X-KDE-Keywords[id]=oxygen,widget,gaya
 X-KDE-Keywords[it]=oxygen,oggetto,stile
 X-KDE-Keywords[ko]=oxygen,widget,style,위젯,스타일
 X-KDE-Keywords[lt]=oxygen,valdiklis,stilius
 X-KDE-Keywords[nl]=oxygen,widget,stijl
 X-KDE-Keywords[nn]=oxygen,skjermkontroll,stil
 X-KDE-Keywords[pa]=ਆਕਸੀਜਨ,ਵਿਜੈਟ,ਸਟਾਈਲ
 X-KDE-Keywords[pl]=oxygen,widget,styl,tlen,element interfejsu
 X-KDE-Keywords[pt]=oxygen,elemento,estilo
 X-KDE-Keywords[pt_BR]=oxygen,widget,estilo
 X-KDE-Keywords[ro]=oxygen,widget,stil,control,controale
 X-KDE-Keywords[ru]=oxygen,оксиджен,элемент интерфейса,виджет,внешний вид,визуальное представление,стиль,тема,оформление
 X-KDE-Keywords[sk]=oxygen,widget,štýl
 X-KDE-Keywords[sl]=kisik,gradnik,slog
 X-KDE-Keywords[sr]=oxygen,widget,style,Кисеоник,виџет,стил
 X-KDE-Keywords[sr@ijekavian]=oxygen,widget,style,Кисеоник,виџет,стил
 X-KDE-Keywords[sr@ijekavianlatin]=oxygen,widget,style,Kiseonik,vidžet,stil
 X-KDE-Keywords[sr@latin]=oxygen,widget,style,Kiseonik,vidžet,stil
 X-KDE-Keywords[sv]=oxygen,grafisk komponent,stil
 X-KDE-Keywords[tr]=oxygen,parçacık,biçem
 X-KDE-Keywords[uk]=oxygen,widget,style,оксиген,кисень,віджет,стиль
 X-KDE-Keywords[x-test]=xxoxygenxx,xxwidgetxx,xxstylexx
 X-KDE-Keywords[zh_CN]=oxygen,widget,style,部件,样式
 X-KDE-Keywords[zh_TW]=oxygen,widget,style