diff --git a/Makefile b/Makefile
index cfb0464..853c864 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ PNG_LIBS = -lpng
 LDFLAGS =
 VENDORED_LIBS =
 endif
-CXXFLAGS = -std=c++11 -Os $(SDL_CFLAGS) -DMOD_VERSION=\"v$(MOD_VER)\"
+CXXFLAGS = -std=c++14 -Os $(SDL_CFLAGS) -DMOD_VERSION=\"v$(MOD_VER)\"
 LDLIBS = $(SDL_LIBS)
 SOURCES = src/main.cpp src/back_stack.cpp src/command.cpp src/download_screen.cpp src/localization.cpp src/framework/badge.cpp src/framework/dialog.cpp src/framework/sdl_context.cpp src/framework/texture.cpp src/framework/controller.cpp src/framework/powerwatch.cpp src/framework/draw_helpers.cpp src/framework/utf8.cpp src/framework/font8x8_lookup.cpp src/framework/uitheme.cpp src/framework/list_jump.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
diff --git a/src/framework/sdl_context.cpp b/src/framework/sdl_context.cpp
index cc34260..cca4c12 100644
--- a/src/framework/sdl_context.cpp
+++ b/src/framework/sdl_context.cpp
@@ -17,7 +17,7 @@
 
 SDL_Context::SDL_Context(std::chrono::milliseconds fpsTime, bool powerButtonExit) : fpsTime(fpsTime), powerButtonExit(powerButtonExit)
 {
-    powerwatch = new PowerWatch();
+    powerwatch = std::make_unique<PowerWatch>();
     window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1280, 720, SDL_WINDOW_FULLSCREEN);
     renderer = SDL_CreateRenderer(window, -1, 0);
     if(renderer == NULL) {
@@ -35,7 +35,6 @@ SDL_Context::~SDL_Context()
     SDL_DestroyRenderer(renderer);
     SDL_DestroyWindow(window);
     SDL_Quit();
-    delete powerwatch;
 }
 
 void SDL_Context::StartFrame()
diff --git a/src/framework/sdl_context.h b/src/framework/sdl_context.h
index ae87d39..71b616b 100644
--- a/src/framework/sdl_context.h
+++ b/src/framework/sdl_context.h
@@ -29,7 +29,7 @@ struct SDL_Context
     SDL_Window* window;
     SDL_Renderer* renderer;
     std::chrono::milliseconds fpsTime;
-    PowerWatch * powerwatch;
+    std::unique_ptr<PowerWatch> powerwatch;
 
 private:
     std::chrono::time_point<std::chrono::system_clock> nextFrameTime;