Rename Style.gfx2() to Style.gfx()

Drop that "2" suffix in the function name. There's no reason for it anymore
There used to be an unused gfx() function in the past. But that was already
removed.

Change-Id: I6b3709cad3e0c76868f1ab4363a502561da3e258
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>

36 files changed, 54 insertions, 54 deletions

diff --git a/apps/com.luxoft.vehicle/EnergyPanel.qml b/apps/com.luxoft.vehicle/EnergyPanel.qml
index 1f35a02e..f115cfe9 100644
--- a/apps/com.luxoft.vehicle/EnergyPanel.qml
+++ b/apps/com.luxoft.vehicle/EnergyPanel.qml
@@ -84,7 +84,7 @@ Item {
         Image {
             height: 2
             width: parent.width
-            source: Style.gfx2("list-divider", NeptuneStyle.theme)
+            source: Style.gfx("list-divider", NeptuneStyle.theme)
         }
 
         Label {
@@ -136,7 +136,7 @@ Item {
             width: 750
             anchors.top: parent.top
             anchors.topMargin: 168
-            source: Style.gfx2("list-divider", NeptuneStyle.theme)
+            source: Style.gfx("list-divider", NeptuneStyle.theme)
         }
 
         //ToDo: this probably should be in a model later
diff --git a/apps/com.luxoft.vehicle/SupportPanel.qml b/apps/com.luxoft.vehicle/SupportPanel.qml
index 6ff66360..de56675a 100644
--- a/apps/com.luxoft.vehicle/SupportPanel.qml
+++ b/apps/com.luxoft.vehicle/SupportPanel.qml
@@ -81,7 +81,7 @@ ListView {
             // don't show the separator after the last element
             visible: model.index < root.model.count - 1
 
-            source: Style.gfx2("list-divider", NeptuneStyle.theme)
+            source: Style.gfx("list-divider", NeptuneStyle.theme)
             anchors.left: parent.left
             anchors.right: parent.right
             anchors.bottom: parent.bottom
diff --git a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
index cd153fb0..90377fef 100644
--- a/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/DateTimePanel.qml
@@ -59,7 +59,7 @@ Control {
             Image {
                 anchors.bottom: parent.bottom
                 width: parent.width
-                source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                source: Style.gfx("list-divider", NeptuneStyle.theme)
             }
         }
 
@@ -73,7 +73,7 @@ Control {
             Image {
                 anchors.bottom: parent.bottom
                 width: parent.width
-                source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                source: Style.gfx("list-divider", NeptuneStyle.theme)
             }
         }
 
diff --git a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
index 3b97a452..6fe272a3 100644
--- a/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/LanguagePanel.qml
@@ -90,7 +90,7 @@ Control {
                 Image {
                     anchors.bottom: parent.bottom
                     width: parent.width
-                    source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                    source: Style.gfx("list-divider", NeptuneStyle.theme)
                     visible: index !== view.count - 1
                 }
             }
diff --git a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
index 4d28e656..ad6bb471 100644
--- a/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
+++ b/apps/com.pelagicore.apps.settings/panels/ThemesPanel.qml
@@ -82,7 +82,7 @@ Control {
                 Image {
                     Layout.maximumWidth: columnContent.width
                     Layout.minimumWidth: columnContent.width
-                    source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                    source: Style.gfx("list-divider", NeptuneStyle.theme)
                     visible: index !== view.count - 1
                 }
             }
diff --git a/apps/com.pelagicore.appstore/Main.qml b/apps/com.pelagicore.appstore/Main.qml
index 4216957a..eb534878 100644
--- a/apps/com.pelagicore.appstore/Main.qml
+++ b/apps/com.pelagicore.appstore/Main.qml
@@ -50,7 +50,7 @@ AppUIScreen {
         height: 660 - 224 + exposedRect.y
         fillMode: Image.Pad
 
-        source: Style.gfx2("hero-appstore")
+        source: Style.gfx("hero-appstore")
         asynchronous: true
     }
 
diff --git a/apps/com.pelagicore.calendar/controls/EventListItem.qml b/apps/com.pelagicore.calendar/controls/EventListItem.qml
index bd3be913..bf9c0cd3 100644
--- a/apps/com.pelagicore.calendar/controls/EventListItem.qml
+++ b/apps/com.pelagicore.calendar/controls/EventListItem.qml
@@ -79,7 +79,7 @@ ItemDelegate {
             width: parent.width
             height: 5
             anchors.bottom: parent.bottom
-            source: Style.gfx2("divider", NeptuneStyle.theme)
+            source: Style.gfx("divider", NeptuneStyle.theme)
         }
     }
 }
diff --git a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
index a403b1d8..dd30e07d 100644
--- a/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/CalendarWidgetPanel.qml
@@ -99,7 +99,7 @@ Item {
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.bottom: parent.bottom
-        source: Style.gfx2("widget-left-section-bg", NeptuneStyle.theme)
+        source: Style.gfx("widget-left-section-bg", NeptuneStyle.theme)
         fillMode: Image.TileVertically
 
         Item {
diff --git a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
index 346236bd..eecadcc1 100644
--- a/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
+++ b/apps/com.pelagicore.calendar/panels/TopCalendarPanel.qml
@@ -74,7 +74,7 @@ RowLayout {
             }
         }
         Image {
-            source: Style.gfx2("album-art-shadow-widget")
+            source: Style.gfx("album-art-shadow-widget")
         }
     }
 
diff --git a/apps/com.pelagicore.calendar/views/CalendarView.qml b/apps/com.pelagicore.calendar/views/CalendarView.qml
index 0306c28f..d0995ed6 100644
--- a/apps/com.pelagicore.calendar/views/CalendarView.qml
+++ b/apps/com.pelagicore.calendar/views/CalendarView.qml
@@ -67,7 +67,7 @@ Item {
         anchors.right: parent.right
         anchors.top: parent.top
         height: calendarOnTop.height + calendarOnTop.anchors.topMargin + mainControl.anchors.topMargin
-        source: Style.gfx2("app-fullscreen-top-bg", NeptuneStyle.theme)
+        source: Style.gfx("app-fullscreen-top-bg", NeptuneStyle.theme)
         visible: root.state == "Maximized"
     }
 
diff --git a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
index 4138c501..eacd576a 100644
--- a/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
+++ b/apps/com.pelagicore.map/panels/HeaderBackgroundMaximizedPanel.qml
@@ -88,7 +88,7 @@ Item {
         anchors.right: searchPanel.right
         anchors.left: searchPanel.left
         width: searchPanel.width
-        source: Style.gfx2("panel-inner-shadow", NeptuneStyle.theme)
+        source: Style.gfx("panel-inner-shadow", NeptuneStyle.theme)
     }
 
     ScalableBorderImage {
diff --git a/apps/com.pelagicore.map/views/MapView.qml b/apps/com.pelagicore.map/views/MapView.qml
index 1b6675bd..189bef47 100644
--- a/apps/com.pelagicore.map/views/MapView.qml
+++ b/apps/com.pelagicore.map/views/MapView.qml
@@ -153,7 +153,7 @@ Item {
         border.bottom: NeptuneStyle.dp(323)
         border.left: 0
         border.right: 0
-        source: Style.gfx2("input-overlay")
+        source: Style.gfx("input-overlay")
         visible: root.store.searchViewEnabled
     }
 
diff --git a/apps/com.pelagicore.music/Main.qml b/apps/com.pelagicore.music/Main.qml
index 128a9b1a..17ee88a3 100644
--- a/apps/com.pelagicore.music/Main.qml
+++ b/apps/com.pelagicore.music/Main.qml
@@ -70,7 +70,7 @@ QtObject {
             Behavior on opacity { DefaultNumberAnimation {} }
             visible: opacity > 0
 
-            source: Style.gfx2("app-fullscreen-top-bg", NeptuneStyle.theme)
+            source: Style.gfx("app-fullscreen-top-bg", NeptuneStyle.theme)
         }
 
         MusicView {
diff --git a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
index 2fe1f505..f189acd6 100644
--- a/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/AlbumArtPanel.qml
@@ -79,7 +79,7 @@ Item {
             Image {
                 id: albumArtShadow
                 anchors.centerIn: parent
-                source: Style.gfx2("album-art-shadow")
+                source: Style.gfx("album-art-shadow")
                 fillMode: Image.Pad
             }
 
@@ -91,7 +91,7 @@ Item {
                 anchors.centerIn: parent
                 width: NeptuneStyle.dp(180)
                 height: width
-                source: Style.gfx2("album-art-placeholder")
+                source: Style.gfx("album-art-placeholder")
 
                 fillMode: Image.PreserveAspectCrop
             }
diff --git a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
index e5a5cb9a..deb0d782 100644
--- a/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
+++ b/apps/com.pelagicore.music/panels/ICAlbumArtPanel.qml
@@ -76,7 +76,7 @@ Item {
             Image {
                 id: albumArtShadow
                 anchors.centerIn: parent
-                source: Style.gfx2("album-art-shadow")
+                source: Style.gfx("album-art-shadow")
                 fillMode: Image.Pad
             }
 
@@ -85,7 +85,7 @@ Item {
                 anchors.centerIn: parent
                 width: Style.hspan(180/45)
                 height: width
-                source: Style.gfx2("album-art-placeholder")
+                source: Style.gfx("album-art-placeholder")
                 fillMode: Image.PreserveAspectCrop
             }
 
diff --git a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
index ee53fe02..4f426add 100644
--- a/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
+++ b/apps/com.pelagicore.music/panels/MusicBrowseListPanel.qml
@@ -68,7 +68,7 @@ Control {
                         if (model.item.data.coverArtUrl !==  undefined) {
                             return model.item.data.coverArtUrl;
                         } else {
-                            return Style.gfx2("album-art-placeholder");
+                            return Style.gfx("album-art-placeholder");
                         }
                     } else {
                         return "";
diff --git a/apps/com.pelagicore.music/views/ICMusicView.qml b/apps/com.pelagicore.music/views/ICMusicView.qml
index 7ad00b70..5a592b18 100644
--- a/apps/com.pelagicore.music/views/ICMusicView.qml
+++ b/apps/com.pelagicore.music/views/ICMusicView.qml
@@ -42,7 +42,7 @@ Item {
 
     Image {
         anchors.fill: parent
-        source: Style.gfx2("instrument-cluster-bg", NeptuneStyle.theme)
+        source: Style.gfx("instrument-cluster-bg", NeptuneStyle.theme)
         fillMode: Image.Stretch
     }
 
diff --git a/apps/com.pelagicore.music/views/WidgetContentView.qml b/apps/com.pelagicore.music/views/WidgetContentView.qml
index b71d4119..8367dde3 100644
--- a/apps/com.pelagicore.music/views/WidgetContentView.qml
+++ b/apps/com.pelagicore.music/views/WidgetContentView.qml
@@ -112,7 +112,7 @@ Item {
         width: parent.width
         height: sourceSize.height
         anchors.top: artAndTitleBackground.bottom
-        source: Style.gfx2("panel-inner-shadow", NeptuneStyle.theme)
+        source: Style.gfx("panel-inner-shadow", NeptuneStyle.theme)
     }
 
     AlbumArtPanel {
diff --git a/apps/com.pelagicore.phone/Main.qml b/apps/com.pelagicore.phone/Main.qml
index 9281d3f1..c95e58f4 100644
--- a/apps/com.pelagicore.phone/Main.qml
+++ b/apps/com.pelagicore.phone/Main.qml
@@ -74,7 +74,7 @@ AppUIScreen {
         Behavior on opacity { DefaultNumberAnimation {} }
         visible: opacity > 0
 
-        source: Style.gfx2("app-fullscreen-top-bg", NeptuneStyle.theme)
+        source: Style.gfx("app-fullscreen-top-bg", NeptuneStyle.theme)
     }
 
     BlurredImageBackground {
diff --git a/apps/com.pelagicore.phone/views/CallWidgetView.qml b/apps/com.pelagicore.phone/views/CallWidgetView.qml
index dfce038c..69c19a08 100644
--- a/apps/com.pelagicore.phone/views/CallWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/CallWidgetView.qml
@@ -142,7 +142,7 @@ Item {
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.bottom: parent.bottom
-        source: Style.gfx2("widget-left-section-bg", NeptuneStyle.theme)
+        source: Style.gfx("widget-left-section-bg", NeptuneStyle.theme)
 
         opacity: root.state == "Widget1Row" ? 1.0 : 0.0
         visible: opacity > 0
diff --git a/apps/com.pelagicore.phone/views/ContactsView.qml b/apps/com.pelagicore.phone/views/ContactsView.qml
index 74ee006f..2c356eef 100644
--- a/apps/com.pelagicore.phone/views/ContactsView.qml
+++ b/apps/com.pelagicore.phone/views/ContactsView.qml
@@ -81,7 +81,7 @@ ListView {
             Image {
                 width: parent.width
                 height: NeptuneStyle.dp(2)
-                source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                source: Style.gfx("list-divider", NeptuneStyle.theme)
             }
         }
     }
diff --git a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
index 2751dec2..abf85d46 100644
--- a/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
+++ b/apps/com.pelagicore.phone/views/FavoritesWidgetView.qml
@@ -189,7 +189,7 @@ Item {
                 Image {
                     anchors.bottom: parent.bottom
                     width: parent.width
-                    source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                    source: Style.gfx("list-divider", NeptuneStyle.theme)
                     visible: index !== listviewMoreRows.count - 1
                 }
             }
diff --git a/apps/com.pelagicore.phone/views/RecentCallsView.qml b/apps/com.pelagicore.phone/views/RecentCallsView.qml
index 2a68c088..4eb33e45 100644
--- a/apps/com.pelagicore.phone/views/RecentCallsView.qml
+++ b/apps/com.pelagicore.phone/views/RecentCallsView.qml
@@ -79,7 +79,7 @@ ListView {
             Image {
                 width: parent.width
                 height: NeptuneStyle.dp(2)
-                source: Style.gfx2("list-divider", NeptuneStyle.theme)
+                source: Style.gfx("list-divider", NeptuneStyle.theme)
             }
         }
     }
diff --git a/dev/apps/com.pelagicore.sheets/SheetsContent.qml b/dev/apps/com.pelagicore.sheets/SheetsContent.qml
index 3a8a6eb1..1f1bf1b1 100644
--- a/dev/apps/com.pelagicore.sheets/SheetsContent.qml
+++ b/dev/apps/com.pelagicore.sheets/SheetsContent.qml
@@ -92,7 +92,7 @@ Item {
                     width: parent.width
                     height: 5
                     anchors.bottom: parent.bottom
-                    source: Style.gfx2("divider", NeptuneStyle.theme)
+                    source: Style.gfx("divider", NeptuneStyle.theme)
                 }
 
                 MouseArea{
diff --git a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
index 009e479d..707b9640 100644
--- a/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
+++ b/dev/apps/com.pelagicore.sheets/components/ListItemPanel.qml
@@ -73,7 +73,7 @@ Item {
                 implicitWidth: Style.hspan(17)
                 implicitHeight: Style.vspan(1.3)
                 text: "ListItem with an image"
-                imageSource: Style.gfx2("fan-speed-5")
+                imageSource: Style.gfx("fan-speed-5")
             }
 
             ListItem {
diff --git a/imports/shared/controls/ListItemBasic.qml b/imports/shared/controls/ListItemBasic.qml
index a5863d29..bb7820b6 100644
--- a/imports/shared/controls/ListItemBasic.qml
+++ b/imports/shared/controls/ListItemBasic.qml
@@ -188,7 +188,7 @@ ItemDelegate {
             anchors.bottom: parent.bottom
             anchors.horizontalCenter: parent.horizontalCenter
             width: parent.width
-            source: Style.gfx2("list-divider")
+            source: Style.gfx("list-divider")
         }
     }
 }
diff --git a/imports/shared/utils/Style.qml b/imports/shared/utils/Style.qml
index ec5bf44b..b43da475 100644
--- a/imports/shared/utils/Style.qml
+++ b/imports/shared/utils/Style.qml
@@ -83,7 +83,7 @@ QtObject {
         return symbolUrl + '/' + name + themeStr + '.png';
     }
 
-    function gfx2(name, theme) {
+    function gfx(name, theme) {
         var themeStr = theme === NeptuneStyle.Dark ? "-dark" : "";
         return gfxUrl + name + themeStr + '.png'
     }
diff --git a/imports/system/neptune/controls/NeptunePopup.qml b/imports/system/neptune/controls/NeptunePopup.qml
index bbc5721d..981a7dac 100644
--- a/imports/system/neptune/controls/NeptunePopup.qml
+++ b/imports/system/neptune/controls/NeptunePopup.qml
@@ -63,7 +63,7 @@ Control {
         width: parent.width
         height: root.headerBackgroundHeight
         visible: root.headerBackgroundVisible
-        source: Style.gfx2("floating-panel-top-bg")
+        source: Style.gfx("floating-panel-top-bg")
         border {
             left: 20
             top: 30
@@ -73,7 +73,7 @@ Control {
     }
     background: ScalableBorderImage {
         anchors.fill: root
-        source: Style.gfx2("popup-background-9patch", NeptuneStyle.theme)
+        source: Style.gfx("popup-background-9patch", NeptuneStyle.theme)
         anchors.leftMargin: NeptuneStyle.dp(-40)
         anchors.rightMargin: NeptuneStyle.dp(-40)
         anchors.topMargin: NeptuneStyle.dp(-28)
@@ -104,7 +104,7 @@ Control {
             height: NeptuneStyle.dp(sourceSize.height)
             anchors.verticalCenter: parent.verticalCenter
             anchors.verticalCenterOffset: NeptuneStyle.dp(4)
-            source: Style.gfx2("popup-close-button-bg", NeptuneStyle.theme)
+            source: Style.gfx("popup-close-button-bg", NeptuneStyle.theme)
             fillMode: Image.PreserveAspectFit
         }
     }
diff --git a/styles/neptune/Slider.qml b/styles/neptune/Slider.qml
index b680bf1b..c8f247ce 100644
--- a/styles/neptune/Slider.qml
+++ b/styles/neptune/Slider.qml
@@ -78,8 +78,8 @@ T.Slider {
            (control.horizontal ? (control.availableHeight - height) / 2 :
                                  control.visualPosition * (control.availableHeight - height))
         source: control.horizontal ?
-                    Style.gfx2("slider-handle-horizontal", NeptuneStyle.theme) :
-                    Style.gfx2("slider-handle-vertical", NeptuneStyle.theme)
+                    Style.gfx("slider-handle-horizontal", NeptuneStyle.theme) :
+                    Style.gfx("slider-handle-vertical", NeptuneStyle.theme)
     }
 
     background: Item {
diff --git a/styles/neptune/TabButton.qml b/styles/neptune/TabButton.qml
index 8e56e62a..7ef82e50 100644
--- a/styles/neptune/TabButton.qml
+++ b/styles/neptune/TabButton.qml
@@ -75,7 +75,7 @@ T.TabButton {
     background: ScalableBorderImage {
         id: borderImage
         anchors.fill: parent
-        source: Style.gfx2("tabbar-bg-" + control.positionState, NeptuneStyle.theme)
+        source: Style.gfx("tabbar-bg-" + control.positionState, NeptuneStyle.theme)
 
         opacity: (control.selected ? 0.7 : 0.3) + (control.pressed ? 0.1 : 0)
 
diff --git a/sysui/about/About.qml b/sysui/about/About.qml
index 15b8c834..0f38c429 100644
--- a/sysui/about/About.qml
+++ b/sysui/about/About.qml
@@ -56,7 +56,7 @@ NeptunePopup {
 
         Image {
             Layout.fillWidth: true
-            source: Style.gfx2("hero-about")
+            source: Style.gfx("hero-about")
             asynchronous: true
 
             Label {
diff --git a/sysui/climate/ClimateAirFlow.qml b/sysui/climate/ClimateAirFlow.qml
index 1ef0354d..129bc0ef 100644
--- a/sysui/climate/ClimateAirFlow.qml
+++ b/sysui/climate/ClimateAirFlow.qml
@@ -66,7 +66,7 @@ Item {
                 anchors.centerIn: parent
                 width: NeptuneStyle.dp(sourceSize.width)
                 height: NeptuneStyle.dp(sourceSize.height)
-                source: Style.gfx2(("fan-speed-"+index), NeptuneStyle.theme)
+                source: Style.gfx(("fan-speed-"+index), NeptuneStyle.theme)
                 opacity: index === Tumbler.tumbler.currentIndex ? NeptuneStyle.fontOpacityHigh : NeptuneStyle.fontOpacityDisabled
                 fillMode: Image.PreserveAspectFit
             }
@@ -87,7 +87,7 @@ Item {
             id: seatImage
             width: NeptuneStyle.dp(sourceSize.width)
             height: NeptuneStyle.dp(sourceSize.height)
-            source: Style.gfx2("seat", NeptuneStyle.theme)
+            source: Style.gfx("seat", NeptuneStyle.theme)
             anchors.right: parent.right
             anchors.verticalCenter: parent.verticalCenter
             anchors.verticalCenterOffset: NeptuneStyle.dp(-10)
@@ -99,8 +99,8 @@ Item {
             anchors.top: parent.top
             width: NeptuneStyle.dp(sourceSize.width)
             height: NeptuneStyle.dp(sourceSize.height)
-            source: root.model.airflow.windshield ? Style.gfx2("air-flow-top-active", NeptuneStyle.theme)
-                                                  : Style.gfx2("air-flow-top", NeptuneStyle.theme)
+            source: root.model.airflow.windshield ? Style.gfx("air-flow-top-active", NeptuneStyle.theme)
+                                                  : Style.gfx("air-flow-top", NeptuneStyle.theme)
             fillMode: Image.PreserveAspectFit
             MouseArea {
                 anchors.fill: parent
@@ -115,8 +115,8 @@ Item {
             anchors.topMargin: NeptuneStyle.dp(-40)
             width: NeptuneStyle.dp(sourceSize.width)
             height: NeptuneStyle.dp(sourceSize.height)
-            source: root.model.airflow.dashboard ? Style.gfx2("air-flow-middle-active", NeptuneStyle.theme)
-                                                 : Style.gfx2("air-flow-middle", NeptuneStyle.theme)
+            source: root.model.airflow.dashboard ? Style.gfx("air-flow-middle-active", NeptuneStyle.theme)
+                                                 : Style.gfx("air-flow-middle", NeptuneStyle.theme)
             fillMode: Image.PreserveAspectFit
             MouseArea {
                 anchors.fill: parent
@@ -131,8 +131,8 @@ Item {
             anchors.topMargin: NeptuneStyle.dp(20)
             width: NeptuneStyle.dp(sourceSize.width)
             height: NeptuneStyle.dp(sourceSize.height)
-            source: root.model.airflow.floor ? Style.gfx2("air-flow-bottom-active", NeptuneStyle.theme)
-                                             : Style.gfx2("air-flow-bottom", NeptuneStyle.theme)
+            source: root.model.airflow.floor ? Style.gfx("air-flow-bottom-active", NeptuneStyle.theme)
+                                             : Style.gfx("air-flow-bottom", NeptuneStyle.theme)
             fillMode: Image.PreserveAspectFit
             MouseArea {
                 anchors.fill: parent
diff --git a/sysui/display/Display.qml b/sysui/display/Display.qml
index 335272dc..849f2150 100644
--- a/sysui/display/Display.qml
+++ b/sysui/display/Display.qml
@@ -67,7 +67,7 @@ Item {
 
     Image {
         anchors.fill: parent
-        source: Style.gfx2(NeptuneStyle.backgroundImage)
+        source: Style.gfx(NeptuneStyle.backgroundImage)
         opacity: launcherLoader.launcherOpen && NeptuneStyle.theme === NeptuneStyle.Light ? 0.7 : 1
         Behavior on opacity { DefaultNumberAnimation {} }
     }
diff --git a/sysui/home/AddWidgetPopup.qml b/sysui/home/AddWidgetPopup.qml
index 6aa7b492..13959040 100644
--- a/sysui/home/AddWidgetPopup.qml
+++ b/sysui/home/AddWidgetPopup.qml
@@ -114,7 +114,7 @@ NeptunePopup {
             anchors.topMargin: NeptuneStyle.dp(120)
             width: parent.width
             height: NeptuneStyle.dp(sourceSize.height)
-            source: Style.gfx2("popup-title-shadow")
+            source: Style.gfx("popup-title-shadow")
         }
 
         ListView {
diff --git a/sysui/home/ApplicationWidget.qml b/sysui/home/ApplicationWidget.qml
index 0b97e291..08533fd8 100644
--- a/sysui/home/ApplicationWidget.qml
+++ b/sysui/home/ApplicationWidget.qml
@@ -64,7 +64,7 @@ Item {
         border { left: 160; right: 160; top: 160; bottom: 160 }
         horizontalTileMode: BorderImage.Stretch
         verticalTileMode: BorderImage.Stretch
-        source: Style.gfx2("widget-bg-2-dark")
+        source: Style.gfx("widget-bg-2-dark")
         opacity: root.active ? 0 : root.beingDragged ? 0.3 : 0
         visible: opacity > 0
         Behavior on opacity { DefaultNumberAnimation{} }
@@ -79,7 +79,7 @@ Item {
         border { left: 160; right: 160; top: 160; bottom: 160 }
         horizontalTileMode: BorderImage.Stretch
         verticalTileMode: BorderImage.Stretch
-        source: Style.gfx2("widget-bg-2", NeptuneStyle.theme)
+        source: Style.gfx("widget-bg-2", NeptuneStyle.theme)
         opacity: root.active ? 0 : 1
         visible: opacity > 0
         Behavior on opacity { DefaultNumberAnimation{} }
@@ -136,7 +136,7 @@ Item {
         border { left: 0; right: 17; top: 17; bottom: 17 }
         horizontalTileMode: BorderImage.Stretch
         verticalTileMode: BorderImage.Stretch
-        source: Style.gfx2("widget-window-mask")
+        source: Style.gfx("widget-window-mask")
     }
     Item {
         id: windowSlot
@@ -164,7 +164,7 @@ Item {
         border { top: 30; bottom: 30 }
         horizontalTileMode: BorderImage.Stretch
         verticalTileMode: BorderImage.Stretch
-        source: Style.gfx2("widget-stripe")
+        source: Style.gfx("widget-stripe")
 
         layer.enabled: true
         layer.effect: ColorOverlay {
@@ -252,7 +252,7 @@ Item {
         anchors.top: parent.top
         width: NeptuneStyle.dp(sourceSize.width)
         height: NeptuneStyle.dp(sourceSize.height)
-        source: Style.gfx2("widget-corner", NeptuneStyle.theme)
+        source: Style.gfx("widget-corner", NeptuneStyle.theme)
         opacity: root.active ? 0 : 1
         visible: opacity > 0
         Behavior on opacity { DefaultNumberAnimation {} }
diff --git a/sysui/instrumentcluster/InstrumentClusterWindow.qml b/sysui/instrumentcluster/InstrumentClusterWindow.qml
index 5368587f..63ee6763 100644
--- a/sysui/instrumentcluster/InstrumentClusterWindow.qml
+++ b/sysui/instrumentcluster/InstrumentClusterWindow.qml
@@ -90,7 +90,7 @@ Window {
 
         Image {
             anchors.fill: parent
-            source: Style.gfx2("instrument-cluster-bg", NeptuneStyle.theme)
+            source: Style.gfx("instrument-cluster-bg", NeptuneStyle.theme)
             fillMode: Image.Stretch
             visible: !secondaryAppWindows.visible
         }