diff --git a/config.hpp b/config.hpp
index e7f2179..860687d 100644
--- a/config.hpp
+++ b/config.hpp
@@ -23,7 +23,7 @@ enum class Parity {
 
 namespace detail {
 
-template <const DataBits dataBits>
+template <DataBits dataBits>
 struct choose_data_type {
 	using type = uint8_t;
 };
@@ -35,8 +35,8 @@ struct choose_data_type<DataBits::NINE> {
 
 } // namespace detail
 
-template <const uint32_t baudRate = 9600, const DataBits dataBits = DataBits::EIGHT, const Parity parity = Parity::NONE,
-          const StopBits stopBits = StopBits::ONE>
+template <uint32_t baudRate = 9600, DataBits dataBits = DataBits::EIGHT, Parity parity = Parity::NONE,
+          StopBits stopBits = StopBits::ONE>
 struct config {
 	static constexpr auto BAUD_RATE = baudRate;
 	static constexpr auto DATA_BITS = dataBits;
diff --git a/hardware0.hpp b/hardware0.hpp
index 84ed2b3..16e6fff 100644
--- a/hardware0.hpp
+++ b/hardware0.hpp
@@ -12,7 +12,7 @@ enum class Mode {
 	SPI,
 };
 
-template <const Mode mode, class config>
+template <Mode mode, class config>
 class hardware0 {
   public:
 	using data_t = typename config::data_t;
diff --git a/software.hpp b/software.hpp
index adef1d5..812eca8 100644
--- a/software.hpp
+++ b/software.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
+#include "config.hpp"
+
 #include "../io/io.hpp"
 
 namespace uart {
 
-template <const io::P rxPin, const io::P txPin, class config>
+template <io::P rxPin, io::P txPin, class cfg = config<>>
 class software {
   public:
 	using data_t = typename config::data_t;