diff --git a/selfdrive/oscarpilot/settings/basic.cc b/selfdrive/oscarpilot/settings/basic.cc
index 3cb18a2..511adeb 100644
--- a/selfdrive/oscarpilot/settings/basic.cc
+++ b/selfdrive/oscarpilot/settings/basic.cc
@@ -1,7 +1,7 @@
-#include "selfdrive/frogpilot/ui/visual_settings.h"
+#include "selfdrive/oscarpilot/settings/basic.h"
 #include "selfdrive/ui/ui.h"
 
-FrogPilotVisualsPanel::FrogPilotVisualsPanel(OscarSettingsWindow *parent) : FrogPilotListWidget(parent) {
+OscarPilotVisualsPanel::OscarPilotVisualsPanel(OscarSettingsWindow *parent) : FrogPilotListWidget(parent) {
   const std::vector<std::tuple<QString, QString, QString, QString>> visualToggles {
     {"CustomTheme", "Custom Themes", "Enable the ability to use custom themes.", "../frogpilot/assets/wheel_images/frog.png"},
     {"CustomColors", "Color Theme", "Switch out the standard openpilot color scheme with a custom color scheme.\n\nWant to submit your own color scheme? Post it in the 'feature-request' channel in the FrogPilot Discord!", ""},
@@ -167,15 +167,15 @@ FrogPilotVisualsPanel::FrogPilotVisualsPanel(OscarSettingsWindow *parent) : Frog
   modelUIKeys = {"AccelerationPath", "LaneLinesWidth", "PathEdgeWidth", "PathWidth", "RoadEdgesWidth", "UnlimitedLength"};
   qolKeys = {"DriveStats", "HideSpeed", "ShowSLCOffset"};
 
-  QObject::connect(device(), &Device::interactiveTimeout, this, &FrogPilotVisualsPanel::hideSubToggles);
-  QObject::connect(parent, &OscarSettingsWindow::closeParentToggle, this, &FrogPilotVisualsPanel::hideSubToggles);
-  QObject::connect(parent, &OscarSettingsWindow::updateMetric, this, &FrogPilotVisualsPanel::updateMetric);
+  QObject::connect(device(), &Device::interactiveTimeout, this, &OscarPilotVisualsPanel::hideSubToggles);
+  QObject::connect(parent, &OscarSettingsWindow::closeParentToggle, this, &OscarPilotVisualsPanel::hideSubToggles);
+  QObject::connect(parent, &OscarSettingsWindow::updateMetric, this, &OscarPilotVisualsPanel::updateMetric);
 
   hideSubToggles();
   updateMetric();
 }
 
-void FrogPilotVisualsPanel::updateToggles() {
+void OscarPilotVisualsPanel::updateToggles() {
   std::thread([this]() {
     paramsMemory.putBool("FrogPilotTogglesUpdated", true);
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
@@ -183,7 +183,7 @@ void FrogPilotVisualsPanel::updateToggles() {
   }).detach();
 }
 
-void FrogPilotVisualsPanel::updateMetric() {
+void OscarPilotVisualsPanel::updateMetric() {
   bool previousIsMetric = isMetric;
   isMetric = params.getBool("IsMetric");
 
@@ -221,11 +221,11 @@ void FrogPilotVisualsPanel::updateMetric() {
   previousIsMetric = isMetric;
 }
 
-void FrogPilotVisualsPanel::parentToggleClicked() {
+void OscarPilotVisualsPanel::parentToggleClicked() {
   this->openParentToggle();
 }
 
-void FrogPilotVisualsPanel::hideSubToggles() {
+void OscarPilotVisualsPanel::hideSubToggles() {
   for (auto &[key, toggle] : toggles) {
     bool subToggles = modelUIKeys.find(key.c_str()) != modelUIKeys.end() ||
                       customOnroadUIKeys.find(key.c_str()) != customOnroadUIKeys.end() ||
@@ -237,6 +237,6 @@ void FrogPilotVisualsPanel::hideSubToggles() {
   this->closeParentToggle();
 }
 
-void FrogPilotVisualsPanel::hideEvent(QHideEvent *event) {
+void OscarPilotVisualsPanel::hideEvent(QHideEvent *event) {
   hideSubToggles();
 }
diff --git a/selfdrive/oscarpilot/settings/basic.h b/selfdrive/oscarpilot/settings/basic.h
index 3bd7374..2be2827 100644
--- a/selfdrive/oscarpilot/settings/basic.h
+++ b/selfdrive/oscarpilot/settings/basic.h
@@ -3,13 +3,13 @@
 #include <set>
 
 #include "selfdrive/frogpilot/ui/frogpilot_functions.h"
-#include "selfdrive/ui/qt/offroad/settings.h"
+#include "selfdrive/oscarpilot/settings/settings.h"
 
-class FrogPilotVisualsPanel : public FrogPilotListWidget {
+class OscarPilotVisualsPanel : public FrogPilotListWidget {
   Q_OBJECT
 
 public:
-  explicit FrogPilotVisualsPanel(OscarSettingsWindow *parent);
+  explicit OscarPilotVisualsPanel(OscarSettingsWindow *parent);
 
 signals:
   void closeParentToggle();
diff --git a/selfdrive/oscarpilot/settings/settings.cc b/selfdrive/oscarpilot/settings/settings.cc
index c4ee9eb..39f634b 100644
--- a/selfdrive/oscarpilot/settings/settings.cc
+++ b/selfdrive/oscarpilot/settings/settings.cc
@@ -26,7 +26,7 @@
 
 // #include "selfdrive/frogpilot/navigation/ui/navigation_settings.h"
 // #include "selfdrive/frogpilot/ui/control_settings.h"
-#include "selfdrive/frogpilot/ui/vehicle_settings.h"
+#include "selfdrive/oscarpilot/settings/basic.h"
 // #include "selfdrive/frogpilot/ui/visual_settings.h"
 
 #include "selfdrive/oscarpilot/settings/settings.h"
diff --git a/selfdrive/ui/SConscript b/selfdrive/ui/SConscript
index 4ddd529..8a90134 100644
--- a/selfdrive/ui/SConscript
+++ b/selfdrive/ui/SConscript
@@ -28,7 +28,7 @@ widgets_src = ["ui.cc", "qt/widgets/input.cc", "qt/widgets/drive_stats.cc", "qt/
                "../frogpilot/ui/frogpilot_functions.cc", "../frogpilot/navigation/ui/navigation_settings.cc",
                "../frogpilot/ui/control_settings.cc", "../frogpilot/ui/vehicle_settings.cc",
                "../frogpilot/ui/visual_settings.cc", 
-               "../oscarpilot/settings/settings.cc"
+               "../oscarpilot/settings/settings.cc", "../oscarpilot/settings/basic.cc", 
                ]
 
 qt_env['CPPDEFINES'] = []