diff --git a/preview/interfaces/BufferedDisplaySsd1306.hpp b/preview/interfaces/BufferedDisplaySsd1306.hpp
index beea628..2f411eb 100644
--- a/preview/interfaces/BufferedDisplaySsd1306.hpp
+++ b/preview/interfaces/BufferedDisplaySsd1306.hpp
@@ -31,7 +31,7 @@ namespace services
         hal::I2cAddress address;
         bool initializing = true;
 
-        infra::Optional<infra::Bitmap> bitmap;
+        std::optional<infra::Bitmap> bitmap;
         infra::Point position;
         infra::AutoResetFunction<void()> onDone;
 
diff --git a/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp b/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp
index 112db02..9f2643c 100644
--- a/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp
+++ b/preview/interfaces/test/TestViewPainterBufferedDisplay.cpp
@@ -15,14 +15,14 @@ class ViewPainterBufferedDisplayTest
     {
         EXPECT_CALL(display, PixelFormat()).WillRepeatedly(testing::Return(infra::PixelFormat::rgb565));
 
-        viewPainter.Emplace(buffer, display, bitmapPainter);
+        viewPainter.emplace(buffer, display, bitmapPainter);
     }
 
     std::array<uint8_t, 8 * 16 * 2> buffer;
     testing::StrictMock<hal::BufferedDisplayMock> display;
     testing::StrictMock<hal::BitmapPainterMock> bitmapPainter;
     testing::StrictMock<services::ViewMock> view;
-    infra::Optional<services::ViewPainterBufferedDisplay> viewPainter;
+    std::optional<services::ViewPainterBufferedDisplay> viewPainter;
 };
 
 TEST_F(ViewPainterBufferedDisplayTest, Paint)
diff --git a/preview/touch/TouchScreen.cpp b/preview/touch/TouchScreen.cpp
index 9a4082b..23280b8 100644
--- a/preview/touch/TouchScreen.cpp
+++ b/preview/touch/TouchScreen.cpp
@@ -13,12 +13,12 @@ namespace services
         , touchDelta(touchDelta)
     {}
 
-    void TouchScreen::Measure(const infra::Function<void(infra::Optional<infra::Point> position)>& onTouched)
+    void TouchScreen::Measure(const infra::Function<void(std::optional<infra::Point> position)>& onTouched)
     {
         assert(this->onTouched == nullptr);
         this->onTouched = onTouched;
 
-        state.Emplace<StateTouchMeasurement>(*this, false);
+        state.emplace<StateTouchMeasurement>(*this, false);
     }
 
     TouchScreen::StateTouchMeasurement::StateTouchMeasurement(TouchScreen& touchScreen, bool finalMeasurement)
@@ -50,16 +50,16 @@ namespace services
     {
         if (xTouchResult >= yTouchResult + touchScreen.touchDelta)
         {
-            touchScreen.onTouched(infra::none);
-            touchScreen.state.Emplace<StateIdle>();
+            touchScreen.onTouched(std::nullopt);
+            touchScreen.state.emplace<StateIdle>();
         }
         else if (finalMeasurement)
         {
-            touchScreen.onTouched(infra::MakeOptional(infra::Point(touchScreen.xResult, touchScreen.yResult)));
-            touchScreen.state.Emplace<StateIdle>();
+            touchScreen.onTouched(std::make_optional(infra::Point(touchScreen.xResult, touchScreen.yResult)));
+            touchScreen.state.emplace<StateIdle>();
         }
         else
-            touchScreen.state.Emplace<StateXMeasurement>(touchScreen);
+            touchScreen.state.emplace<StateXMeasurement>(touchScreen);
     }
 
     TouchScreen::StateXMeasurement::StateXMeasurement(TouchScreen& touchScreen)
@@ -79,7 +79,7 @@ namespace services
     void TouchScreen::StateXMeasurement::OnMeasurementDone(uint32_t pixelPosition)
     {
         touchScreen.xResult = pixelPosition;
-        touchScreen.state.Emplace<StateYMeasurement>(touchScreen);
+        touchScreen.state.emplace<StateYMeasurement>(touchScreen);
     }
 
     TouchScreen::StateYMeasurement::StateYMeasurement(TouchScreen& touchScreen)
@@ -99,6 +99,6 @@ namespace services
     void TouchScreen::StateYMeasurement::OnMeasurementDone(uint32_t pixelPosition)
     {
         touchScreen.yResult = pixelPosition;
-        touchScreen.state.Emplace<StateTouchMeasurement>(touchScreen, true);
+        touchScreen.state.emplace<StateTouchMeasurement>(touchScreen, true);
     }
 }
