diff --git a/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf b/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
index 6e6354d4..2f0b3257 100644
--- a/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
+++ b/ucm2/USB-Audio/Behringer/UMC204HD-HiFi.conf
@@ -79,43 +79,34 @@ LibraryConfig.pcm.Config {
 		}
 	}
 
-	ctl.umc204hd {
-		@args [ CARD ]
-		@args.CARD.type string
-		type remap
-		child {
-			type hw
-			card $CARD
-		}
-		map {
-			"name='Line A Playback Volume'"."name='UMC204HD 192k Output Playback Volume'" {
-				vindex.0 0
-				vindex.1 1
-			}
-			"name='Line A Playback Switch'"."name='UMC204HD 192k Output Playback Switch'" {
-				vindex.0 0
-				vindex.1 1
-			}
-			"name='Line B Playback Volume'"."name='UMC204HD 192k Output Playback Volume'" {
-				vindex.0 2
-				vindex.1 3
-			}
-			"name='Line B Playback Switch'"."name='UMC204HD 192k Output Playback Switch'" {
-				vindex.0 2
-				vindex.1 3
-			}
-			"name='Input 1 Capture Volume'"."name='Mic Capture Volume'" {
-				vindex.0 0
-			}
-			"name='Input 1 Capture Switch'"."name='Mic Capture Switch'" {
-				vindex.0 0
-			}
-			"name='Input 2 Capture Volume'"."name='Mic Capture Volume'" {
-				vindex.0 1
-			}
-			"name='Input 2 Capture Switch'"."Name='Mic Capture Switch'" {
-				vindex.0 1
-			}
+	ctl.default.map {
+		"name='Line A Playback Volume'"."name='UMC204HD 192k Output Playback Volume'" {
+			vindex.0 0
+			vindex.1 1
+		}
+		"name='Line A Playback Switch'"."name='UMC204HD 192k Output Playback Switch'" {
+			vindex.0 0
+			vindex.1 1
+		}
+		"name='Line B Playback Volume'"."name='UMC204HD 192k Output Playback Volume'" {
+			vindex.0 2
+			vindex.1 3
+		}
+		"name='Line B Playback Switch'"."name='UMC204HD 192k Output Playback Switch'" {
+			vindex.0 2
+			vindex.1 3
+		}
+		"name='Input 1 Capture Volume'"."name='Mic Capture Volume'" {
+			vindex.0 0
+		}
+		"name='Input 1 Capture Switch'"."name='Mic Capture Switch'" {
+			vindex.0 0
+		}
+		"name='Input 2 Capture Volume'"."name='Mic Capture Volume'" {
+			vindex.0 1
+		}
+		"name='Input 2 Capture Switch'"."Name='Mic Capture Switch'" {
+			vindex.0 1
 		}
 	}
 }
@@ -126,7 +117,7 @@ SectionDevice."Line1" {
 		PlaybackPriority 200
 		PlaybackChannels 2
 		PlaybackPCM "umc204hd_line1:${CardId}"
-		PlaybackMixer "umc204hd:${CardId}"
+		PlaybackMixer "default:${CardId}"
 		PlaybackMixerElem "Line A"
 	}
 }
@@ -138,7 +129,7 @@ SectionDevice."Line2" {
 		PlaybackPriority 100
 		PlaybackChannels 2
 		PlaybackPCM "umc204hd_line2:${CardId}"
-		PlaybackMixer "umc204hd:${CardId}"
+		PlaybackMixer "default:${CardId}"
 		PlaybackMixerElem "Line B"
 	}
 }
@@ -150,7 +141,7 @@ SectionDevice."Mic1" {
 		CapturePriority 200
 		CaptureChannels 1
 		CapturePCM "umc204hd_mic1:${CardId}"
-		CaptureMixer "umc204hd:${CardId}"
+		CaptureMixer "default:${CardId}"
 		CaptureMixerElem "Input 1"
 	}
 }
@@ -162,7 +153,7 @@ SectionDevice."Mic2" {
 		CapturePriority 100
 		CaptureChannels 1
 		CapturePCM "umc204hd_mic2:${CardId}"
-		CaptureMixer "umc204hd:${CardId}"
+		CaptureMixer "default:${CardId}"
 		CaptureMixerElem "Input 2"
 	}
 }
diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index a3cb9ce6..c40187fd 100644
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -1,6 +1,7 @@
 Syntax 4
 
 Define.ProfileName ""
+Define.MixerRemap ""
 
 If.linked {
 	Condition {
@@ -97,7 +98,21 @@ If.behringer-umc204hd {
 		Haystack "${CardComponents}"
 		Needle "USB1397:0508"
 	}
-	True.Define.ProfileName "Behringer/UMC204HD"
+	True.Define {
+		ProfileName "Behringer/UMC204HD"
+		MixerRemap yes
+	}
+}
+
+If.mixremap {
+	Condition {
+		Type String
+		Empty "${var:MixerRemap}"
+	}
+	False {
+		Include.card-init.File "/lib/card-init.conf"
+		Include.ctl-remap.File "/lib/ctl-remap.conf"
+	}
 }
 
 If.inc {