diff --git a/preview/touch/TouchScreen.hpp b/preview/touch/TouchScreen.hpp
index ca63794..dd7be9d 100644
--- a/preview/touch/TouchScreen.hpp
+++ b/preview/touch/TouchScreen.hpp
@@ -20,7 +20,7 @@ namespace services
 
         TouchScreen(hal::GpioPin& xPlus, hal::GpioPin& xMinus, hal::GpioPin& yPlus, hal::GpioPin& yMinus, infra::CreatorBase<AnalogToDigitalPin, void()>& xPlusAnalogPin, infra::CreatorBase<AnalogToDigitalPin, void()>& yPlusAnalogPin, uint32_t touchDelta);
 
-        void Measure(const infra::Function<void(infra::Optional<infra::Point> position)>& onTouched);
+        void Measure(const infra::Function<void(std::optional<infra::Point> position)>& onTouched);
 
     private:
         class State
@@ -103,7 +103,7 @@ namespace services
         infra::CreatorBase<AnalogToDigitalPin, void()>& yPlusAnalogPin;
         uint32_t touchDelta;
 
-        infra::AutoResetFunction<void(infra::Optional<infra::Point> position)> onTouched;
+        infra::AutoResetFunction<void(std::optional<infra::Point> position)> onTouched;
         infra::PolymorphicVariant<State, StateIdle, StateTouchMeasurement, StateXMeasurement, StateYMeasurement> state;
 
         uint32_t xResult;
diff --git a/preview/touch/TouchScreenToTouchRecipientInteractor.cpp b/preview/touch/TouchScreenToTouchRecipientInteractor.cpp
index c7a419d..2e0d35a 100644
--- a/preview/touch/TouchScreenToTouchRecipientInteractor.cpp
+++ b/preview/touch/TouchScreenToTouchRecipientInteractor.cpp
@@ -18,7 +18,7 @@ namespace services
         if (!measurementBusy)
         {
             measurementBusy = true;
-            touchScreen.Measure([this](infra::Optional<infra::Point> position)
+            touchScreen.Measure([this](std::optional<infra::Point> position)
                 {
                     if (position)
                     {
diff --git a/preview/touch/TouchSpinInteger.cpp b/preview/touch/TouchSpinInteger.cpp
index c2b6eb6..768fa29 100644
--- a/preview/touch/TouchSpinInteger.cpp
+++ b/preview/touch/TouchSpinInteger.cpp
@@ -19,7 +19,7 @@ namespace services
         , to(to)
         , circular(circular)
         , distancePerIncrement(distancePerIncrement)
-        , width(infra::MakeOptional(width))
+        , width(std::make_optional(width))
     {}
 
     void TouchSpinInteger::StartTouch(infra::Point point)
@@ -49,7 +49,7 @@ namespace services
 
     void TouchSpinInteger::StopTouch()
     {
-        startTouch = infra::none;
+        startTouch = std::nullopt;
     }
 
     void TouchSpinInteger::Swipe(Direction direction)
@@ -104,7 +104,7 @@ namespace services
     {
         valueString.clear();
         infra::StringOutputStream stream(valueString);
-        if (width != infra::none)
+        if (width != std::nullopt)
             stream << infra::Width(*width, '0') << value;
         else
             stream << value;
diff --git a/preview/touch/TouchSpinInteger.hpp b/preview/touch/TouchSpinInteger.hpp
index 5c68871..215ccd5 100644
--- a/preview/touch/TouchSpinInteger.hpp
+++ b/preview/touch/TouchSpinInteger.hpp
@@ -53,9 +53,9 @@ namespace services
         int32_t to;
         bool circular;
         uint16_t distancePerIncrement;
-        infra::Optional<uint8_t> width;
+        std::optional<uint8_t> width;
 
-        infra::Optional<infra::Point> startTouch;
+        std::optional<infra::Point> startTouch;
         int32_t stepsReported = 0;
 
         infra::BoundedString::WithStorage<12> valueString;
diff --git a/preview/touch/test/TestTouchScreen.cpp b/preview/touch/test/TestTouchScreen.cpp
index 1801399..ecc3b2d 100644
--- a/preview/touch/test/TestTouchScreen.cpp
+++ b/preview/touch/test/TestTouchScreen.cpp
@@ -121,7 +121,7 @@ class TouchScreenTest
     services::TouchScreen::PixelPosition yTouchResult{ 0 };
 
     infra::Function<void()> onMeasurementDone;
-    infra::Function<void(infra::Optional<infra::Point> position)> onResult = [](infra::Optional<infra::Point> position) {};
+    infra::Function<void(std::optional<infra::Point> position)> onResult = [](std::optional<infra::Point> position) {};
 };
 
 TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)
@@ -137,7 +137,7 @@ TEST_F(TouchScreenTest, Measure_results_in_touch_measurement)
 
 TEST_F(TouchScreenTest, on_no_touch_none_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::none);
+    infra::VerifyingFunctionMock<void(std::optional<infra::Point>)> expectOnResult(std::nullopt);
     onResult = expectOnResult;
 
     xTouchResult = services::TouchScreen::PixelPosition{ 400 };
@@ -177,7 +177,7 @@ TEST_F(TouchScreenTest, after_measurement_is_done_y_measurement_starts)
 
 TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point()));
+    infra::VerifyingFunctionMock<void(std::optional<infra::Point>)> expectOnResult(std::make_optional(infra::Point()));
     onResult = expectOnResult;
 
     DoTouchMeasurement();
@@ -190,7 +190,7 @@ TEST_F(TouchScreenTest, after_last_measurement_result_is_reported)
 
 TEST_F(TouchScreenTest, on_touch_position_is_reported)
 {
-    infra::VerifyingFunctionMock<void(infra::Optional<infra::Point>)> expectOnResult(infra::MakeOptional(infra::Point(42, 134)));
+    infra::VerifyingFunctionMock<void(std::optional<infra::Point>)> expectOnResult(std::make_optional(infra::Point(42, 134)));
     onResult = expectOnResult;
 
     xResult = services::TouchScreen::PixelPosition{ 42 };
diff --git a/preview/views/HorizontalLayout.cpp b/preview/views/HorizontalLayout.cpp
index 3b4872d..ad2d9cc 100644
--- a/preview/views/HorizontalLayout.cpp
+++ b/preview/views/HorizontalLayout.cpp
@@ -96,20 +96,20 @@ namespace services
 
     void HorizontalLayout::Add(View& view, uint16_t proportion, VerticalAlignment alignment)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::MakeOptional(alignment), proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::make_optional(alignment), proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void HorizontalLayout::AddFill(View& view, uint16_t proportion)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void HorizontalLayout::AddDummy(uint16_t proportion)
     {
         assert(proportion != 0);
-        views.push_back(detail::LayoutViewInfo{ nullptr, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ nullptr, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
     }
 
     void HorizontalLayout::BringToFront(View& view)
diff --git a/preview/views/HorizontalLayout.hpp b/preview/views/HorizontalLayout.hpp
index b98888a..db06a25 100644
--- a/preview/views/HorizontalLayout.hpp
+++ b/preview/views/HorizontalLayout.hpp
@@ -51,7 +51,7 @@ namespace services
         struct LayoutViewInfo
         {
             View* view;
-            infra::Optional<VerticalAlignment> alignment; // No alignment means fill up the available space in the vertical direction
+            std::optional<VerticalAlignment> alignment; // No alignment means fill up the available space in the vertical direction
             uint16_t proportion;
             uint8_t paintOrder;
             infra::Region drawRegion;
diff --git a/preview/views/VerticalLayout.cpp b/preview/views/VerticalLayout.cpp
index 559a104..defd5ac 100644
--- a/preview/views/VerticalLayout.cpp
+++ b/preview/views/VerticalLayout.cpp
@@ -85,20 +85,20 @@ namespace services
 
     void VerticalLayout::Add(View& view, uint16_t proportion, HorizontalAlignment alignment)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::MakeOptional(Flip(alignment)), proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::make_optional(Flip(alignment)), proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void VerticalLayout::AddFill(View& view, uint16_t proportion)
     {
-        views.push_back(detail::LayoutViewInfo{ &view, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ &view, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
         view.SetParent(*this);
     }
 
     void VerticalLayout::AddDummy(uint16_t proportion)
     {
         assert(proportion != 0);
-        views.push_back(detail::LayoutViewInfo{ nullptr, infra::none, proportion, static_cast<uint8_t>(views.size()) });
+        views.push_back(detail::LayoutViewInfo{ nullptr, std::nullopt, proportion, static_cast<uint8_t>(views.size()) });
     }
 
     void VerticalLayout::BringToFront(View& view)
diff --git a/preview/views/ViewDisableableText.cpp b/preview/views/ViewDisableableText.cpp
index 2449117..5cd645d 100644
--- a/preview/views/ViewDisableableText.cpp
+++ b/preview/views/ViewDisableableText.cpp
@@ -31,14 +31,14 @@ namespace services
             DrawLine(TextRegion(), canvas, boundingRegion);
 
             auto fadingRegion = FadingRegion();
-            if (fadingRegion != infra::none)
+            if (fadingRegion != std::nullopt)
                 DrawLine(*fadingRegion, canvas, boundingRegion);
         }
     }
 
     void ViewDisableableFadingText::Enable(bool newEnabled)
     {
-        Dirty(TextRegion() | FadingRegion().ValueOr(infra::Region()));
+        Dirty(TextRegion() | FadingRegion().value_or(infra::Region()));
         enabled = newEnabled;
     }
 
diff --git a/preview/views/ViewFadingText.cpp b/preview/views/ViewFadingText.cpp
index 6e2a386..f0fdf8e 100644
--- a/preview/views/ViewFadingText.cpp
+++ b/preview/views/ViewFadingText.cpp
@@ -93,7 +93,7 @@ namespace services
         return ViewText::TextRegion();
     }
 
-    infra::Optional<infra::Region> ViewFadingText::FadingRegion() const
+    std::optional<infra::Region> ViewFadingText::FadingRegion() const
     {
         if (fadeTimer.Armed())
         {
@@ -107,10 +107,10 @@ namespace services
                 if (fadeDirection == Direction::down || fadeDirection == Direction::right)
                     deltaBuffer = -deltaBuffer;
 
-                return infra::MakeOptional(ViewText::TextRegion() >> deltaBuffer);
+                return std::make_optional(ViewText::TextRegion() >> deltaBuffer);
             }
         }
 
-        return infra::none;
+        return std::nullopt;
     }
 }
diff --git a/preview/views/ViewFadingText.hpp b/preview/views/ViewFadingText.hpp
index 2744247..b55f299 100644
--- a/preview/views/ViewFadingText.hpp
+++ b/preview/views/ViewFadingText.hpp
@@ -32,7 +32,7 @@ namespace services
         void FadeIn(infra::BoundedConstString newText, Direction from);
 
         infra::Region TextRegion() const;
-        infra::Optional<infra::Region> FadingRegion() const;
+        std::optional<infra::Region> FadingRegion() const;
 
     private:
         infra::BoundedString& buffer1;
diff --git a/preview/views/ViewFramedTextButtonWithPopOut.cpp b/preview/views/ViewFramedTextButtonWithPopOut.cpp
index 93d403f..17b85d2 100644
--- a/preview/views/ViewFramedTextButtonWithPopOut.cpp
+++ b/preview/views/ViewFramedTextButtonWithPopOut.cpp
@@ -12,7 +12,7 @@ namespace services
         ViewFramedTextButton::Activate();
 
         FramedTextButtonAttributes attributes = Attributes();
-        popOut.Emplace(regionOffset, FramedTextAttributes{ attributes.frameColour, attributes.activatedBackgroundColour, attributes.textColour, attributes.font }, Text());
+        popOut.emplace(regionOffset, FramedTextAttributes{ attributes.frameColour, attributes.activatedBackgroundColour, attributes.textColour, attributes.font }, Text());
         popOut->SetParent(*this);
         popOut->SetViewRegion(ViewRegion());
         Dirty(popOut->ViewRegion());
@@ -21,7 +21,7 @@ namespace services
     void ViewFramedTextButtonWithPopOut::Deactivate()
     {
         Dirty(popOut->DrawRegion());
-        popOut = infra::none;
+        popOut = std::nullopt;
 
         ViewFramedTextButton::Deactivate();
     }
@@ -46,7 +46,7 @@ namespace services
     {
         ViewFramedTextButton::ViewRegionChanged();
 
-        if (popOut != infra::none)
+        if (popOut != std::nullopt)
             popOut->SetViewRegion(ViewRegion());
     }
 }
diff --git a/preview/views/ViewFramedTextButtonWithPopOut.hpp b/preview/views/ViewFramedTextButtonWithPopOut.hpp
index b42be51..11d332d 100644
--- a/preview/views/ViewFramedTextButtonWithPopOut.hpp
+++ b/preview/views/ViewFramedTextButtonWithPopOut.hpp
@@ -26,7 +26,7 @@ namespace services
 
     private:
         infra::RegionOffset regionOffset;
-        infra::Optional<ViewOffsetRegion::WithView<ViewFramedText>> popOut;
+        std::optional<ViewOffsetRegion::WithView<ViewFramedText>> popOut;
     };
 }